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

[Miles Bader]

Index: emacs/lisp/desktop.el
diff -c emacs/lisp/desktop.el:1.49.2.11 emacs/lisp/desktop.el:1.49.2.12
*** emacs/lisp/desktop.el:1.49.2.11     Fri Nov 12 04:21:11 2004
--- emacs/lisp/desktop.el       Wed Dec  8 23:31:41 2004
***************
*** 636,642 ****
          ";; 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)
        (if (memq 'kill-ring desktop-globals-to-save)
          (insert
            "(setq kill-ring-yank-pointer (nthcdr "
--- 636,642 ----
          ";; Desktop file format version " desktop-file-version "\n"
          ";; Emacs version " emacs-version "\n\n"
          ";; Global section:\n")
!       (mapc (function desktop-outvar) desktop-globals-to-save)
        (if (memq 'kill-ring desktop-globals-to-save)
          (insert
            "(setq kill-ring-yank-pointer (nthcdr "
***************
*** 644,658 ****
            " 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)
        (setq default-directory dirname)
        (when (file-exists-p filename) (delete-file filename))
        (let ((coding-system-for-write 'emacs-mule))
--- 644,658 ----
            " kill-ring))\n"))
  
        (insert "\n;; Buffer section -- buffers listed in same order as in 
buffer list:\n")
!       (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))
***************
*** 873,881 ****
                ((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)))
          ;; 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
--- 873,881 ----
                ((equal '(nil) desktop-buffer-minor-modes) ; backwards 
compatible
                 (auto-fill-mode 0))
                (t
!                (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