emacs-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Emacs-diffs] emacs/lisp ChangeLog mail/rmailedit.el


From: Stefan Monnier
Subject: [Emacs-diffs] emacs/lisp ChangeLog mail/rmailedit.el
Date: Sun, 01 Feb 2009 03:26:21 +0000

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/02/01 03:26:20

Modified files:
        lisp           : ChangeLog 
        lisp/mail      : rmailedit.el 

Log message:
        (rmail-edit-map): Move init into declaration.
        (rmail-edit-mode, rmail-cease-edit): Use with-current-buffer.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.15236&r2=1.15237
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/rmailedit.el?cvsroot=emacs&r1=1.46&r2=1.47

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.15236
retrieving revision 1.15237
diff -u -b -r1.15236 -r1.15237
--- ChangeLog   31 Jan 2009 22:14:53 -0000      1.15236
+++ ChangeLog   1 Feb 2009 03:26:17 -0000       1.15237
@@ -1,3 +1,8 @@
+2009-02-01  Stefan Monnier  <address@hidden>
+
+       * mail/rmailedit.el (rmail-edit-map): Move init into declaration.
+       (rmail-edit-mode, rmail-cease-edit): Use with-current-buffer.
+
 2009-01-31  Stefan Monnier  <address@hidden>
 
        * mouse.el (mouse-drag-mode-line-1): Obey mouse-1-click-follows-link.

Index: mail/rmailedit.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/rmailedit.el,v
retrieving revision 1.46
retrieving revision 1.47
diff -u -b -r1.46 -r1.47
--- mail/rmailedit.el   29 Jan 2009 03:42:19 -0000      1.46
+++ mail/rmailedit.el   1 Feb 2009 03:26:20 -0000       1.47
@@ -37,14 +37,14 @@
 
 (defvar rmail-old-text)
 
-(defvar rmail-edit-map nil)
-(if rmail-edit-map
-    nil
+(defvar rmail-edit-map
+  (let ((map (make-sparse-keymap)))
   ;; Make a keymap that inherits text-mode-map.
-  (setq rmail-edit-map (make-sparse-keymap))
-  (set-keymap-parent rmail-edit-map text-mode-map)
-  (define-key rmail-edit-map "\C-c\C-c" 'rmail-cease-edit)
-  (define-key rmail-edit-map "\C-c\C-]" 'rmail-abort-edit))
+    (set-keymap-parent map text-mode-map)
+    (define-key map "\C-c\C-c" 'rmail-cease-edit)
+    (define-key map "\C-c\C-]" 'rmail-abort-edit)
+    map))
+
 
 ;; Rmail Edit mode is suitable only for specially formatted data.
 (put 'rmail-edit-mode 'mode-class 'special)
@@ -62,11 +62,10 @@
 This functions runs the normal hook `rmail-edit-mode-hook'.
 \\{rmail-edit-map}"
   (if (rmail-summary-exists)
-      (save-excursion
-       (set-buffer rmail-summary-buffer)
+      (with-current-buffer rmail-summary-buffer
        (rmail-summary-disable)))
-  (let (rmail-buffer-swapped)
-    ;; Prevent change-major-mode-hook from unswapping the buffers.
+  (let ((rmail-buffer-swapped nil)) ; Prevent change-major-mode-hook
+                                    ; from unswapping the buffers.
     (delay-mode-hooks (text-mode))
     (use-local-map rmail-edit-map)
     (setq major-mode 'rmail-edit-mode)
@@ -105,8 +104,7 @@
   "Finish editing message; switch back to Rmail proper."
   (interactive)
   (if (rmail-summary-exists)
-      (save-excursion
-       (set-buffer rmail-summary-buffer)
+      (with-current-buffer rmail-summary-buffer
        (rmail-summary-enable)))
   (widen)
   ;; Disguise any "From " lines so they don't start a new message.
@@ -129,7 +127,8 @@
        headers-end)
     ;; Go back to Rmail mode, but carefully.
     (force-mode-line-update)
-    (let (rmail-buffer-swapped)
+    (let ((rmail-buffer-swapped nil)) ; Prevent change-major-mode-hook
+                                      ; from unswapping the buffers.
       (kill-all-local-variables)
       (rmail-mode-1)
       (if (boundp 'tool-bar-map)




reply via email to

[Prev in Thread] Current Thread [Next in Thread]