Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
82490:458dcdfc3e27 | 82491:962fb740e73f |
---|---|
5605 | 5605 |
5606 (defun gnus-article-summary-command-nosave () | 5606 (defun gnus-article-summary-command-nosave () |
5607 "Execute the last keystroke in the summary buffer." | 5607 "Execute the last keystroke in the summary buffer." |
5608 (interactive) | 5608 (interactive) |
5609 (let (func) | 5609 (let (func) |
5610 (pop-to-buffer gnus-article-current-summary nil (not (featurep 'xemacs))) | 5610 (pop-to-buffer gnus-article-current-summary) |
5611 (setq func (lookup-key (current-local-map) (this-command-keys))) | 5611 (setq func (lookup-key (current-local-map) (this-command-keys))) |
5612 (call-interactively func))) | 5612 (call-interactively func))) |
5613 | 5613 |
5614 (defun gnus-article-check-buffer () | 5614 (defun gnus-article-check-buffer () |
5615 "Beep if not in an article buffer." | 5615 "Beep if not in an article buffer." |
5644 (if (or (member keys nosaves) | 5644 (if (or (member keys nosaves) |
5645 (member keys nosave-but-article) | 5645 (member keys nosave-but-article) |
5646 (member keys nosave-in-article)) | 5646 (member keys nosave-in-article)) |
5647 (let (func) | 5647 (let (func) |
5648 (save-window-excursion | 5648 (save-window-excursion |
5649 (pop-to-buffer gnus-article-current-summary | 5649 (pop-to-buffer gnus-article-current-summary) |
5650 nil (not (featurep 'xemacs))) | |
5651 ;; We disable the pick minor mode commands. | 5650 ;; We disable the pick minor mode commands. |
5652 (let (gnus-pick-mode) | 5651 (let (gnus-pick-mode) |
5653 (setq func (lookup-key (current-local-map) keys)))) | 5652 (setq func (lookup-key (current-local-map) keys)))) |
5654 (if (or (not func) | 5653 (if (or (not func) |
5655 (numberp func)) | 5654 (numberp func)) |
5657 (unless (member keys nosave-in-article) | 5656 (unless (member keys nosave-in-article) |
5658 (set-buffer gnus-article-current-summary)) | 5657 (set-buffer gnus-article-current-summary)) |
5659 (call-interactively func) | 5658 (call-interactively func) |
5660 (setq new-sum-point (point))) | 5659 (setq new-sum-point (point))) |
5661 (when (member keys nosave-but-article) | 5660 (when (member keys nosave-but-article) |
5662 (pop-to-buffer gnus-article-buffer | 5661 (pop-to-buffer gnus-article-buffer))) |
5663 nil (not (featurep 'xemacs))))) | |
5664 ;; These commands should restore window configuration. | 5662 ;; These commands should restore window configuration. |
5665 (let ((obuf (current-buffer)) | 5663 (let ((obuf (current-buffer)) |
5666 (owin (current-window-configuration)) | 5664 (owin (current-window-configuration)) |
5667 (opoint (point)) | 5665 (opoint (point)) |
5668 win func in-buffer selected new-sum-start new-sum-hscroll) | 5666 win func in-buffer selected new-sum-start new-sum-hscroll) |
5669 (cond (not-restore-window | 5667 (cond (not-restore-window |
5670 (pop-to-buffer gnus-article-current-summary | 5668 (pop-to-buffer gnus-article-current-summary)) |
5671 nil (not (featurep 'xemacs)))) | |
5672 ((setq win (get-buffer-window gnus-article-current-summary)) | 5669 ((setq win (get-buffer-window gnus-article-current-summary)) |
5673 (select-window win)) | 5670 (select-window win)) |
5674 (t | 5671 (t |
5675 (switch-to-buffer gnus-article-current-summary 'norecord))) | 5672 (switch-to-buffer gnus-article-current-summary 'norecord))) |
5676 (setq in-buffer (current-buffer)) | 5673 (setq in-buffer (current-buffer)) |