From f6ad556f3429f80bcb8f5e7b547b3fdbc1001ef1 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <git@the-compiler.org>
Date: Sun, 17 May 2015 01:03:34 +0200
Subject: [PATCH] Get rid of --no-crash-dialog.

---
 CHANGELOG.asciidoc              | 5 +++++
 doc/qutebrowser.1.asciidoc      | 3 ---
 qutebrowser/misc/crashsignal.py | 3 +--
 qutebrowser/qutebrowser.py      | 2 --
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 20d905ada..bfe904975 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -48,6 +48,11 @@ Deprecated
 
 - `:scroll` with two pixel-arguments is now deprecated - `:scroll-px` should be used instead.
 
+Removed
+~~~~~~~
+
+- The `--no-crash-dialog` argument which was intended for debugging only was removed as it's replaced by `--no-err-windows` which suppresses all error windows.
+
 Fixed
 ~~~~~
 
diff --git a/doc/qutebrowser.1.asciidoc b/doc/qutebrowser.1.asciidoc
index 4c8ce2556..4ac83c587 100644
--- a/doc/qutebrowser.1.asciidoc
+++ b/doc/qutebrowser.1.asciidoc
@@ -90,9 +90,6 @@ show it.
 *--debug-exit*::
     Turn on debugging of late exit.
 
-*--no-crash-dialog*::
-    Don't show a crash dialog.
-
 *--pdb-postmortem*::
     Drop into pdb on exceptions.
 
diff --git a/qutebrowser/misc/crashsignal.py b/qutebrowser/misc/crashsignal.py
index 54c0f0a15..7598f3312 100644
--- a/qutebrowser/misc/crashsignal.py
+++ b/qutebrowser/misc/crashsignal.py
@@ -212,8 +212,7 @@ class CrashHandler(QObject):
         if self._args.pdb_postmortem:
             pdb.post_mortem(tb)
 
-        if (is_ignored_exception or self._args.no_crash_dialog or
-                self._args.pdb_postmortem):
+        if is_ignored_exception or self._args.pdb_postmortem:
             # pdb exit, KeyboardInterrupt, ...
             status = 0 if is_ignored_exception else 2
             try:
diff --git a/qutebrowser/qutebrowser.py b/qutebrowser/qutebrowser.py
index b2d61fb48..caebd4967 100644
--- a/qutebrowser/qutebrowser.py
+++ b/qutebrowser/qutebrowser.py
@@ -90,8 +90,6 @@ def get_argparser():
                        "the main window.")
     debug.add_argument('--debug-exit', help="Turn on debugging of late exit.",
                        action='store_true')
-    debug.add_argument('--no-crash-dialog', action='store_true', help="Don't "
-                       "show a crash dialog.")
     debug.add_argument('--pdb-postmortem', action='store_true',
                        help="Drop into pdb on exceptions.")
     debug.add_argument('--temp-basedir', action='store_true', help="Use a "