diff options
| author | Bill Wohler <wohler@newt.com> | 2006-04-21 01:32:16 +0000 |
|---|---|---|
| committer | Bill Wohler <wohler@newt.com> | 2006-04-21 01:32:16 +0000 |
| commit | d2464a9fb9f941c0c3b0820fcf9581e552c41f58 (patch) | |
| tree | b3536cae7a3fd234afba8678d08300528ce03fab /lisp/mh-e/mh-folder.el | |
| parent | 7fe9a6e3c1877f4b0500679ace5a0beb781811e0 (diff) | |
| download | emacs-d2464a9fb9f941c0c3b0820fcf9581e552c41f58.tar.gz | |
* mh-tool-bar.el (image-load-path): Define to shush compiler.
(mh-buffer-exists-p): Move inside mh-do-in-gnu-emacs since it isn't
used outside of it.
(mh-tool-bar-folder-buttons-init, mh-tool-bar-letter-buttons-init):
Update load-path/image-load-path before setting buttons. This code
used to be in mh-folder-mode/mh-letter-mode but this was the wrong
place since mh-tool-bar-*-buttons-init can also be called when
customizing the buttons.
(mh-tool-bar-update): New function which updates tool-bar-map in all
of the MH-E buffers after customizing the buttons (closes SF
#1452718).
(mh-tool-bar-folder-buttons-set, mh-tool-bar-letter-buttons-set): Call
it (closes SF #1452718).
* mh-folder.el (mh-folder-buttons-init-flag): Delete. Use
mh-folder-tool-bar-map instead.
(image-load-path): Delete. No longer used.
(mh-folder-mode): Moved setting of image-load-path into
mh-tool-bar-folder-buttons-init.
* mh-letter.el (mh-letter-buttons-init-flag): Delete. Use
mh-letter-tool-bar-map instead.
(image-load-path): Delete. No longer used.
(mh-letter-mode): Moved setting of image-load-path into
mh-tool-bar-letter-buttons-init.
* mh-seq.el (mh-narrow-to-seq, mh-widen): Use with-current-buffer
instead of set-buffer.
Diffstat (limited to 'lisp/mh-e/mh-folder.el')
| -rw-r--r-- | lisp/mh-e/mh-folder.el | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/lisp/mh-e/mh-folder.el b/lisp/mh-e/mh-folder.el index 8516856f14e..282bc118439 100644 --- a/lisp/mh-e/mh-folder.el +++ b/lisp/mh-e/mh-folder.el @@ -524,11 +524,8 @@ font-lock is done highlighting.") ;; Shush compiler. (defvar desktop-save-buffer) (defvar font-lock-auto-fontify) -(defvar image-load-path) (defvar font-lock-defaults) ; XEmacs -(defvar mh-folder-buttons-init-flag nil) - ;; Ensure new buffers won't get this mode if default-major-mode is nil. (put 'mh-folder-mode 'mode-class 'special) @@ -590,13 +587,8 @@ perform the operation on all messages in that region. \\{mh-folder-mode-map}" (mh-do-in-gnu-emacs - (unless mh-folder-buttons-init-flag - (let* ((load-path (mh-image-load-path-for-library "mh-e" "mh-logo.xpm")) - (image-load-path (cons (car load-path) - (when (boundp 'image-load-path) - image-load-path)))) - (mh-tool-bar-folder-buttons-init) - (setq mh-folder-buttons-init-flag t))) + (unless mh-folder-tool-bar-map + (mh-tool-bar-folder-buttons-init)) (set (make-local-variable 'tool-bar-map) mh-folder-tool-bar-map)) (mh-do-in-xemacs (mh-tool-bar-init :folder)) |