aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2005-08-14 23:45:46 +0000
committerAndreas Schwab2005-08-14 23:45:46 +0000
commit9e7357b07af8abeb1c0a4cea8d6613dc7a60c05c (patch)
tree8dc2c034b2335944d40dcd098b6e186d63a7b5af
parent8fbee87cc76d41114893e21d2b42234c606bf891 (diff)
downloademacs-9e7357b07af8abeb1c0a4cea8d6613dc7a60c05c.tar.gz
emacs-9e7357b07af8abeb1c0a4cea8d6613dc7a60c05c.zip
Revert last change.
-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 7cd528a6e41..ea9572fbbeb 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12005-08-15 Andreas Schwab <schwab@suse.de>
2
3 * dired.el, info.el, mail/rmail.el: Revert last change.
4
12005-08-14 Thien-Thi Nguyen <ttn@gnu.org> 52005-08-14 Thien-Thi Nguyen <ttn@gnu.org>
2 6
3 * dired.el: Fix dependency bug: Wrap `desktop-buffer-mode-handlers' 7 * dired.el: Fix dependency bug: Wrap `desktop-buffer-mode-handlers'
diff --git a/lisp/dired.el b/lisp/dired.el
index 82eae0053e2..8d1b4fe8e7e 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."
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(eval-after-load 'desktop 3295(add-to-list 'desktop-buffer-mode-handlers
3296 '(add-to-list 'desktop-buffer-mode-handlers 3296 '(dired-mode . dired-restore-desktop-buffer))
3297 '(dired-mode . dired-restore-desktop-buffer)))
3298 3297
3299 3298
3300(if (eq system-type 'vax-vms) 3299(if (eq system-type 'vax-vms)
diff --git a/lisp/info.el b/lisp/info.el
index 13796f4d393..84b82c01092 100644
--- a/lisp/info.el
+++ b/lisp/info.el
@@ -4194,9 +4194,8 @@ BUFFER is the buffer speedbar is requesting buttons for."
4194 (Info-find-node first second) 4194 (Info-find-node first second)
4195 (current-buffer)))) 4195 (current-buffer))))
4196 4196
4197(eval-after-load 'desktop 4197(add-to-list 'desktop-buffer-mode-handlers
4198 '(add-to-list 'desktop-buffer-mode-handlers 4198 '(Info-mode . Info-restore-desktop-buffer))
4199 '(Info-mode . Info-restore-desktop-buffer)))
4200 4199
4201(provide 'info) 4200(provide 'info)
4202 4201
diff --git a/lisp/mail/rmail.el b/lisp/mail/rmail.el
index 50728151024..88fe2e9e4ef 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."
4086 (kill-buffer (current-buffer)) 4086 (kill-buffer (current-buffer))
4087 nil))) 4087 nil)))
4088 4088
4089(eval-after-load 'desktop 4089(add-to-list 'desktop-buffer-mode-handlers
4090 '(add-to-list 'desktop-buffer-mode-handlers 4090 '(rmail-mode . rmail-restore-desktop-buffer))
4091 '(rmail-mode . rmail-restore-desktop-buffer)))
4092 4091
4093(provide 'rmail) 4092(provide 'rmail)
4094 4093