Revert last change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7cd528a6e41bc65ec6fdaf23854210db70aec747..ea9572fbbebd361335c7097f308a5bc554341f07 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-15  Andreas Schwab  <schwab@suse.de>
+
+       * dired.el, info.el, mail/rmail.el: Revert last change.
+
 2005-08-14  Thien-Thi Nguyen  <ttn@gnu.org>
 
        * dired.el: Fix dependency bug: Wrap `desktop-buffer-mode-handlers'

diff --git a/lisp/dired.el b/lisp/dired.el
index 82eae0053e2044ef85f5511b52b485f13cb5fde0..8d1b4fe8e7e3c4e57db5891b7c264c1686694c09 100644 (file)
--- a/lisp/dired.el
+++ b/lisp/dired.el
@@ -3292,9 +3292,8 @@ 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)))
 
-(eval-after-load 'desktop
-  '(add-to-list 'desktop-buffer-mode-handlers
-                '(dired-mode . dired-restore-desktop-buffer)))
+(add-to-list 'desktop-buffer-mode-handlers
+            '(dired-mode . dired-restore-desktop-buffer))
 
 \f
 (if (eq system-type 'vax-vms)

diff --git a/lisp/info.el b/lisp/info.el
index 13796f4d393883763f311fa046e0a5357dc4bdfd..84b82c010929b4adf9dea5e83e93c792f91b6f2f 100644 (file)
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -4194,9 +4194,8 @@ BUFFER is the buffer speedbar is requesting buttons for."
     (Info-find-node first second)
     (current-buffer))))
 
-(eval-after-load 'desktop
-  '(add-to-list 'desktop-buffer-mode-handlers
-                '(Info-mode . Info-restore-desktop-buffer)))
+(add-to-list 'desktop-buffer-mode-handlers
+            '(Info-mode . Info-restore-desktop-buffer))
 
 (provide 'info)
 

diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 50728151024113d3e2be891182122387358ed198..88fe2e9e4ef133af7a524d3f6e104619e82742fe 100644 (file)
--- a/lisp/mail/rmail.el
+++ b/lisp/mail/rmail.el
@@ -4086,9 +4086,8 @@ encoded string (and the same mask) will decode the string."
       (kill-buffer (current-buffer))
       nil)))
 
-(eval-after-load 'desktop
-  '(add-to-list 'desktop-buffer-mode-handlers
-                '(rmail-mode . rmail-restore-desktop-buffer)))
+(add-to-list 'desktop-buffer-mode-handlers
+            '(rmail-mode . rmail-restore-desktop-buffer))
 
 (provide 'rmail)