(require 'canlock)
(require 'mailheader)
(require 'nnheader)
+(require 'gmm-utils)
;; This is apparently necessary even though things are autoloaded.
;; Because we dynamically bind mail-abbrev-mode-regexp, we'd better
;; require mailabbrev here.
(autoload 'gnus-request-post "gnus-int")
(autoload 'gnus-server-string "gnus")
(autoload 'idna-to-ascii "idna")
- (autoload 'gmm-tool-bar-from-list "gmm-utils")
- (autoload 'gmm-image-load-path "gmm-utils")
(autoload 'message-setup-toolbar "messagexmas")
(autoload 'mh-new-draft-name "mh-comp")
(autoload 'mh-send-letter "mh-comp")
(when (let ((char (char-after)))
(or (< (mm-char-int char) 128)
(and (mm-multibyte-p)
- ;; Fixme: Wrong for Emacs 23 (unicode) and for
+ ;; FIXME: Wrong for Emacs 23 (unicode) and for
;; things like undecable utf-8. Should at least
;; use find-coding-systems-region.
(memq (char-charset char)
;; When used as ":set" function:
(set-default symbol value)))
-;; The default will be changed when the new icons have been checked in:
-(defcustom message-tool-bar 'message-tool-bar-retro
+(defcustom message-tool-bar (if (eq gmm-tool-bar-style 'gnome)
+ 'message-tool-bar-gnome
+ 'message-tool-bar-retro)
"Specifies the message mode tool bar.
It can be either a list or a symbol refering to a list. See
(message-send-and-exit "mail/send")
(message-dont-send "mail/save-draft")
(message-kill-buffer "close") ;; stock_cancel
- (mml-attach-file "mail/attach" mml-mode-map)
+ (mml-attach-file "attach" mml-mode-map)
(ispell-message "spell" nil :visible (not flyspell-mode))
(flyspell-buffer "spell" t :visible flyspell-mode
:help "Flyspell whole buffer")
- ;; We should have a mail-preview icon with an envelope like the one in
- ;; stock_mail-reply.
(mml-preview "mail/preview" mml-mode-map)
(mml-secure-message-sign-encrypt "lock" mml-mode-map :visible nil)
(message-insert-importance-high "important" nil :visible nil)
(message-insert-importance-low "unimportant" nil :visible nil)
(message-insert-disposition-notification-to "receipt" nil :visible nil)
+ (gmm-customize-mode "preferences" t :help "Edit mode preferences")
(message-info "help" t :help "Message manual"))
"List of items for the message tool bar (GNOME style).
:group 'message)
(defcustom message-tool-bar-retro
- '(;; Old Emacs 21 icon for consitency.
+ '(;; Old Emacs 21 icon for consistency.
(message-send-and-exit "gnus/mail_send")
(message-kill-buffer "close")
(message-dont-send "cancel")
(or (not message-tool-bar-map) force))
(setq message-tool-bar-map
(let ((load-path
- (gmm-image-load-path "message" "mail/save-draft.xpm"
- 'load-path))
+ (gmm-image-load-path-for-library "message"
+ "mail/save-draft.xpm"
+ nil t))
(image-load-path
- (gmm-image-load-path "message" "mail/save-draft.xpm"
- 'image-load-path)))
+ (gmm-image-load-path-for-library "message"
+ "mail/save-draft.xpm"
+ 'image-load-path t)))
(gmm-tool-bar-from-list message-tool-bar
message-tool-bar-zap-list
'message-mode-map))))