Remove gnus-with-local-quit

Signed-off-by: Julien Danjou <julien@danjou.info>

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cbfebde..0187f5b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,7 @@
 2010-10-25  Julien Danjou  <julien@danjou.info>
 
+       * gnus-util.el: Remove `gnus-with-local-quit'
+
        * gnus-demon.el (gnus-demon-init): Use run-with-idle-timer function.
 
 2010-10-25  Lars Magne Ingebrigtsen  <larsi@gnus.org>

diff --git a/lisp/gnus-demon.el b/lisp/gnus-demon.el
index c80963e..94a4952 100644 (file)
--- a/lisp/gnus-demon.el
+++ b/lisp/gnus-demon.el
@@ -32,7 +32,6 @@
 (require 'nnheader)
 (require 'nntp)
 (require 'nnmail)
-(require 'gnus-util)
 
 (defgroup gnus-demon nil
   "Demonic behavior."
@@ -105,7 +104,7 @@ Emacs has been idle for IDLE `gnus-demon-timestep's."
   (unless gnus-inhibit-demon
     (when (or (not idle)
               (<= idle (gnus-demon-idle-since)))
-      (gnus-with-local-quit
+      (with-local-quit
        (ignore-errors
          (funcall func))))))
 

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index 5326b93..1a09e04 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -1930,25 +1930,6 @@ empty directories from OLD-PATH."
   (defalias 'gnus-set-process-query-on-exit-flag
     'process-kill-without-query))
 
-(if (fboundp 'with-local-quit)
-    (defalias 'gnus-with-local-quit 'with-local-quit)
-  (defmacro gnus-with-local-quit (&rest body)
-    "Execute BODY, allowing quits to terminate BODY but not escape further.
-When a quit terminates BODY, `gnus-with-local-quit' returns nil but
-requests another quit.  That quit will be processed as soon as quitting
-is allowed once again.  (Immediately, if `inhibit-quit' is nil.)"
-    ;;(declare (debug t) (indent 0))
-    `(condition-case nil
-        (let ((inhibit-quit nil))
-          ,@body)
-       (quit (setq quit-flag t)
-            ;; This call is to give a chance to handle quit-flag
-            ;; in case inhibit-quit is nil.
-            ;; Without this, it will not be handled until the next function
-            ;; call, and that might allow it to exit thru a condition-case
-            ;; that intends to handle the quit signal next time.
-            (eval '(ignore nil))))))
-
 (defalias 'gnus-read-shell-command
   (if (fboundp 'read-shell-command) 'read-shell-command 'read-string))