Mercurial > emacs
diff lisp/gnus/gnus-art.el @ 82491:962fb740e73f
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 93-96)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 245)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-856
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 21 Aug 2007 04:51:30 +0000 |
parents | e5a68f18fcb9 28c0174177f4 |
children | d7862063d437 aaccdab0ee26 |
line wrap: on
line diff
--- a/lisp/gnus/gnus-art.el Mon Aug 20 23:28:16 2007 +0000 +++ b/lisp/gnus/gnus-art.el Tue Aug 21 04:51:30 2007 +0000 @@ -5607,7 +5607,7 @@ "Execute the last keystroke in the summary buffer." (interactive) (let (func) - (pop-to-buffer gnus-article-current-summary nil (not (featurep 'xemacs))) + (pop-to-buffer gnus-article-current-summary) (setq func (lookup-key (current-local-map) (this-command-keys))) (call-interactively func))) @@ -5646,8 +5646,7 @@ (member keys nosave-in-article)) (let (func) (save-window-excursion - (pop-to-buffer gnus-article-current-summary - nil (not (featurep 'xemacs))) + (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)))) @@ -5659,16 +5658,14 @@ (call-interactively func) (setq new-sum-point (point))) (when (member keys nosave-but-article) - (pop-to-buffer gnus-article-buffer - nil (not (featurep 'xemacs))))) + (pop-to-buffer gnus-article-buffer))) ;; These commands should restore window configuration. (let ((obuf (current-buffer)) (owin (current-window-configuration)) (opoint (point)) win func in-buffer selected new-sum-start new-sum-hscroll) (cond (not-restore-window - (pop-to-buffer gnus-article-current-summary - nil (not (featurep 'xemacs)))) + (pop-to-buffer gnus-article-current-summary)) ((setq win (get-buffer-window gnus-article-current-summary)) (select-window win)) (t