/[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.76 by eliz, Fri Nov 12 16:54:30 2004 UTC revision 1.77 by lh, Fri Nov 26 17:37:32 2004 UTC
# Line 711  It returns t if a desktop file was loade Line 711  It returns t if a desktop file was loade
711          ;; `desktop-create-buffer' puts buffers at end of the buffer list.          ;; `desktop-create-buffer' puts buffers at end of the buffer list.
712          ;; We want buffers existing prior to evaluating the desktop (and not reused)          ;; We want buffers existing prior to evaluating the desktop (and not reused)
713          ;; to be placed at the end of the buffer list, so we move them here.          ;; to be placed at the end of the buffer list, so we move them here.
714          (mapcar 'bury-buffer          (mapc 'bury-buffer
715                  (nreverse (cdr (memq desktop-first-buffer (nreverse (buffer-list))))))                (nreverse (cdr (memq desktop-first-buffer (nreverse (buffer-list))))))
716          (switch-to-buffer (car (buffer-list)))          (switch-to-buffer (car (buffer-list)))
717          (run-hooks 'desktop-delay-hook)          (run-hooks 'desktop-delay-hook)
718          (setq desktop-delay-hook nil)          (setq desktop-delay-hook nil)
# Line 855  directory DIRNAME." Line 855  directory DIRNAME."
855            (setq desktop-buffer-ok-count (1+ desktop-buffer-ok-count))            (setq desktop-buffer-ok-count (1+ desktop-buffer-ok-count))
856          (setq desktop-buffer-fail-count (1+ desktop-buffer-fail-count))          (setq desktop-buffer-fail-count (1+ desktop-buffer-fail-count))
857          (setq result nil))          (setq result nil))
       (unless (bufferp result) (setq result nil))  
858        ;; Restore buffer list order with new buffer at end. Don't change        ;; Restore buffer list order with new buffer at end. Don't change
859        ;; the order for old desktop files (old desktop module behaviour).        ;; the order for old desktop files (old desktop module behaviour).
860        (unless (< desktop-file-version 206)        (unless (< desktop-file-version 206)
861          (mapcar 'bury-buffer buffer-list)          (mapc 'bury-buffer buffer-list)
862          (when result (bury-buffer result)))          (when result (bury-buffer result)))
863        (when result        (when result
864          (unless (or desktop-first-buffer (< desktop-file-version 206))          (unless (or desktop-first-buffer (< desktop-file-version 206))

Legend:
Removed from v.1.76  
changed lines
  Added in v.1.77

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