Give a backtrace if debug-on-quit is set and the user hits `C-g'.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fa4d6c8..e7bcd39 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,13 @@
+2011-03-15  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-int.el (gnus-open-server): Ditto.
+
+       * gnus-start.el (gnus-activate-group): Give a backtrace if
+       debug-on-quit is set and the user hits `C-g'.
+       (gnus-read-active-file): Ditto.
+
+       * gnus-group.el (gnus-group-read-ephemeral-group): Ditto.
+

 2011-03-15  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * message.el (message-yank-original): Use cond instead of CL case.
 2011-03-15  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * message.el (message-yank-original): Use cond instead of CL case.

diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el
index 9ed3cf0..e928811 100644 (file)
--- a/lisp/gnus-group.el
+++ b/lisp/gnus-group.el
@@ -2313,9 +2313,10 @@ Return the name of the group if selection was successful."
                       gnus-fetch-old-ephemeral-headers))
                  (gnus-group-read-group (or number t) t group select-articles))
            group)
                       gnus-fetch-old-ephemeral-headers))
                  (gnus-group-read-group (or number t) t group select-articles))
            group)

-       ;;(error nil)

        (quit
        (quit

-        (message "Quit reading the ephemeral group")
+        (if debug-on-quit
+            (debug "Quit")
+          (message "Quit reading the ephemeral group"))

         nil)))))
 
 (defcustom gnus-gmane-group-download-format
         nil)))))
 
 (defcustom gnus-gmane-group-download-format

diff --git a/lisp/gnus-int.el b/lisp/gnus-int.el
index a67063b..ef15a47 100644 (file)
--- a/lisp/gnus-int.el
+++ b/lisp/gnus-int.el
@@ -270,7 +270,9 @@ If it is down, start it up (again)."
                               server (error-message-string err))
                 nil)
                (quit
                               server (error-message-string err))
                 nil)
                (quit

-                (gnus-message 1 "Quit trying to open server %s" server)
+                (if debug-on-quit
+                    (debug "Quit")
+                  (gnus-message 1 "Quit trying to open server %s" server))

                 nil)))
             open-offline)
        ;; If this hasn't been opened before, we add it to the list.
                 nil)))
             open-offline)
        ;; If this hasn't been opened before, we add it to the list.

diff --git a/lisp/gnus-start.el b/lisp/gnus-start.el
index c6ff604..afded87 100644 (file)
--- a/lisp/gnus-start.el
+++ b/lisp/gnus-start.el
@@ -1462,9 +1462,10 @@ If SCAN, request a scan of that group as well."
               (inline (gnus-request-group group (or dont-sub-check dont-check)
                                           method
                                           (gnus-get-info group)))
               (inline (gnus-request-group group (or dont-sub-check dont-check)
                                           method
                                           (gnus-get-info group)))

-            ;;(error nil)

             (quit
             (quit

-             (message "Quit activating %s" group)
+             (if debug-on-quit
+                 (debug "Quit")
+               (message "Quit activating %s" group))

              nil)))
         (unless dont-check
           (setq active (gnus-parse-active))
              nil)))
         (unless dont-check
           (setq active (gnus-parse-active))


@@ -2004,7 +2005,9 @@ If SCAN, request a scan of that group as well."
              ;; We catch C-g so that we can continue past servers
              ;; that do not respond.
              (quit
              ;; We catch C-g so that we can continue past servers
              ;; that do not respond.
              (quit

-              (message "Quit reading the active file")
+              (if debug-on-quit
+                  (debug "Quit")
+                (message "Quit reading the active file"))

               nil))))))))
 
 (defun gnus-read-active-file-1 (method force)
               nil))))))))
 
 (defun gnus-read-active-file-1 (method force)

diff --git a/lisp/nnimap.el b/lisp/nnimap.el
index e76ead5..11c521f 100644 (file)
--- a/lisp/nnimap.el
+++ b/lisp/nnimap.el
@@ -1674,6 +1674,8 @@ textual parts.")
            (goto-char (point-max)))
           openp)
       (quit
            (goto-char (point-max)))
           openp)
       (quit

+       (when debug-on-quit
+        (debug "Quit"))

        ;; The user hit C-g while we were waiting: kill the process, in case
        ;; it's a gnutls-cli process that's stuck (tends to happen a lot behind
        ;; NAT routers).
        ;; The user hit C-g while we were waiting: kill the process, in case
        ;; it's a gnutls-cli process that's stuck (tends to happen a lot behind
        ;; NAT routers).