From 2ed562a34328ce93e5414b66fdad5b22397d0cae Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Sun, 2 Jan 2000 08:36:40 +0000 Subject: [PATCH] * gnus-sum.el (gnus-summary-next-subject): Don't show the thread of the final article. * mm-decode.el (mm-interactively-view-part): Error on no method. --- lisp/ChangeLog | 19 +++++++++++++++++++ lisp/gnus-art.el | 2 +- lisp/gnus-mh.el | 2 +- lisp/gnus-score.el | 2 +- lisp/gnus-sum.el | 4 ++-- lisp/gnus-win.el | 14 ++++++++------ lisp/mm-decode.el | 2 ++ 7 files changed, 34 insertions(+), 11 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ced63be20..179fd8ec9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,21 @@ +2000-01-02 08:37:03 Lars Magne Ingebrigtsen + + * gnus-sum.el (gnus-summary-next-subject): Don't show the thread + of the final article. + + * mm-decode.el (mm-interactively-view-part): Error on no method. + +2000-01-02 06:10:32 Stefan Monnier + + * gnus-score.el (gnus-score-insert-help): Something. + + * gnus-art.el (gnus-button-alist): Exclude < from * nnwarchive.el: Changed file perms. @@ -1932,6 +1950,7 @@ Fri Aug 27 13:17:48 1999 Lars Magne Ingebrigtsen * gnus-agent.el (gnus-agent-fetch-group-1): Recreate agent overview buffer if it is killed. + 1999-08-27 14:26:03 Eric Marsden * gnus-art.el (article-babel): New version. diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index b64269235..18fd484c5 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -3987,7 +3987,7 @@ groups." ("mailto:\\([-a-zA-Z.@_+0-9%]+\\)" 0 t gnus-url-mailto 1) ("\\bmailto:\\([^ \n\t]+\\)" 0 t gnus-url-mailto 1) ;; This is how URLs _should_ be embedded in text... - ("]*\\)>" 0 t gnus-button-embedded-url 1) + ("]*\\)>" 0 t gnus-button-embedded-url 1) ;; Raw URLs. (,gnus-button-url-regexp 0 t browse-url 0)) "*Alist of regexps matching buttons in article bodies. diff --git a/lisp/gnus-mh.el b/lisp/gnus-mh.el index 6fabb5cc7..665e36138 100644 --- a/lisp/gnus-mh.el +++ b/lisp/gnus-mh.el @@ -67,7 +67,7 @@ Optional argument FOLDER specifies folder name." (errbuf (gnus-get-buffer-create " *Gnus rcvstore*")) ;; Find the rcvstore program. (exec-path (if mh-lib (cons mh-lib exec-path) exec-path))) - (gnus-eval-in-buffer-window gnus-original-article-buffer + (with-current-buffer gnus-original-article-buffer (save-restriction (widen) (unwind-protect diff --git a/lisp/gnus-score.el b/lisp/gnus-score.el index fcc43e683..95060e50e 100644 --- a/lisp/gnus-score.el +++ b/lisp/gnus-score.el @@ -730,7 +730,7 @@ used as score." (pop-to-buffer "*Score Help*") (let ((window-min-height 1)) (shrink-window-if-larger-than-buffer)) - (select-window (get-buffer-window gnus-summary-buffer)))) + (select-window (get-buffer-window gnus-summary-buffer t)))) (defun gnus-summary-header (header &optional no-err extra) ;; Return HEADER for current articles, or error. diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 3ea681253..8791d3d0e 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -5692,8 +5692,8 @@ returned." (if backward (gnus-summary-find-prev unread) (gnus-summary-find-next unread))) - (gnus-summary-show-thread) - (setq n (1- n))) + (unless (zerop (setq n (1- n))) + (gnus-summary-show-thread))) (when (/= 0 n) (gnus-message 7 "No more%s articles" (if unread " unread" ""))) diff --git a/lisp/gnus-win.el b/lisp/gnus-win.el index 5a3e0a2f6..6a335e8f2 100644 --- a/lisp/gnus-win.el +++ b/lisp/gnus-win.el @@ -286,7 +286,7 @@ See the Gnus manual for an explanation of the syntax used.") (defun gnus-configure-frame (split &optional window) "Split WINDOW according to SPLIT." (unless window - (setq window (get-buffer-window (current-buffer)))) + (setq window (or (get-buffer-window (current-buffer)) (selected-window)))) (select-window window) ;; This might be an old-stylee buffer config. (when (vectorp split) @@ -319,8 +319,10 @@ See the Gnus manual for an explanation of the syntax used.") (t (cdr (assq type gnus-window-to-buffer)))))) (unless buffer (error "Invalid buffer type: %s" type)) - (switch-to-buffer (gnus-get-buffer-create - (gnus-window-to-buffer-helper buffer))) + (let ((buf (gnus-get-buffer-create + (gnus-window-to-buffer-helper buffer)))) + (if (eq buf (window-buffer (selected-window))) (set-buffer buf) + (switch-to-buffer buf))) (when (memq 'frame-focus split) (setq gnus-window-frame-focus window)) ;; We return the window if it has the `point' spec. @@ -444,12 +446,12 @@ See the Gnus manual for an explanation of the syntax used.") (gnus-delete-windows-in-gnusey-frames)) ;; Just remove some windows. (gnus-remove-some-windows) - (switch-to-buffer nntp-server-buffer)) + (set-buffer nntp-server-buffer)) (select-frame frame))) - (switch-to-buffer nntp-server-buffer) (let (gnus-window-frame-focus) - (gnus-configure-frame split (get-buffer-window (current-buffer))) + (set-buffer nntp-server-buffer) + (gnus-configure-frame split) (when gnus-window-frame-focus (select-frame (window-frame gnus-window-frame-focus)))))))) diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el index 574338ec2..b2d15a312 100644 --- a/lisp/mm-decode.el +++ b/lisp/mm-decode.el @@ -684,6 +684,8 @@ external if displayed external." (mapcar (lambda (i) (list (cdr (assoc 'viewer i)))) (mailcap-mime-info type 'all))) (method (completing-read "Viewer: " methods))) + (when (string= method "") + (error "No method given")) (mm-display-external (copy-sequence handle) method))) (defun mm-preferred-alternative (handles &optional preferred) -- 2.34.1