2 files changed, 25 insertions, 0 deletions

diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog
index 92c2600560f..6eb2c1bc2ec 100644
--- a/lisp/mh-e/ChangeLog
+++ b/lisp/mh-e/ChangeLog
@@ -1,3 +1,6 @@
+2004-04-26  Lars Hansen  <larsh@math.ku.dk>
+        * mh-e.el (mh-folder-mode): Bind desktop-save-buffer to t.
+
 2003-04-24  Bill Wohler  <wohler@newt.com>
 
         * Released MH-E version 7.3.
@@ -47,6 +50,10 @@
         runs checkdoc and lm-verify which is useful before releasing the
         software. It can and should be expanded to do real unit tests.
 
+2004-04-22  Lars Hansen  <larsh@math.ku.dk>
+
+        * mh-e.el (mh-restore-desktop-buffer): Delete with-no-warnings.
+
 2003-04-22  Mark D Baushke  <mdb@gnu.org>
 
         * mh-alias.el: Update Copyright.
@@ -71,6 +78,11 @@
         Emacs.
         (mh-exec-cmd-error): Add a comment, so that we change it later on.
 
+2004-04-21  Lars Hansen  <larsh@math.ku.dk>
+        
+        * mh-e.el (mh-restore-desktop-buffer): Move from
+        desktop.el. Add Parameters.
+
 2003-04-18  Steve Youngs  <youngs@xemacs.org>
 
         * mh-xemacs-icons.el (mh-xemacs-icons): Provide 'mh-xemacs-icons'
diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el
index c4b027f382f..344a67f5725 100644
--- a/lisp/mh-e/mh-e.el
+++ b/lisp/mh-e/mh-e.el
@@ -1548,6 +1548,8 @@ When a folder is visited, the hook `mh-folder-mode-hook' is run.
 
   (make-local-variable 'font-lock-defaults)
   (setq font-lock-defaults '(mh-folder-font-lock-keywords t))
+  (make-local-variable 'desktop-save-buffer)
+  (setq desktop-save-buffer t)
   (mh-make-local-vars
    'mh-current-folder (buffer-name)     ; Name of folder, a string
    'mh-show-buffer (format "show-%s" (buffer-name)) ; Buffer that displays msgs
@@ -2441,6 +2443,17 @@ well.")
                 "^There is no other window$"))
   (add-to-list 'debug-ignored-errors mess))
 
+;;;;  Desktop support
+
+;;;###autoload
+(defun mh-restore-desktop-buffer (desktop-buffer-file-name
+                                  desktop-buffer-name
+                                  desktop-buffer-misc)
+  "Restore an mh folder buffer specified in a desktop file."
+  (mh-find-path)
+  (mh-visit-folder desktop-buffer-name)
+  (current-buffer))
+
 (provide 'mh-e)
 
 ;;; Local Variables: