1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00

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.
This commit is contained in:
Katsumi Yamaoka 2010-09-24 07:25:37 +00:00
parent 3431395cd8
commit 5843126b45
9 changed files with 63 additions and 89 deletions

View file

@ -1661,30 +1661,14 @@ CHOICE is a list of the choice char and help message at IDX."
(kill-buffer buf))
tchar))
(declare-function x-focus-frame "xfns.c" (frame))
(declare-function w32-focus-frame "../term/w32-win" (frame))
(defun gnus-select-frame-set-input-focus (frame)
"Select FRAME, raise it, and set input focus, if possible."
(cond ((featurep 'xemacs)
(if (fboundp 'select-frame-set-input-focus)
(select-frame-set-input-focus frame)
(raise-frame frame)
(select-frame frame)
(focus-frame frame)))
;; `select-frame-set-input-focus' defined in Emacs 21 will not
;; set the input focus.
((>= emacs-major-version 22)
(select-frame-set-input-focus frame))
(t
(raise-frame frame)
(select-frame frame)
(cond ((memq window-system '(x ns mac))
(x-focus-frame frame))
((eq window-system 'w32)
(w32-focus-frame frame)))
(when focus-follows-mouse
(set-mouse-position frame (1- (frame-width frame)) 0)))))
(if (fboundp 'select-frame-set-input-focus)
(defalias 'gnus-select-frame-set-input-focus 'select-frame-set-input-focus)
;; XEmacs 21.4, SXEmacs
(defun gnus-select-frame-set-input-focus (frame)
"Select FRAME, raise it, and set input focus, if possible."
(raise-frame frame)
(select-frame frame)
(focus-frame frame)))
(defun gnus-frame-or-window-display-name (object)
"Given a frame or window, return the associated display name.