From 5816b7abd09ccbb2e32767a3d22665f3b7d00341 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 22 Feb 2006 23:10:27 +0000 Subject: [PATCH] Synch to No Gnus 200602221445. --- ChangeLog | 5 +++++ contrib/smime-card.el | 2 -- etc/images/gnus/mail_send.xpm | 39 +++++++++++++++++++++++++++++++++++++++ lisp/ChangeLog | 11 +++++++++++ lisp/gmm-utils.el | 19 ++++++++++++++----- lisp/message.el | 16 ++++++++-------- 6 files changed, 77 insertions(+), 15 deletions(-) create mode 100644 etc/images/gnus/mail_send.xpm diff --git a/ChangeLog b/ChangeLog index 3b5dd4c..cc3dcc6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2006-02-22 Reiner Steib + + * etc/images/gnus/mail_send.xpm: Emacs 21 icon for + message-tool-bar-retro. + 2006-02-21 Reiner Steib * make.bat (:etc): Also consider images in images/mail and diff --git a/contrib/smime-card.el b/contrib/smime-card.el index e76bca4..ef19c9c 100644 --- a/contrib/smime-card.el +++ b/contrib/smime-card.el @@ -192,5 +192,3 @@ card under the id following the `card:' prefix in FILE." ;;; Announce (provide 'smime-card) - -;;; smime-card.el ends here diff --git a/etc/images/gnus/mail_send.xpm b/etc/images/gnus/mail_send.xpm new file mode 100644 index 0000000..f1d2282 --- /dev/null +++ b/etc/images/gnus/mail_send.xpm @@ -0,0 +1,39 @@ +/* XPM */ +static char *magick[] = { +/* columns rows colors chars-per-pixel */ +"24 24 9 1", +" c Gray0", +". c #675e6580613e", +"X c #8c8c7c7c6969", +"o c #9b458d377822", +"O c #a941a6459f3e", +"+ c #c8c8b2b29898", +"@ c #dadac2c2a5a5", +"# c #eb4dea2fe4ad", +"$ c None", +/* pixels */ +"$$$$$$$$$$$$$$$$$$$$$$$$", +"$$$$$$$$$$$$$$$$$$$$$$$$", +"$$$$$$$$$$$$$ $$$$$$$", +"$$$$$$$$ .@#+ $$$$$$", +"$$$ .+#####@O $$$$$$", +"$$ .+##########.+O $$$$$", +"$$ @..########O.+# $$$$$", +"$$ O@O..@#####.+## $$$$$", +"$$$ ###+O.O##...##O $$$$", +"$$$ @####@+..O#O.+# $$$$", +"$$$ O####.#######.O $$$$", +"$$$$ ###+O########.O $$$", +"$$$$ ###.########@O $$$", +"$$$$ +#+O#####@O $$$$$", +"$$$$$ #.###@O $$$$$$", +"$$$$$ .O@O $$ .. $$$$$", +"$$$$$ .. $$$$ .oo. $$$$", +"$$$$$$ $$$$$ oo $$$", +"$$$$$$$$$$$$$$$ Oo $$$$$", +"$$$$$$$$$$$$$$ oOOX $$$$", +"$$$$$$$$$$$$$$ ++++ $$$$", +"$$$$$$$$$$$$$ O@@@@O $$$", +"$$$$$$$$$$$$$ $$$", +"$$$$$$$$$$$$$$$$$$$$$$$$" +}; diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 224000d..7565fad 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,14 @@ +2006-02-22 Reiner Steib + + * message.el: Autoload gmm-image-load-path. + (message-tool-bar-retro): Prepend "gnus/" subdirectory to some + icon file names. Use old Emacs 21 "mail_send.xpm" icon for + consitency. + + * gmm-utils.el (gmm-image-load-path): Also search in + "../etc/images". Don't set gmm-image-load-path if we don't find + the image. + 2006-02-22 Katsumi Yamaoka * gmm-utils.el (gmm-image-load-path): Don't make diff --git a/lisp/gmm-utils.el b/lisp/gmm-utils.el index f9459ae..2d680cd 100644 --- a/lisp/gmm-utils.el +++ b/lisp/gmm-utils.el @@ -271,17 +271,26 @@ path to IMAGE. If PATH is given, it is used instead of (unless library (error "No library specified.")) (unless image (error "No image specified.")) (cond (gmm-image-load-path) ;; User setting exists. - ((let (gmm-library-name) ;; Try relative setting + ((let (gmm-library-name d1ei d2ei) + ;; Try relative setting ;; First, find library in the load-path. (setq gmm-library-name (locate-library library)) (if (not gmm-library-name) (error "Cannot find library `%s' in load-path" library)) ;; And then set gmm-image-load-path relative to that. + (setq + ;; Go down 2 levels... + d2ei (expand-file-name + (concat (file-name-directory gmm-library-name) + "../../etc/images")) + ;; Go down 1 level... + d1ei (expand-file-name + (concat (file-name-directory gmm-library-name) + "../etc/images"))) (setq gmm-image-load-path - (expand-file-name (concat - (file-name-directory gmm-library-name) - "../../etc/images"))) - (file-exists-p (expand-file-name image gmm-image-load-path)))) + ;; Set it to nil if image is not found... + (cond ((file-exists-p (expand-file-name image d2ei)) d2ei) + ((file-exists-p (expand-file-name image d1ei)) d1ei))))) ((let ((img image) (dir (or ;; Images in image-load-path. diff --git a/lisp/message.el b/lisp/message.el index 0cc1d4e..db83406 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -1873,6 +1873,7 @@ You must have the \"hashcash\" binary installed, see `hashcash-path'." (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") @@ -7455,8 +7456,6 @@ Pre-defined symbols include `message-tool-bar-gnome' and :set 'message-tool-bar-update :group 'message) -;; The new icons are not yet committed, see -;; http://thread.gmane.org/gmane.emacs.gnus.general/61719 (defcustom message-tool-bar-gnome '((gmm-ignore "separator") (message-send-and-exit "mail/send") @@ -7484,15 +7483,16 @@ See `gmm-tool-bar-from-list' for details on the format of the list." :group 'message) (defcustom message-tool-bar-retro - '((message-send-and-exit "mail/send") + '(;; Old Emacs 21 icon for consitency. + (message-send-and-exit "gnus/mail_send") (message-kill-buffer "close") (message-dont-send "cancel") -;; (mml-attach-file "attach" mml-mode-map) + ;;(mml-attach-file "attach" mml-mode-map) (ispell-message "spell") -;; (mml-preview "preview" mml-mode-map) - (message-insert-importance-high "important") - (message-insert-importance-low "unimportant") - (message-insert-disposition-notification-to "receipt")) + ;;(mml-preview "preview" mml-mode-map) + (message-insert-importance-high "gnus/important") + (message-insert-importance-low "gnus/unimportant") + (message-insert-disposition-notification-to "gnus/receipt")) "List of items for the message tool bar (retro style). See `gmm-tool-bar-from-list' for details on the format of the list." -- 1.7.10.4