(goto-address-mail-regexp): Allow = in username.

[gnu-emacs] / lisp / desktop.el

diff --git a/lisp/desktop.el b/lisp/desktop.el
index 0a423aa7c42e6a4e4f6aeb9fbc3fc6883fe719b1..1e4fa67d199af8a005384a99d7b2792c19f38177 100644 (file)
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -636,7 +636,7 @@ See also `desktop-base-file-name'."
         ";; Desktop file format version " desktop-file-version "\n"
         ";; Emacs version " emacs-version "\n\n"
         ";; Global section:\n")
-      (mapcar (function desktop-outvar) desktop-globals-to-save)
+      (mapc (function desktop-outvar) desktop-globals-to-save)
       (if (memq 'kill-ring desktop-globals-to-save)
         (insert
           "(setq kill-ring-yank-pointer (nthcdr "
@@ -644,15 +644,15 @@ See also `desktop-base-file-name'."
           " kill-ring))\n"))
 
       (insert "\n;; Buffer section -- buffers listed in same order as in buffer list:\n")
-      (mapcar #'(lambda (l)
-                  (if (apply 'desktop-save-buffer-p l)
-                      (progn
-                        (insert "(desktop-create-buffer " desktop-file-version)
-                        (mapcar #'(lambda (e)
-                                    (insert "\n  " (desktop-value-to-string e)))
-                                l)
-                        (insert ")\n\n"))))
-              info)
+      (mapc #'(lambda (l)
+               (if (apply 'desktop-save-buffer-p l)
+                   (progn
+                     (insert "(desktop-create-buffer " desktop-file-version)
+                     (mapc #'(lambda (e)
+                               (insert "\n  " (desktop-value-to-string e)))
+                           l)
+                     (insert ")\n\n"))))
+           info)
       (setq default-directory dirname)
       (when (file-exists-p filename) (delete-file filename))
       (let ((coding-system-for-write 'emacs-mule))
@@ -711,8 +711,8 @@ It returns t if a desktop file was loaded, nil otherwise."
         ;; `desktop-create-buffer' puts buffers at end of the buffer list.
         ;; We want buffers existing prior to evaluating the desktop (and not reused)
         ;; to be placed at the end of the buffer list, so we move them here.
-        (mapcar 'bury-buffer
-                (nreverse (cdr (memq desktop-first-buffer (nreverse (buffer-list))))))
+        (mapc 'bury-buffer
+              (nreverse (cdr (memq desktop-first-buffer (nreverse (buffer-list))))))
         (switch-to-buffer (car (buffer-list)))
         (run-hooks 'desktop-delay-hook)
         (setq desktop-delay-hook nil)
@@ -855,11 +855,10 @@ directory DIRNAME."
           (setq desktop-buffer-ok-count (1+ desktop-buffer-ok-count))
         (setq desktop-buffer-fail-count (1+ desktop-buffer-fail-count))
         (setq result nil))
-      (unless (bufferp result) (setq result nil))
       ;; Restore buffer list order with new buffer at end. Don't change
       ;; the order for old desktop files (old desktop module behaviour).
       (unless (< desktop-file-version 206)
-        (mapcar 'bury-buffer buffer-list)
+        (mapc 'bury-buffer buffer-list)
         (when result (bury-buffer result)))
       (when result
         (unless (or desktop-first-buffer (< desktop-file-version 206))
@@ -873,9 +872,9 @@ directory DIRNAME."
               ((equal '(nil) desktop-buffer-minor-modes) ; backwards compatible
                (auto-fill-mode 0))
               (t
-               (mapcar #'(lambda (minor-mode)
-                           (when (functionp minor-mode) (funcall minor-mode 1)))
-                       desktop-buffer-minor-modes)))
+               (mapc #'(lambda (minor-mode)
+                        (when (functionp minor-mode) (funcall minor-mode 1)))
+                    desktop-buffer-minor-modes)))
         ;; Even though point and mark are non-nil when written by `desktop-save'
         ;; they may be modified by handlers wanting to set point or mark themselves.
         (when desktop-buffer-point