From e6de37c57557d2d50f620f272259ee636a379bce Mon Sep 17 00:00:00 2001 From: Lars Hansen Date: Wed, 10 Aug 2005 19:44:44 +0000 Subject: [PATCH] Add handler to desktop-buffer-mode-handlers. (mh-restore-desktop-buffer): Remove autoload cookie. (mh-folder-mode): Add autoload cookie. --- lisp/ChangeLog | 44 ++++++++++++++++++++++++++++++++++++++++++++ lisp/mh-e/ChangeLog | 5 +++++ lisp/mh-e/mh-e.el | 6 +++++- 3 files changed, 54 insertions(+), 1 deletion(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 8668a91a903..089c21d7a04 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,47 @@ +2005-08-10 Lars Hansen + * desktop.el (desktop-buffer-mode-handlers): Make + non-customizable. Add autoload cookie. Change initial value to + nil; add elements in respective modules instead. Fix doc string. + (desktop-load-file): New function. + (desktop-minor-mode-handlers): New autoloaded variable. + (desktop-create-buffer): Call minor mode handlers. Use + desktop-load-file to load major and minor mode modules prior to + checking for a handler. + (desktop-save): Don't add nil to desktop-minor-modes for minor + modes with nil function in desktop-minor-mode-table. Don't delete + desktop file before rewriting it. + (desktop-locals-to-save): Add autoload cookie. Don't make + automatically buffer-local. Add variables column-number-mode, + size-indication-mode, indent-tabs-mode, + indicate-buffer-boundaries, indicate-empty-lines and + show-trailing-whitespace. + (desktop-clear): Allow desktop-clear-preserve-buffers to contain + regexps. Don't use desktop-clear-preserve-buffers-regexp. + (desktop-clear-preserve-buffers-regexp): Delete. + (desktop-clear-preserve-buffers): Update initial value and + docstring. + (desktop-save-buffer): Fix doc string. + + * hilit-chg.el: Add handler to desktop-minor-mode-handlers. + (hilit-chg-desktop-restore): New function. + (highlight-changes-mode): Add highlight-changes-mode to + desktop-locals-to-save. + + * dired.el: Add handler to desktop-buffer-mode-handlers. + (dired-restore-desktop-buffer): Remove autoload cookie. + (dired-mode): Add autoload cookie. + + * info.el: Add handler to desktop-buffer-mode-handlers. + (Info-restore-desktop-buffer): Remove autoload cookie. + (Info-mode): Add autoload cookie. + + * mh-e/mh-e.el: Add handler to desktop-buffer-mode-handlers. + (mh-restore-desktop-buffer): Remove autoload cookie. + (mh-folder-mode): Add autoload cookie. + + * mail/rmail.el: Add handler to desktop-buffer-mode-handlers. + (rmail-restore-desktop-buffer): Remove autoload cookie. + 2005-08-11 Masatake YAMATO * hexl.el (hexl-address-region): diff --git a/lisp/mh-e/ChangeLog b/lisp/mh-e/ChangeLog index db3de56d8b4..b217ae5e9f3 100644 --- a/lisp/mh-e/ChangeLog +++ b/lisp/mh-e/ChangeLog @@ -1,3 +1,8 @@ +2005-08-10 Lars Hansen + * mh-e.el: Add handler to desktop-buffer-mode-handlers. + (mh-restore-desktop-buffer): Remove autoload cookie. + (mh-folder-mode): Add autoload cookie. + 2005-07-04 Lute Kamstra Update FSF's address in GPL notices. diff --git a/lisp/mh-e/mh-e.el b/lisp/mh-e/mh-e.el index 12e77c6c833..3d917c16935 100644 --- a/lisp/mh-e/mh-e.el +++ b/lisp/mh-e/mh-e.el @@ -1507,6 +1507,8 @@ is used in previous versions and XEmacs." (not (member 'mh-folder-mode which-func-modes))) (push 'mh-folder-mode which-func-modes)) +;; Autoload cookie needed by desktop.el +;;;###autoload (define-derived-mode mh-folder-mode fundamental-mode "MH-Folder" "Major MH-E mode for \"editing\" an MH folder scan listing.\\ @@ -1653,7 +1655,6 @@ messages in that region. (set (make-local-variable (car pairs)) (car (cdr pairs))) (setq pairs (cdr (cdr pairs))))) -;;;###autoload (defun mh-restore-desktop-buffer (desktop-buffer-file-name desktop-buffer-name desktop-buffer-misc) @@ -1666,6 +1667,9 @@ DESKTOP-BUFFER-MISC holds a list of miscellaneous info used by the (mh-visit-folder desktop-buffer-name) (current-buffer)) +(add-to-list 'desktop-buffer-mode-handlers + '(mh-folder-mode . mh-restore-desktop-buffer)) + (defun mh-scan-folder (folder range &optional dont-exec-pending) "Scan the FOLDER over the RANGE. If the optional argument DONT-EXEC-PENDING is non-nil then pending deletes and -- 2.39.2