comparison lisp/gnus/gnus-art.el @ 81778:cd3e38bb3dc7

Merge from emacs--rel--22 Patches applied: * emacs--rel--22 (patch 51-54) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 233-234) - Merge from emacs--devo--0 - Update from CVS 2007-07-08 Katsumi Yamaoka <yamaoka@jpl.org> * lisp/cus-start.el (file-coding-system-alist): Fix custom type. 2007-07-08 Chong Yidong <cyd@stupidchicken.com> * lisp/longlines.el (longlines-wrap-region): Avoid marking buffer as modified. (longlines-auto-wrap, longlines-window-change-function): Remove unnecessary calls to set-buffer-modified-p. 2007-07-03 Dan Nicolaescu <dann@ics.uci.edu> * lisp/progmodes/gud.el (auto-mode-alist): Match more valid gdb init file names. 2007-07-01 Richard Stallman <rms@gnu.org> * lisp/files.el (find-file-visit-truename): Fix safe-local-variable value. 2007-07-04 Katsumi Yamaoka <yamaoka@jpl.org> * lisp/gnus/gnus-sum.el (gnus-summary-catchup): Don't recognize cached articles as unfetched articles. 2007-07-02 Reiner Steib <Reiner.Steib@gmx.de> * lisp/gnus/gnus-start.el (gnus-level-unsubscribed): Improve doc string. 2007-06-26 Katsumi Yamaoka <yamaoka@jpl.org> * lisp/gnus/gnus-art.el (gnus-article-summary-command-nosave) (gnus-article-read-summary-keys): Don't set the 3rd arg of pop-to-buffer for XEmacs. 2007-07-02 Reiner Steib <Reiner.Steib@gmx.de> * man/gnus-faq.texi ([3.2]): Fix locating of environment variables in the Control Panel. * man/gnus.texi (Misc Article): Add index entry for gnus-single-article-buffer. 2007-06-27 Andreas Seltenreich <andreas@gate450.dyndns.org> * man/gnus.texi (Starting Up): Fix typo. 2007-06-25 Katsumi Yamaoka <yamaoka@jpl.org> * man/gnus.texi (Asynchronous Fetching): Fix typo. Revision: emacs@sv.gnu.org/emacs--devo--0--patch-806
author Miles Bader <miles@gnu.org>
date Tue, 10 Jul 2007 02:02:35 +0000
parents 72447e6dd130 1d4e3c3b371a
children 97af23020f6c
comparison
equal deleted inserted replaced
81777:6306681bf3b4 81778:cd3e38bb3dc7
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 'norecord) 5610 (pop-to-buffer gnus-article-current-summary nil (not (featurep 'xemacs)))
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 nil 'norecord) 5649 (pop-to-buffer gnus-article-current-summary
5650 nil (not (featurep 'xemacs)))
5650 ;; We disable the pick minor mode commands. 5651 ;; We disable the pick minor mode commands.
5651 (let (gnus-pick-mode) 5652 (let (gnus-pick-mode)
5652 (setq func (lookup-key (current-local-map) keys)))) 5653 (setq func (lookup-key (current-local-map) keys))))
5653 (if (or (not func) 5654 (if (or (not func)
5654 (numberp func)) 5655 (numberp func))
5656 (unless (member keys nosave-in-article) 5657 (unless (member keys nosave-in-article)
5657 (set-buffer gnus-article-current-summary)) 5658 (set-buffer gnus-article-current-summary))
5658 (call-interactively func) 5659 (call-interactively func)
5659 (setq new-sum-point (point))) 5660 (setq new-sum-point (point)))
5660 (when (member keys nosave-but-article) 5661 (when (member keys nosave-but-article)
5661 (pop-to-buffer gnus-article-buffer nil 'norecord))) 5662 (pop-to-buffer gnus-article-buffer
5663 nil (not (featurep 'xemacs)))))
5662 ;; These commands should restore window configuration. 5664 ;; These commands should restore window configuration.
5663 (let ((obuf (current-buffer)) 5665 (let ((obuf (current-buffer))
5664 (owin (current-window-configuration)) 5666 (owin (current-window-configuration))
5665 (opoint (point)) 5667 (opoint (point))
5666 win func in-buffer selected new-sum-start new-sum-hscroll) 5668 win func in-buffer selected new-sum-start new-sum-hscroll)
5667 (cond (not-restore-window 5669 (cond (not-restore-window
5668 (pop-to-buffer gnus-article-current-summary nil 'norecord)) 5670 (pop-to-buffer gnus-article-current-summary
5671 nil (not (featurep 'xemacs))))
5669 ((setq win (get-buffer-window gnus-article-current-summary)) 5672 ((setq win (get-buffer-window gnus-article-current-summary))
5670 (select-window win)) 5673 (select-window win))
5671 (t 5674 (t
5672 (switch-to-buffer gnus-article-current-summary 'norecord))) 5675 (switch-to-buffer gnus-article-current-summary 'norecord)))
5673 (setq in-buffer (current-buffer)) 5676 (setq in-buffer (current-buffer))