From: yamaoka Date: Tue, 24 Jan 2006 22:07:25 +0000 (+0000) Subject: Synch to No Gnus 200601241653. X-Git-Tag: t-gnus-6_17_4-quimby-~135 X-Git-Url: http://git.chise.org/gitweb/?a=commitdiff_plain;h=9322be8d6a1584e746d4b581344fd27d5ce26c9a;p=elisp%2Fgnus.git- Synch to No Gnus 200601241653. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 661fe82..9841971 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,10 @@ +2006-01-24 Reiner Steib + + * gmm-utils.el (gmm-tool-bar-item): Add "Separator". + (gmm-tool-bar-from-list): Suppress tooltip for `gmm-ignore'. + + * message.el (message-tool-bar-gnome): Use gmm-ignore. + 2006-01-24 Katsumi Yamaoka * gnus-xmas.el (gnus-mime-security-button-menu): New alias. @@ -83,15 +90,30 @@ * mml.el (mml-attach-file): Describe `description' in doc string. (mml-menu): Add Emacs MIME manual and PGG manual. -2005-12-12 Richard M. Stallman +2006-01-20 Richard M. Stallman * mm-url.el (mm-url-load-url): Require url-parse and url-vars. -2005-11-14 Kevin Greiner +2006-01-20 Kevin Greiner * nntp.el (nntp-end-of-line): Doc fix. -2005-11-04 Ken Manheimer +2006-01-20 Chong Yidong + + * imap.el (imap-open): Handle case where buffer is a buffer + object. + +2005-01-20 Stefan Monnier + + * gnus-delay.el (gnus-delay): Don't autoload. + It's useless and could trigger a bug in cus-dep.el causing ldefs-boot + to be re-loaded when customizing the `gnus-delay' group. + +2005-01-20 Chong Yidong + + * message.el (message-insert-citation-line): Use newlines. + +2006-01-19 Ken Manheimer * pgg-pgp.el (pgg-pgp-encrypt-region, pgg-pgp-decrypt-region) (pgg-pgp-sign-region): Add optional 'passphrase' argument to all @@ -107,12 +129,7 @@ (pgg-pgp5-sign-region): Use new name of pgg-add-passphrase-to-cache function. -2005-10-30 Chong Yidong - - * imap.el (imap-open): Handle case where buffer is a buffer - object. - -2005-10-29 Ken Manheimer +2006-01-19 Ken Manheimer * pgg-gpg.el (pgg-gpg-select-matching-key): Fix: look at the right part of the decoded armor to find the key-identifier. @@ -138,7 +155,7 @@ (pgg-decrypt): Convey provided passphrase in subordinate call to pgg-decrypt-region. -2005-10-20 Ken Manheimer +2006-01-19 Ken Manheimer * pgg.el (pgg-encrypt-region, pgg-encrypt-symmetric-region) (pgg-encrypt-symmetric, pgg-encrypt, pgg-decrypt-region) @@ -161,7 +178,7 @@ 'notruncate' argument, so the passphrase cache can be used reliably with identifiers besides a pgp packet's key id. -2005-10-29 Sascha Wilde +2006-01-19 Sascha Wilde * pgg-gpg.el (pgg-gpg-encrypt-symmetric-region): New function for symmetric encryption. @@ -173,16 +190,6 @@ * pgg.el (pgg-encrypt-symmetric, pgg-encrypt-symmetric-region): New user commands for symmetric encryption. -2005-11-30 Stefan Monnier - - * gnus-delay.el (gnus-delay): Don't autoload. - It's useless and could trigger a bug in cus-dep.el causing ldefs-boot - to be re-loaded when customizing the `gnus-delay' group. - -2005-11-19 Chong Yidong - - * message.el (message-insert-citation-line): Use newlines. - 2006-01-19 Katsumi Yamaoka * mm-bodies.el (mm-decode-body): Don't decode decoded body. diff --git a/lisp/gmm-utils.el b/lisp/gmm-utils.el index c398368..88e42f3 100644 --- a/lisp/gmm-utils.el +++ b/lisp/gmm-utils.el @@ -114,14 +114,21 @@ This is copy of the `lazy' widget in Emacs 22.1 provided for compatibility." (define-widget 'gmm-tool-bar-item (if (gmm-widget-p 'lazy) 'lazy 'gmm-lazy) "Tool bar list item." :tag "Tool bar item" - :type '(list (function :tag "Menu Command") - (string :tag "Icon file") - (choice (const :tag "Default map" nil) - ;; Note: Usually we need non-nil attributes if map is - ;; t. - (const :tag "No menu" t) - (sexp :tag "Other map")) - (plist :inline t :tag "Properties"))) + :type '(choice + (list :tag "Command and Icon" + (function :tag "Command") + (string :tag "Icon file") + (choice + (const :tag "Default map" nil) + ;; Note: Usually we need non-nil attributes if map is t. + (const :tag "No menu" t) + (sexp :tag "Other map")) + (plist :inline t :tag "Properties")) + (list :tag "Separator" + (const :tag "No command" gmm-ignore) + (string :tag "Icon file") + (const :tag "No map") + (plist :inline t :tag "Properties")))) ;;;###autoload (define-widget 'gmm-tool-bar-zap-list (if (gmm-widget-p 'lazy) 'lazy 'gmm-lazy) @@ -189,14 +196,15 @@ DEFAULT-MAP specifies the default key map for ICON-LIST." (fmap (or (nth 2 el) default-map)) (props (cdr (cdr (cdr el)))) ) ;; command may stem from different from-maps: - (cond ((eq command 'ignore) - ;; FIXME: How to get no tool tip at all? + (cond ((eq command 'gmm-ignore) + ;; The dummy `gmm-ignore', see `gmm-tool-bar-item' + ;; widget. Suppress tooltip by adding `:enable nil'. (if (fboundp 'tool-bar-local-item) (apply 'tool-bar-local-item icon nil nil - tool-bar-map props) + tool-bar-map :enable nil props) ;; (tool-bar-local-item ICON DEF KEY MAP &rest PROPS) ;; (tool-bar-add-item ICON DEF KEY &rest PROPS) - (apply 'tool-bar-add-item icon nil nil props))) + (apply 'tool-bar-add-item icon nil nil :enable nil props))) ((equal fmap t) ;; Not a menu command (if (fboundp 'tool-bar-local-item) (apply 'tool-bar-local-item diff --git a/lisp/message.el b/lisp/message.el index 89bf988..5f48faa 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -7460,7 +7460,7 @@ Pre-defined symbols include `message-tool-bar-gnome' and ;; The new icons are not yet committed, see ;; http://thread.gmane.org/gmane.emacs.gnus.general/61719 (defcustom message-tool-bar-gnome - '((ignore "separator" nil :help "") ;; How to get no tooltip? + '((gmm-ignore "separator") (message-send-and-exit "send") (message-dont-send "save-draft") (message-kill-buffer "close") ;; stock_cancel