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

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        09/08/27 18:32:40

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

Log message:
        (build-mail-aliases): Use with-temp-buffer,
        expand-file-name and with-current-buffer.
        (mail-get-names, mail-directory): Use with-current-buffer.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/ChangeLog?cvsroot=emacs&r1=1.16029&r2=1.16030
http://cvs.savannah.gnu.org/viewcvs/emacs/lisp/mail/mailalias.el?cvsroot=emacs&r1=1.68&r2=1.69

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/emacs/emacs/lisp/ChangeLog,v
retrieving revision 1.16029
retrieving revision 1.16030
diff -u -b -r1.16029 -r1.16030
--- ChangeLog   27 Aug 2009 16:53:04 -0000      1.16029
+++ ChangeLog   27 Aug 2009 18:32:37 -0000      1.16030
@@ -1,5 +1,9 @@
 2009-08-27  Stefan Monnier  <address@hidden>
 
+       * mail/mailalias.el (build-mail-aliases): Use with-temp-buffer,
+       expand-file-name and with-current-buffer.
+       (mail-get-names, mail-directory): Use with-current-buffer.
+
        * vc.el (vc-read-revision): New function.
        (vc-version-diff, vc-merge): Use it.
 

Index: mail/mailalias.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/mail/mailalias.el,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -b -r1.68 -r1.69
--- mail/mailalias.el   14 Mar 2009 21:20:47 -0000      1.68
+++ mail/mailalias.el   27 Aug 2009 18:32:40 -0000      1.69
@@ -244,20 +244,14 @@
   ;; In case mail-aliases is t, make sure define-mail-alias
   ;; does not recursively call build-mail-aliases.
   (setq mail-aliases nil)
-  (let ((buffer nil)
-       (obuf (current-buffer)))
-    (unwind-protect
-       (progn
-         (setq buffer (generate-new-buffer " mailrc"))
-         (set-buffer buffer)
+  (with-temp-buffer
          (while file
            (cond ((get-file-buffer file)
-                  (insert (save-excursion
-                            (set-buffer (get-file-buffer file))
+             (insert (with-current-buffer (get-file-buffer file)
                             (buffer-substring-no-properties
                              (point-min) (point-max)))))
                  ((file-exists-p file) (insert-file-contents file))
-                 ((file-exists-p (setq file (concat "~/" file)))
+            ((file-exists-p (setq file (expand-file-name file "~/")))
                   (insert-file-contents file))
                  (t (setq file nil)))
            (goto-char (point-min))
@@ -296,9 +290,7 @@
              (setq value (buffer-substring-no-properties start (point)))
              (unless (equal value "")
                (define-mail-alias name value t))))
-         mail-aliases)
-      (if buffer (kill-buffer buffer))
-      (set-buffer obuf))))
+    mail-aliases))
 
 ;; Always autoloadable in case the user wants to define aliases
 ;; interactively or in .emacs.
@@ -452,8 +444,7 @@
 `mail-directory-function'.
 PATTERN is the string we want to complete."
   (if (eq mail-local-names t)
-      (save-excursion
-       (set-buffer (generate-new-buffer " passwd"))
+      (with-current-buffer (generate-new-buffer " passwd")
        (let ((files mail-passwd-files))
          (while files
            (insert-file-contents (car files) nil nil nil t)
@@ -511,11 +502,10 @@
 If PATTERN is nil, get all the defined user names.
 This function calls `mail-directory-function' to query the directory,
 then uses `mail-directory-parser' to parse the output it returns."
-  (save-excursion
     (message "Querying directory...")
-    (set-buffer (generate-new-buffer " *mail-directory*"))
+  (with-current-buffer (generate-new-buffer " *mail-directory*")
     (funcall mail-directory-function pattern)
-    (goto-char 1)
+    (goto-char (point-min))
     (let (directory)
       (if (stringp mail-directory-parser)
          (while (re-search-forward mail-directory-parser nil t)