From 3982dd3ba347ae81022f01d6cc9a7e9a010c6a77 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Thu, 27 Mar 2003 00:49:43 +0000 Subject: [PATCH] Synch to Oort Gnus 200303262053. --- lisp/ChangeLog | 18 ++++++++++++++++++ lisp/gnus-agent.el | 2 +- lisp/gnus-sum.el | 12 +++++++----- lisp/smiley.el | 10 ++++++++++ 4 files changed, 36 insertions(+), 6 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e7fbf05..504916a 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,21 @@ +2003-03-26 Kevin Ryde + + * gnus-sum.el (gnus-summary-find-for-reselect): Renamed from + gnus-summary-find-uncancelled, skip temporary articles inserted by + "refer" functions. + +2003-03-26 Vasily Korytov + + * smiley.el (smiley-buffer): New function. + +2003-03-26 Kevin Greiner + + * gnus-agent.el (gnus-agent-fetch-selected-article): Replaced + gnus-summary-update-line (which updated the article's face) with + gnus-summary-update-download-mark (which updates the article's + face by calling gnus-summary-update-line AND updates the download + mark to show that the article was fetched). + 2003-03-23 Kevin Greiner * gnus-agent.el (gnus-agent-expire-unagentized-dirs): Provides diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el index a4c9408..61b218b 100644 --- a/lisp/gnus-agent.el +++ b/lisp/gnus-agent.el @@ -1032,7 +1032,7 @@ This can be added to `gnus-select-article-hook' or (list gnus-current-article)) (setq gnus-newsgroup-undownloaded (delq gnus-current-article gnus-newsgroup-undownloaded)) - (gnus-summary-update-line gnus-current-article))))) + (gnus-summary-update-download-mark gnus-current-article))))) ;;; ;;; Internal functions diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index cb6553f..69f4f84 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -6326,17 +6326,19 @@ With arg, turn line truncation on if arg is positive." (> (prefix-numeric-value arg) 0))) (redraw-display)) -(defun gnus-summary-find-uncancelled () - "Return the number of an uncancelled article. +(defun gnus-summary-find-for-reselect () + "Return the number of an article to stay on across a reselect. The current article is considered, then following articles, then previous -articles. If all articles are cancelled then return a dummy 0." +articles. An article is sought which is not cancelled and isn't a temporary +insertion from another group. If there's no such then return a dummy 0." (let (found) (dolist (rev '(nil t)) (unless found ; don't demand the reverse list if we don't need it (let ((data (gnus-data-find-list (gnus-summary-article-number) (gnus-data-list rev)))) (while (and data (not found)) - (if (not (eq gnus-canceled-mark (gnus-data-mark (car data)))) + (if (and (< 0 (gnus-data-number (car data))) + (not (eq gnus-canceled-mark (gnus-data-mark (car data))))) (setq found (gnus-data-number (car data)))) (setq data (cdr data)))))) (or found 0))) @@ -6347,7 +6349,7 @@ The prefix argument ALL means to select all articles." (interactive "P") (when (gnus-ephemeral-group-p gnus-newsgroup-name) (error "Ephemeral groups can't be reselected")) - (let ((current-subject (gnus-summary-find-uncancelled)) + (let ((current-subject (gnus-summary-find-for-reselect)) (group gnus-newsgroup-name)) (setq gnus-newsgroup-begin nil) (gnus-summary-exit) diff --git a/lisp/smiley.el b/lisp/smiley.el index 7ab84bc..0411264 100644 --- a/lisp/smiley.el +++ b/lisp/smiley.el @@ -201,6 +201,16 @@ A list of images is returned." (put-text-property beg (or end (point-max)) 'smilified nil) images)))) +;;;###autoload +(defun smiley-buffer (&optional buffer) + "Run `smiley-region' at the buffer, specified in the argument or +interactively. If there's no argument, do it at the current buffer" + (interactive "bBuffer to run smiley-region: ") + (save-excursion + (if buffer + (set-buffer (get-buffer buffer))) + (smiley-region (point-min) (point-max)))) + (defun smiley-toggle-buffer (&optional arg) "Toggle displaying smiley faces in article buffer. With arg, turn displaying on if and only if arg is positive." -- 1.7.10.4