[Emacs-diffs] Changes to emacs/lisp/desktop.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        07/04/11 02:28:27

Index: desktop.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/desktop.el,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -b -r1.107 -r1.108
--- desktop.el  6 Apr 2007 18:35:23 -0000       1.107
+++ desktop.el  11 Apr 2007 02:28:26 -0000      1.108
@@ -619,8 +619,7 @@
          (setq newlist (cons q.txt newlist)))
        (setq p (cdr p)))
       (if p
-         (let ((last (desktop-internal-v2s p))
-               (el (car newlist)))
+         (let ((last (desktop-internal-v2s p)))
            (or anynil (setq anynil (null (car last))))
            (or anynil
                (setq newlist (cons '(must . ".") newlist)))
@@ -782,7 +781,8 @@
          ";; 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)
+        (dolist (varspec desktop-globals-to-save)
+          (desktop-outvar varspec))
         (if (memq 'kill-ring desktop-globals-to-save)
             (insert
              "(setq kill-ring-yank-pointer (nthcdr "
@@ -790,7 +790,7 @@
              " kill-ring))\n"))
 
         (insert "\n;; Buffer section -- buffers listed in same order as in 
buffer list:\n")
-        (mapcar #'(lambda (l)
+        (dolist (l info)
                   (when (apply 'desktop-save-buffer-p l)
                     (insert "("
                             (if (or (not (integerp eager))
@@ -801,11 +801,9 @@
                               "desktop-append-buffer-args")
                             " "
                             desktop-file-version)
-                    (mapcar #'(lambda (e)
+            (dolist (e l)
                               (insert "\n  " (desktop-value-to-string e)))
-                          l)
                     (insert ")\n\n")))
-              info)
         (setq default-directory dirname)
         (let ((coding-system-for-write 'emacs-mule))
           (write-region (point-min) (point-max) filename nil 'nomessage)))))
@@ -941,14 +939,13 @@
   (desktop-clear)
   (desktop-read desktop-dirname))
 
+(defvar desktop-buffer-major-mode)
+(defvar desktop-buffer-locals)
 ;; ----------------------------------------------------------------------------
 (defun desktop-restore-file-buffer (desktop-buffer-file-name
                                     desktop-buffer-name
                                     desktop-buffer-misc)
   "Restore a file buffer."
-  (eval-when-compile ; Just to silence the byte compiler
-    (defvar desktop-buffer-major-mode)
-    (defvar desktop-buffer-locals))
   (if desktop-buffer-file-name
       (if (or (file-exists-p desktop-buffer-file-name)
               (let ((msg (format "Desktop: File \"%s\" no longer exists."
@@ -985,8 +982,12 @@
 ;; called from Desktop file only.
 
 ;; Just to silence the byte compiler.
-(eval-when-compile
-  (defvar desktop-first-buffer)) ; Dynamically bound in `desktop-read'
+
+(defvar desktop-first-buffer)          ; Dynamically bound in `desktop-read'
+
+;; Bound locally in `desktop-read'.
+(defvar desktop-buffer-ok-count)
+(defvar desktop-buffer-fail-count)
 
 (defun desktop-create-buffer
   (desktop-file-version
@@ -1000,10 +1001,6 @@
    desktop-buffer-misc
    &optional
    desktop-buffer-locals)
-  ;; Just to silence the byte compiler. Bound locally in `desktop-read'.
-  (eval-when-compile
-    (defvar desktop-buffer-ok-count)
-    (defvar desktop-buffer-fail-count))
   ;; To make desktop files with relative file names possible, we cannot
   ;; allow `default-directory' to change. Therefore we save current buffer.
   (save-current-buffer
@@ -1045,21 +1042,22 @@
               ((equal '(nil) desktop-buffer-minor-modes) ; backwards compatible
                (auto-fill-mode 0))
               (t
-               (mapcar #'(lambda (minor-mode)
+               (dolist (minor-mode desktop-buffer-minor-modes)
                          ;; Give minor mode module a chance to add a handler.
                          (desktop-load-file minor-mode)
                          (let ((handler (cdr (assq minor-mode 
desktop-minor-mode-handlers))))
                            (if handler
                                (funcall handler desktop-buffer-locals)
                              (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.
+                       (funcall minor-mode 1)))))))
+        ;; 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
           (goto-char
             (condition-case err
-                ;; Evaluate point. Thus point can be something like 
'(search-forward ...
+                ;; Evaluate point.  Thus point can be something like
+                ;; '(search-forward ...
                 (eval desktop-buffer-point)
               (error (message "%s" (error-message-string err)) 1))))
         (when desktop-buffer-mark
@@ -1167,7 +1165,7 @@
 ;; functions are processed after `after-init-hook'.
 (add-hook
   'after-init-hook
-  '(lambda ()
+  (lambda ()
     (let ((key "--no-desktop"))
       (when (member key command-line-args)
         (setq command-line-args (delete key command-line-args))
@@ -1176,5 +1174,5 @@
 
 (provide 'desktop)
 
-;;; arch-tag: 221907c3-1771-4fd3-9c2e-c6f700c6ede9
+;; arch-tag: 221907c3-1771-4fd3-9c2e-c6f700c6ede9
 ;;; desktop.el ends here