aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThien-Thi Nguyen2005-08-14 12:43:37 +0000
committerThien-Thi Nguyen2005-08-14 12:43:37 +0000
commit91859276fb135836dbce5a7338059215d4e05dbe (patch)
tree9038af8de183052115e23dec5ea2d7610a5a6b12
parentc1a4c74d400c9b90c94599beba474abeeba34f7e (diff)
downloademacs-91859276fb135836dbce5a7338059215d4e05dbe.tar.gz
emacs-91859276fb135836dbce5a7338059215d4e05dbe.zip
Fix dependency bug: Wrap `desktop-buffer-mode-handlers'
modification in `eval-after-load' form.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/dired.el5
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3936dc45eb9..0d15559202b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12005-08-14 Thien-Thi Nguyen <ttn@gnu.org>
2
3 * dired.el: Fix dependency bug: Wrap `desktop-buffer-mode-handlers'
4 modification in `eval-after-load' form.
5
12005-08-14 Juri Linkov <juri@jurta.org> 62005-08-14 Juri Linkov <juri@jurta.org>
2 7
3 * progmodes/compile.el (compilation-mode-font-lock-keywords): 8 * progmodes/compile.el (compilation-mode-font-lock-keywords):
diff --git a/lisp/dired.el b/lisp/dired.el
index 7c628d30da3..82eae0053e2 100644
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3292,8 +3292,9 @@ Ask means pop up a menu for the user to select one of copy, move or link."
3292 (when desktop-missing-file-warning (sit-for 1)) 3292 (when desktop-missing-file-warning (sit-for 1))
3293 nil))) 3293 nil)))
3294 3294
3295(add-to-list 'desktop-buffer-mode-handlers 3295(eval-after-load 'desktop
3296 '(dired-mode . dired-restore-desktop-buffer)) 3296 '(add-to-list 'desktop-buffer-mode-handlers
3297 '(dired-mode . dired-restore-desktop-buffer)))
3297 3298
3298 3299
3299(if (eq system-type 'vax-vms) 3300(if (eq system-type 'vax-vms)