aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Hansen2006-09-12 07:13:52 +0000
committerLars Hansen2006-09-12 07:13:52 +0000
commit4cffefee99809caa82dd85f5d0dd026f3fbf597d (patch)
tree7a502a6a8e57979a744acbb716e51e3a34e95af6
parentc5b0bab9dcab24e92582696f0af559ead52d9420 (diff)
downloademacs-4cffefee99809caa82dd85f5d0dd026f3fbf597d.tar.gz
emacs-4cffefee99809caa82dd85f5d0dd026f3fbf597d.zip
Add comment.
-rw-r--r--lisp/ChangeLog3
-rw-r--r--lisp/desktop.el3
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index e70988b6ffe..6e05003e095 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,6 @@
12006-09-12 Lars Hansen <larsh@soem.dk>
2 * desktop.el (desktop-read): Add comment.
3
12006-09-12 Kim F. Storm <storm@cua.dk> 42006-09-12 Kim F. Storm <storm@cua.dk>
2 5
3 * simple.el (next-error-highlight, next-error-highlight-no-select): 6 * simple.el (next-error-highlight, next-error-highlight-no-select):
diff --git a/lisp/desktop.el b/lisp/desktop.el
index e81648b0b3c..d2b2271d306 100644
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -863,7 +863,8 @@ It returns t if a desktop file was loaded, nil otherwise."
863 (let ((desktop-first-buffer nil) 863 (let ((desktop-first-buffer nil)
864 (desktop-buffer-ok-count 0) 864 (desktop-buffer-ok-count 0)
865 (desktop-buffer-fail-count 0) 865 (desktop-buffer-fail-count 0)
866 desktop-save) 866 ;; Avoid desktop saving during evaluation of desktop buffer.
867 (desktop-save nil))
867 (desktop-lazy-abort) 868 (desktop-lazy-abort)
868 ;; Evaluate desktop buffer. 869 ;; Evaluate desktop buffer.
869 (load (desktop-full-file-name) t t t) 870 (load (desktop-full-file-name) t t t)