From: Thien-Thi Nguyen <ttn@gnuvola.org>
Date: Sun, 14 Aug 2005 12:43:37 +0000 (+0000)
Subject: Fix dependency bug: Wrap `desktop-buffer-mode-handlers'
X-Git-Tag: emacs-pretest-22.0.90~7597
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=91859276fb135836dbce5a7338059215d4e05dbe;p=emacs.git

Fix dependency bug: Wrap `desktop-buffer-mode-handlers'
modification in `eval-after-load' form.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3936dc45eb9..0d15559202b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2005-08-14  Thien-Thi Nguyen  <ttn@gnu.org>
+
+	* dired.el: Fix dependency bug: Wrap `desktop-buffer-mode-handlers'
+	modification in `eval-after-load' form.
+
 2005-08-14  Juri Linkov  <juri@jurta.org>
 
 	* 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."
       (when desktop-missing-file-warning (sit-for 1))
       nil)))
 
-(add-to-list 'desktop-buffer-mode-handlers
-             '(dired-mode . dired-restore-desktop-buffer))
+(eval-after-load 'desktop
+  '(add-to-list 'desktop-buffer-mode-handlers
+                '(dired-mode . dired-restore-desktop-buffer)))
 
 
 (if (eq system-type 'vax-vms)