diff options
| author | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-09-24 07:25:37 +0000 |
|---|---|---|
| committer | Katsumi Yamaoka <yamaoka@jpl.org> | 2010-09-24 07:25:37 +0000 |
| commit | 5843126b45d053c3d153c4157230462094a7e505 (patch) | |
| tree | 5f5efc8f6d0a41c8652c6eea8cacbbb874120db1 /lisp/gnus/gmm-utils.el | |
| parent | 3431395cd8d11f1fede7fdcdae0be04b621aa3c9 (diff) | |
| download | emacs-5843126b45d053c3d153c4157230462094a7e505.tar.gz | |
Remove Emacs 21 stuff.
gmm-utils.el (gmm-tool-bar-from-list): Always use tool-bar-local-item and tool-bar-local-item-from-menu.
gnus-agent.el (gnus-agent-make-mode-line-string): Always use mode-line-highlight face for Emacs.
gnus-art.el (toplevel): Don't bind recursive-load-depth-limit while loading gnus-sum.elc; don't autoload canlock-verify.
gnus-art.el (gnus-article-jump-to-part): Use read-number.
gnus-art.el (gnus-insert-mime-button, gnus-insert-mime-security-button): Remove Emacs pre-21 compatible code for help-echo.
gnus-art.el (gnus-article-next-page-1): No need to adjust the number of lines.
gnus-art.el (gnus-article-describe-bindings): Always use help-buffer.
gnus-audio.el (gnus-audio-inline-sound): Comment fix.
gnus-cus.el (gnus-custom-mode): Comment fix.
gnus-group.el (gnus-group-update-tool-bar): Comment fix.
gnus-sum.el (gnus-remove-overlays): Doc fix.
gnus-util.el (gnus-select-frame-set-input-focus): Remove Emacs 21 compatible code.
Diffstat (limited to 'lisp/gnus/gmm-utils.el')
| -rw-r--r-- | lisp/gnus/gmm-utils.el | 29 |
1 files changed, 9 insertions, 20 deletions
diff --git a/lisp/gnus/gmm-utils.el b/lisp/gnus/gmm-utils.el index 533d9a951b5..b76db479dfb 100644 --- a/lisp/gnus/gmm-utils.el +++ b/lisp/gnus/gmm-utils.el @@ -267,27 +267,16 @@ DEFAULT-MAP specifies the default key map for ICON-LIST." ;; (tool-bar-add-item ICON DEF KEY &rest 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 - icon command - (intern icon) ;; reuse icon or fmap here? - tool-bar-map props) - ;; Emacs 21 compatibility: - (apply 'tool-bar-add-item - icon command - (intern icon) - props))) + (apply 'tool-bar-local-item + icon command + (intern icon) ;; reuse icon or fmap here? + tool-bar-map props)) (t ;; A menu command - (if (fboundp 'tool-bar-local-item-from-menu) - (apply 'tool-bar-local-item-from-menu - ;; (apply 'tool-bar-local-item icon def key - ;; tool-bar-map props) - command icon tool-bar-map (symbol-value fmap) - props) - ;; Emacs 21 compatibility: - (apply 'tool-bar-add-item-from-menu - command icon (symbol-value fmap) - props)))) + (apply 'tool-bar-local-item-from-menu + ;; (apply 'tool-bar-local-item icon def key + ;; tool-bar-map props) + command icon tool-bar-map (symbol-value fmap) + props))) t)) (if (symbolp icon-list) (eval icon-list) |