From 8c3b32e522a17d2de87f3ef2d645e7de92907e60 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Tue, 14 Jan 2003 22:33:11 +0000 Subject: [PATCH] Synch with Oort Gnus. --- ChangeLog | 13 +++++++++++++ lisp/ChangeLog | 21 ++++++++++++++++++++- lisp/binhex.el | 6 +++--- lisp/gnus-agent.el | 15 ++++++--------- lisp/gnus-audio.el | 8 +++++--- lisp/spam.el | 11 ++++------- lisp/uudecode.el | 6 +++--- 7 files changed, 54 insertions(+), 26 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5ad74f1..0d19485 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,18 @@ 2003-01-14 Katsumi Yamaoka + * lisp/binhex.el: Require `path-util'. + * lisp/gnus-audio.el: Ditto. + * lisp/spam.el: Ditto. + * lisp/uudecode.el: Ditto. + + * lisp/binhex.el (binhex-use-external): Replace `executable-find' + with `exec-installed-p'. + * lisp/gnus-audio.el (gnus-audio-au-player): Ditto. + (gnus-audio-wav-player): Ditto. + * lisp/spam.el (spam-ifile-path): Ditto. + (spam-bogofilter-path): Ditto. + * lisp/uudecode.el (uudecode-use-external): Ditto. + * lisp/gnus-int.el (gnus-agent-expire): Make arguments optional. 2003-01-13 Katsumi Yamaoka diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f0aada3..70efac2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,9 +1,28 @@ +2002-01-14 Kevin Greiner + + * gnus-agent.el (gnus-agent-check-overview-buffer): This data + integrity checker was incorrectly flagging, and removing, articles + whose article number was negative. + (gnus-agent-fetch-group-1): When executed in the group's summary + buffer, refresh each downloaded line to update the status flag and + font. + +2003-01-14 Lars Magne Ingebrigtsen + + * gnus-audio.el (gnus-audio-au-player): Use executable-find. + +2003-01-13 Jhair Tocancipa Triana + + * gnus-audio.el (gnus-audio-au-player, gnus-audio-wav-player): Use + /usr/bin/play as default player. + (gnus-audio-play): Added ARG-DESCRIPTOR to prompt for a file to play. + 2003-01-14 Katsumi Yamaoka * gnus-msg.el (gnus-inews-add-send-actions): Allow a list of articles to be marked as well. -2002-01-11 Kevin Greiner +2002-01-14 Kevin Greiner * gnus-agent.el (gnus-agent-get-undownloaded-list): Include the fictious headers generated by nnagent (ie. Undownloaded Article ####) in the list of articles that have not been downloaded. diff --git a/lisp/binhex.el b/lisp/binhex.el index 07bc075..7622881 100644 --- a/lisp/binhex.el +++ b/lisp/binhex.el @@ -25,10 +25,10 @@ ;;; Code: -(autoload 'executable-find "executable") - (eval-when-compile (require 'cl)) +(require 'path-util) + (eval-and-compile (defalias 'binhex-char-int (if (fboundp 'char-int) @@ -48,7 +48,7 @@ input and write the converted data to its standard output." :type '(repeat string)) (defcustom binhex-use-external - (executable-find binhex-decoder-program) + (exec-installed-p binhex-decoder-program) "*Use external binhex program." :group 'gnus-extract :type 'boolean) diff --git a/lisp/gnus-agent.el b/lisp/gnus-agent.el index bc20687..a7027df 100644 --- a/lisp/gnus-agent.el +++ b/lisp/gnus-agent.el @@ -1191,18 +1191,13 @@ and that there are no duplicates." (gnus-message 1 "Duplicate overview line for %d" cur) (delete-region (point) (progn (forward-line 1) (point)))) - ((< cur 0) + ((< cur prev-num) (or backed-up (setq backed-up (gnus-agent-backup-overview-buffer))) - (gnus-message 1 "Junk article number %d" cur) - (delete-region (point) (progn (forward-line 1) (point)))) - ((< cur prev-num) + (gnus-message 1 "Overview buffer not sorted!") (sort-numeric-fields 1 (point-min) (point-max)) (goto-char (point-min)) - (setq prev-num -1) - (or backed-up - (setq backed-up (gnus-agent-backup-overview-buffer))) - (gnus-message 1 "Overview buffer not sorted!")) + (setq prev-num -1)) (t (setq prev-num cur))) (forward-line 1))))))) @@ -1686,7 +1681,9 @@ of FILE placing the combined headers in nntp-server-buffer." (gnus-summary-set-agent-mark article t))) (dolist (article fetched-articles) (if gnus-agent-mark-unread-after-downloaded - (gnus-summary-mark-article article gnus-unread-mark))) + (gnus-summary-mark-article article gnus-unread-mark)) + (when (gnus-summary-goto-subject article nil t) + (gnus-summary-update-download-mark article))) (dolist (article unfetched-articles) (gnus-summary-mark-article article gnus-canceled-mark))) ;; When some, or all, of the marked articles came diff --git a/lisp/gnus-audio.el b/lisp/gnus-audio.el index daa5cf4..e0c4d2d 100644 --- a/lisp/gnus-audio.el +++ b/lisp/gnus-audio.el @@ -30,6 +30,8 @@ (require 'nnheader) +(require 'path-util) + (defgroup gnus-audio nil "Playing sound in Gnus." :version "21.1" @@ -47,12 +49,12 @@ :type '(choice directory (const nil)) :group 'gnus-audio) -(defcustom gnus-audio-au-player "/usr/bin/showaudio" +(defcustom gnus-audio-au-player (exec-installed-p "play") "Executable program for playing sun AU format sound files." :group 'gnus-audio :type 'string) -(defcustom gnus-audio-wav-player "/usr/local/bin/play" +(defcustom gnus-audio-wav-player (exec-installed-p "play") "Executable program for playing WAV files." :group 'gnus-audio :type 'string) @@ -93,7 +95,7 @@ ;;;###autoload (defun gnus-audio-play (file) "Play a sound FILE through the speaker." - (interactive) + (interactive "fSound file name: ") (let ((sound-file (if (file-exists-p file) file (expand-file-name file gnus-audio-directory)))) diff --git a/lisp/spam.el b/lisp/spam.el index cb171df..6fdd048 100644 --- a/lisp/spam.el +++ b/lisp/spam.el @@ -34,17 +34,14 @@ ;;; Code: +(require 'path-util) + (require 'gnus-sum) (require 'gnus-uu) ; because of key prefix issues (require 'gnus) ; for the definitions of group content classification and spam processors (require 'message) ;for the message-fetch-field functions -;; autoload executable-find -(eval-and-compile - ;; executable-find is not autoloaded in Emacs 20 - (autoload 'executable-find "executable")) - ;; autoload query-dig (eval-and-compile (autoload 'query-dig "dig")) @@ -174,7 +171,7 @@ Such articles will be transmitted to `bogofilter -s' on group exit." "Spam ifile configuration." :group 'spam) -(defcustom spam-ifile-path (executable-find "ifile") +(defcustom spam-ifile-path (exec-installed-p "ifile") "File path of the ifile executable program." :type '(choice (file :tag "Location of ifile") (const :tag "ifile is not installed")) @@ -217,7 +214,7 @@ your main source of newsgroup names." :type 'integer :group 'spam-bogofilter) -(defcustom spam-bogofilter-path (executable-find "bogofilter") +(defcustom spam-bogofilter-path (exec-installed-p "bogofilter") "File path of the Bogofilter executable program." :type '(choice (file :tag "Location of bogofilter") (const :tag "Bogofilter is not installed")) diff --git a/lisp/uudecode.el b/lisp/uudecode.el index 2030b9f..98b1afd 100644 --- a/lisp/uudecode.el +++ b/lisp/uudecode.el @@ -26,10 +26,10 @@ ;;; Code: -(autoload 'executable-find "executable") - (eval-when-compile (require 'cl)) +(require 'path-util) + (eval-and-compile (defalias 'uudecode-char-int (if (fboundp 'char-int) @@ -49,7 +49,7 @@ input and write the converted data to its standard output." :type '(repeat string)) (defcustom uudecode-use-external - (executable-find uudecode-decoder-program) + (exec-installed-p uudecode-decoder-program) "*Use external uudecode program." :group 'gnus-extract :type 'boolean) -- 1.7.10.4