From 6ab2c7a8fb238a829d3312526ac56e4e3408b59a Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Sun, 26 Jul 2009 08:34:53 +0000 Subject: [PATCH] Merge from gnus--devo--0 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1616 --- lisp/gnus/ChangeLog | 10 ++++++++++ lisp/gnus/gnus-art.el | 27 +++------------------------ 2 files changed, 13 insertions(+), 24 deletions(-) diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 7ebd27e03ec..cd5bcc4f4d3 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog @@ -3,6 +3,16 @@ * gnus-demon.el (gnus-demon-add-nntp-close-connection): Fix typo. (Bug#3903) +2009-07-23 Katsumi Yamaoka + + * gnus-art.el (gnus-article-mode-map): Bind the "e" key to + gnus-article-read-summary-keys rather than gnus-summary-edit-article + that should not be used for draft articles. + (gnus-article-read-summary-keys): Use key-binding instead of lookup-key + that has no concern in minor mode keys. + (gnus-article-summary-command, gnus-article-summary-command-nosave): + Abolish. + 2009-07-16 Katsumi Yamaoka * nnrss.el (nnrss-request-article): Allow mml-to-mime to generate MIME diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el index df1a970f915..09f481763df 100644 --- a/lisp/gnus/gnus-art.el +++ b/lisp/gnus/gnus-art.el @@ -4270,7 +4270,6 @@ If variable `gnus-use-long-file-name' is non-nil, it is "s" gnus-article-show-summary "\C-c\C-m" gnus-article-mail "?" gnus-article-describe-briefly - "e" gnus-summary-edit-article "<" beginning-of-buffer ">" end-of-buffer "\C-c\C-i" gnus-info-find-node @@ -4281,6 +4280,7 @@ If variable `gnus-use-long-file-name' is non-nil, it is "\C-hc" gnus-article-describe-key-briefly "\C-hb" gnus-article-describe-bindings + "e" gnus-article-read-summary-keys "\C-d" gnus-article-read-summary-keys "\M-*" gnus-article-read-summary-keys "\M-#" gnus-article-read-summary-keys @@ -6277,27 +6277,6 @@ not have a face in `gnus-article-boring-faces'." (interactive) (gnus-message 6 (substitute-command-keys "\\\\[gnus-article-goto-next-page]:Next page \\[gnus-article-goto-prev-page]:Prev page \\[gnus-article-show-summary]:Show summary \\[gnus-info-find-node]:Run Info \\[gnus-article-describe-briefly]:This help"))) -(defun gnus-article-summary-command () - "Execute the last keystroke in the summary buffer." - (interactive) - (let ((obuf (current-buffer)) - (owin (current-window-configuration)) - func) - (switch-to-buffer gnus-article-current-summary 'norecord) - (setq func (lookup-key (current-local-map) (this-command-keys))) - (call-interactively func) - (set-buffer obuf) - (set-window-configuration owin) - (set-window-point (get-buffer-window (current-buffer)) (point)))) - -(defun gnus-article-summary-command-nosave () - "Execute the last keystroke in the summary buffer." - (interactive) - (let (func) - (pop-to-buffer gnus-article-current-summary) - (setq func (lookup-key (current-local-map) (this-command-keys))) - (call-interactively func))) - (defun gnus-article-check-buffer () "Beep if not in an article buffer." (unless (equal major-mode 'gnus-article-mode) @@ -6340,7 +6319,7 @@ not have a face in `gnus-article-boring-faces'." (pop-to-buffer gnus-article-current-summary) ;; We disable the pick minor mode commands. (let (gnus-pick-mode) - (setq func (lookup-key (current-local-map) keys)))) + (setq func (key-binding keys t)))) (if (or (not func) (numberp func)) (ding) @@ -6375,7 +6354,7 @@ not have a face in `gnus-article-boring-faces'." (setq in-buffer (current-buffer)) ;; We disable the pick minor mode commands. (if (and (setq func (let (gnus-pick-mode) - (lookup-key (current-local-map) keys))) + (key-binding keys t))) (functionp func) (condition-case code (progn -- 2.39.2