aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorAndreas Schwab <[email protected]>2005-08-14 23:45:46 +0000
committerAndreas Schwab <[email protected]>2005-08-14 23:45:46 +0000
commit9e7357b07af8abeb1c0a4cea8d6613dc7a60c05c (patch)
tree8dc2c034b2335944d40dcd098b6e186d63a7b5af /lisp
parent8fbee87cc76d41114893e21d2b42234c606bf891 (diff)
Revert last change.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/dired.el5
-rw-r--r--lisp/info.el5
-rw-r--r--lisp/mail/rmail.el5
4 files changed, 10 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7cd528a6e4..ea9572fbbe 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-15 Andreas Schwab <[email protected]>
+
+ * dired.el, info.el, mail/rmail.el: Revert last change.
+
2005-08-14 Thien-Thi Nguyen <[email protected]>
* dired.el: Fix dependency bug: Wrap `desktop-buffer-mode-handlers'
diff --git a/lisp/dired.el b/lisp/dired.el
index 82eae0053e..8d1b4fe8e7 100644
--- 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))
(if (eq system-type 'vax-vms)
diff --git a/lisp/info.el b/lisp/info.el
index 13796f4d39..84b82c0109 100644
--- 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 5072815102..88fe2e9e4e 100644
--- 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)