Mercurial > emacs
comparison lisp/gnus/gnus-art.el @ 90982:a66921565bcb
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 806-813)
- Merge from emacs--rel--22
- Update from CVS
* emacs--rel--22 (patch 51-58)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 233-236)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-230
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Sun, 15 Jul 2007 04:47:46 +0000 |
| parents | e9f94688a064 97af23020f6c |
| children | f55f9811f5d7 |
comparison
equal
deleted
inserted
replaced
| 90981:a37d5bf6cbb7 | 90982:a66921565bcb |
|---|---|
| 4406 'mml-destroy-buffers t) | 4406 'mml-destroy-buffers t) |
| 4407 (kill-local-variable 'mml-buffer-list)) | 4407 (kill-local-variable 'mml-buffer-list)) |
| 4408 (gnus-summary-edit-article-done | 4408 (gnus-summary-edit-article-done |
| 4409 ,(or (mail-header-references gnus-current-headers) "") | 4409 ,(or (mail-header-references gnus-current-headers) "") |
| 4410 ,(gnus-group-read-only-p) | 4410 ,(gnus-group-read-only-p) |
| 4411 ,gnus-summary-buffer no-highlight))))) | 4411 ,gnus-summary-buffer no-highlight)))) |
| 4412 ;; Not in `gnus-mime-save-part-and-strip': | 4412 ;; Not in `gnus-mime-save-part-and-strip': |
| 4413 (gnus-article-edit-done) | 4413 (gnus-article-edit-done) |
| 4414 (gnus-summary-expand-window) | 4414 (gnus-summary-expand-window) |
| 4415 (gnus-summary-show-article)) | 4415 (gnus-summary-show-article))) |
| 4416 | 4416 |
| 4417 (defun gnus-mime-save-part () | 4417 (defun gnus-mime-save-part () |
| 4418 "Save the MIME part under point." | 4418 "Save the MIME part under point." |
| 4419 (interactive) | 4419 (interactive) |
| 4420 (gnus-article-check-buffer) | 4420 (gnus-article-check-buffer) |
| 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)) |