[Emacs-diffs] emacs/lisp ChangeLog server.el

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/02/07 16:24:40

Modified files:
        lisp           : ChangeLog server.el 

Log message:
        (server-execute): Enable quit.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15274&r2=1.15275
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/server.el?cvsroot=emacs&r1=1.186&r2=1.187

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15274
retrieving revision 1.15275
diff -u -b -r1.15274 -r1.15275
--- ChangeLog   7 Feb 2009 15:29:11 -0000       1.15274
+++ ChangeLog   7 Feb 2009 16:24:36 -0000       1.15275
@@ -1,3 +1,7 @@
+2009-02-07  Stefan Monnier  <address@hidden>
+
+       * server.el (server-execute): Enable quit.
+
 2009-02-07  Andreas Schwab  <address@hidden>
 
        * image-mode.el (image-mode): Always set image-type.
@@ -19,8 +23,8 @@
 
        * mail/rmailedit.el (rmail-cease-edit): narrow-to-region before
        extracting mail message headers.  Use encode-coding-region instead
-       of insert-buffer-substring for re-encoding edited message.  Add
-       qp/b64 encoding only after text was encoded.
+       of insert-buffer-substring for re-encoding edited message.
+       Add qp/b64 encoding only after text was encoded.
 
 2009-02-07  Eli Zaretskii  <address@hidden>
 

Index: server.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/server.el,v
retrieving revision 1.186
retrieving revision 1.187
diff -u -b -r1.186 -r1.187
--- server.el   23 Jan 2009 04:52:40 -0000      1.186
+++ server.el   7 Feb 2009 16:24:40 -0000       1.187
@@ -1036,6 +1036,14 @@
     (error (server-return-error proc err))))
 
 (defun server-execute (proc files nowait commands dontkill frame tty-name)
+  ;; This is run from timers and process-filters, i.e. "asynchronously".
+  ;; But w.r.t the user, this is not really asynchronous since the timer
+  ;; is run after 0s and the process-filter is run in response to the
+  ;; user running `emacsclient'.  So it is OK to override the
+  ;; inhibit-quit flag, which is good since `commands' (as well as
+  ;; find-file-noselect via the major-mode) can run arbitrary code,
+  ;; including code that needs to wait.
+  (with-local-quit
   (condition-case err
       (let* ((buffers
               (when files
@@ -1069,7 +1077,7 @@
                            "When done with a buffer, type \\[server-edit]")))))
         (when (and frame (null tty-name))
           (server-unselect-display frame)))
-    (error (server-return-error proc err))))
+      (error (server-return-error proc err)))))
 
 (defun server-return-error (proc err)
   (ignore-errors