/[emacs]/emacs/lisp/desktop.el
ViewVC logotype

Diff of /emacs/lisp/desktop.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.49.2.11 by miles, Fri Nov 12 04:21:11 2004 UTC revision 1.49.2.12 by miles, Wed Dec 8 23:31:41 2004 UTC
# Line 636  See also `desktop-base-file-name'." Line 636  See also `desktop-base-file-name'."
636          ";; Desktop file format version " desktop-file-version "\n"          ";; Desktop file format version " desktop-file-version "\n"
637          ";; Emacs version " emacs-version "\n\n"          ";; Emacs version " emacs-version "\n\n"
638          ";; Global section:\n")          ";; Global section:\n")
639        (mapcar (function desktop-outvar) desktop-globals-to-save)        (mapc (function desktop-outvar) desktop-globals-to-save)
640        (if (memq 'kill-ring desktop-globals-to-save)        (if (memq 'kill-ring desktop-globals-to-save)
641          (insert          (insert
642            "(setq kill-ring-yank-pointer (nthcdr "            "(setq kill-ring-yank-pointer (nthcdr "
# Line 644  See also `desktop-base-file-name'." Line 644  See also `desktop-base-file-name'."
644            " kill-ring))\n"))            " kill-ring))\n"))
645    
646        (insert "\n;; Buffer section -- buffers listed in same order as in buffer list:\n")        (insert "\n;; Buffer section -- buffers listed in same order as in buffer list:\n")
647        (mapcar #'(lambda (l)        (mapc #'(lambda (l)
648                    (if (apply 'desktop-save-buffer-p l)                  (if (apply 'desktop-save-buffer-p l)
649                        (progn                      (progn
650                          (insert "(desktop-create-buffer " desktop-file-version)                        (insert "(desktop-create-buffer " desktop-file-version)
651                          (mapcar #'(lambda (e)                        (mapc #'(lambda (e)
652                                      (insert "\n  " (desktop-value-to-string e)))                                  (insert "\n  " (desktop-value-to-string e)))
653                                  l)                              l)
654                          (insert ")\n\n"))))                        (insert ")\n\n"))))
655                info)              info)
656        (setq default-directory dirname)        (setq default-directory dirname)
657        (when (file-exists-p filename) (delete-file filename))        (when (file-exists-p filename) (delete-file filename))
658        (let ((coding-system-for-write 'emacs-mule))        (let ((coding-system-for-write 'emacs-mule))
# Line 873  directory DIRNAME." Line 873  directory DIRNAME."
873                ((equal '(nil) desktop-buffer-minor-modes) ; backwards compatible                ((equal '(nil) desktop-buffer-minor-modes) ; backwards compatible
874                 (auto-fill-mode 0))                 (auto-fill-mode 0))
875                (t                (t
876                 (mapcar #'(lambda (minor-mode)                 (mapc #'(lambda (minor-mode)
877                             (when (functionp minor-mode) (funcall minor-mode 1)))                           (when (functionp minor-mode) (funcall minor-mode 1)))
878                         desktop-buffer-minor-modes)))                       desktop-buffer-minor-modes)))
879          ;; Even though point and mark are non-nil when written by `desktop-save'          ;; Even though point and mark are non-nil when written by `desktop-save'
880          ;; they may be modified by handlers wanting to set point or mark themselves.          ;; they may be modified by handlers wanting to set point or mark themselves.
881          (when desktop-buffer-point          (when desktop-buffer-point

Legend:
Removed from v.1.49.2.11  
changed lines
  Added in v.1.49.2.12

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26