From 074417286bb6995a14e94f85df070d102a3c302d Mon Sep 17 00:00:00 2001 From: Lars Magne Ingebrigtsen Date: Tue, 4 Mar 1997 19:57:03 +0000 Subject: [PATCH] *** empty log message *** --- lisp/ChangeLog | 26 ++++++++++++++++++++++++++ lisp/gnus.el | 10 +++++----- lisp/messagexmas.el | 21 +++------------------ lisp/nnbabyl.el | 2 +- lisp/nneething.el | 2 +- lisp/nnheader.el | 23 +++++++++++++++++++++++ lisp/nnmail.el | 13 +++++++------ lisp/nnmbox.el | 2 +- texi/gnus.texi | 12 ++++++------ 9 files changed, 73 insertions(+), 38 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a64a3f077..e794e2e11 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,29 @@ +Thu Jun 27 23:33:18 1996 Lars Magne Ingebrigtsen + + * nnmail.el (nnmail-get-spool-files): Wouldn't get much mail. + +Thu Jun 27 19:26:42 1996 Lars Magne Ingebrigtsen + + * nnheader.el (nnheader-find-etc-directory): New function. + + * gnus.el (gnus-dribble-enter): Bury the buffer. + (gnus-buffer-configuration): Redundant entry. + (message): Don't require. + (gnus-archive-server-wanted-p): Be even more strict in when touse + the archive server. + +Thu Jun 27 19:16:56 1996 Katsumi Yamaoka + + * nnheader.el (nnheader-file-size): New function. + +Wed Jun 26 22:14:45 1996 Alastair Burt + + * gnus.el (gnus-group-kill-level): Applied `car' to an integer. + +Wed Jun 26 21:53:34 1996 Lars Magne Ingebrigtsen + + * gnus.el: Gnus v5.2.27 is released. + Wed Jun 26 20:40:39 1996 Lars Magne Ingebrigtsen * gnus.el (gnus-summary-edit-article-done): Don't beep after a diff --git a/lisp/gnus.el b/lisp/gnus.el index 36f788296..6a84a92cf 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -31,7 +31,6 @@ (require 'mail-utils) (require 'timezone) (require 'nnheader) -(require 'message) (require 'nnmail) (require 'backquote) (require 'nnoo) @@ -878,7 +877,6 @@ beginning of a line.") '(vertical 1.0 (summary 0.25 point) (if gnus-carpal '(summary-carpal 4)) - (if gnus-use-trees '(tree 0.25)) (article 1.0))))) (server (vertical 1.0 @@ -1752,7 +1750,7 @@ variable (string, integer, character, etc).") "gnus-bug@ifi.uio.no (The Gnus Bugfixing Girls + Boys)" "The mail address of the Gnus maintainers.") -(defconst gnus-version-number "5.2.27" +(defconst gnus-version-number "5.2.28" "Version number for this version of Gnus.") (defconst gnus-version (format "Gnus v%s" gnus-version-number) @@ -4781,7 +4779,8 @@ If REGEXP, only list groups matching REGEXP." (defun gnus-archive-server-wanted-p () "Say whether the user wants to use the archive server." (cond - ((not gnus-message-archive-method) + ((or (not gnus-message-archive-method) + (not gnus-message-archive-group)) nil) ((and gnus-message-archive-method gnus-message-archive-group) t) @@ -6444,7 +6443,7 @@ is returned." (let* ((prev gnus-newsrc-alist) (alist (cdr prev))) (while alist - (if (= (gnus-info-level level) level) + (if (= (gnus-info-level (car alist)) level) (setcdr prev (cdr alist)) (setq prev alist)) (setq alist (cdr alist))) @@ -14956,6 +14955,7 @@ If NEWSGROUP is nil, return the global kill file name instead." (set-buffer gnus-dribble-buffer) (insert string "\n") (set-window-point (get-buffer-window (current-buffer)) (point-max)) + (bury-buffer) (set-buffer obuf)))) (defun gnus-dribble-read-file () diff --git a/lisp/messagexmas.el b/lisp/messagexmas.el index c85cbb9b5..c4253c40e 100644 --- a/lisp/messagexmas.el +++ b/lisp/messagexmas.el @@ -48,26 +48,11 @@ If it is non-nil, it must be a toolbar. The five legal values are (defun message-xmas-find-glyph-directory (&optional package) (setq package (or package "message")) - (let ((path load-path) - (dir (symbol-value - (intern-soft (concat package "-xmas-glyph-directory")))) - result) + (let ((dir (symbol-value + (intern-soft (concat package "-xmas-glyph-directory"))))) (if (and (stringp dir) (file-directory-p dir)) dir - ;; We try to find the dir by looking at the load path, - ;; stripping away the last component and adding "etc/". - (while path - (if (and (car path) - (file-exists-p - (setq dir (concat - (file-name-directory - (directory-file-name (car path))) - "etc/" (or package "message") "/"))) - (file-directory-p dir)) - (setq result dir - path nil) - (setq path (cdr path)))) - result))) + (nnheader-find-etc-directory package)))) (defun message-xmas-setup-toolbar (bar &optional force package) (let ((dir (message-xmas-find-glyph-directory package)) diff --git a/lisp/nnbabyl.el b/lisp/nnbabyl.el index abd909c3b..330fe9057 100644 --- a/lisp/nnbabyl.el +++ b/lisp/nnbabyl.el @@ -538,7 +538,7 @@ (buffer-name nnbabyl-mbox-buffer) (save-excursion (set-buffer nnbabyl-mbox-buffer) - (= (buffer-size) (nth 7 (file-attributes nnbabyl-mbox-file))))) + (= (buffer-size) (nnheader-file-size nnbabyl-mbox-file)))) () ; This buffer hasn't changed since we read it last. Possibly. (save-excursion (let ((delim (concat "^" nnbabyl-mail-delimiter)) diff --git a/lisp/nneething.el b/lisp/nneething.el index 691c84f0e..bcf013fdf 100644 --- a/lisp/nneething.el +++ b/lisp/nneething.el @@ -95,7 +95,7 @@ If this variable is nil, no files will be excluded.") (when (and (file-exists-p file) (or (file-directory-p file) - (not (zerop (nth 7 (file-attributes file)))))) + (not (zerop (nnheader-file-size file))))) (insert (format "221 %d Article retrieved.\n" article)) (nneething-insert-head file) (insert ".\n")) diff --git a/lisp/nnheader.el b/lisp/nnheader.el index 3c6aaa9a5..278fa6122 100644 --- a/lisp/nnheader.el +++ b/lisp/nnheader.el @@ -570,6 +570,29 @@ without formatting." (while (re-search-forward "\r$" nil t) (delete-backward-char 1)))) +(defun nnheader-file-size (file) + "Return the file size of FILE or 0." + (or (nth 7 (file-attributes file)) 0)) + +(defun nnheader-find-etc-directory (package) + "Go through the path and find the \".../etc/PACKAGE\" directory." + (let ((path load-path) + dir result) + ;; We try to find the dir by looking at the load path, + ;; stripping away the last component and adding "etc/". + (while path + (if (and (car path) + (file-exists-p + (setq dir (concat + (file-name-directory + (directory-file-name (car path))) + "etc/" package "/"))) + (file-directory-p dir)) + (setq result dir + path nil) + (setq path (cdr path)))) + result)) + (fset 'nnheader-run-at-time 'run-at-time) (fset 'nnheader-cancel-timer 'cancel-timer) (fset 'nnheader-find-file-noselect 'find-file-noselect) diff --git a/lisp/nnmail.el b/lisp/nnmail.el index 536a83d7c..d108d590d 100644 --- a/lisp/nnmail.el +++ b/lisp/nnmail.el @@ -382,9 +382,9 @@ parameter. It should return nil, `warn' or `delete'.") (substring inbox (+ popmail 3)))))) (message "Getting mail from post office ...")) (when (or (and (file-exists-p tofile) - (/= 0 (nth 7 (file-attributes tofile)))) + (/= 0 (nnheader-file-size tofile))) (and (file-exists-p inbox) - (/= 0 (nth 7 (file-attributes inbox))))) + (/= 0 (nnheader-file-size inbox)))) (message "Getting mail from %s..." inbox))) ;; Set TOFILE if have not already done so, and ;; rename or copy the file INBOX to TOFILE if and as appropriate. @@ -923,8 +923,8 @@ See the documentation for the variable `nnmail-split-fancy' for documentation." nnmail-procmail-suffix "$") t))) (p procmails) (crash (when (and (file-exists-p nnmail-crash-box) - (> (nth 7 (file-attributes - (file-truename nnmail-crash-box))) 0)) + (> (nnheader-file-size + (file-truename nnmail-crash-box)) 0)) (list nnmail-crash-box)))) ;; Remove any directories that inadvertantly match the procmail ;; suffix, which might happen if the suffix is "". @@ -940,7 +940,8 @@ See the documentation for the variable `nnmail-split-fancy' for documentation." nnmail-use-procmail) procmails) procmails) - ((eq nnmail-spool-file 'procmail) + ((and group + (eq nnmail-spool-file 'procmail)) nil) ((listp nnmail-spool-file) (append nnmail-spool-file procmails)) @@ -1110,7 +1111,7 @@ See the documentation for the variable `nnmail-split-fancy' for documentation." ;; existance of POPped mail. (when (or (string-match "^po:" spool) (and (file-exists-p spool) - (> (nth 7 (file-attributes (file-truename spool))) 0))) + (> (nnheader-file-size (file-truename spool)) 0))) (nnheader-message 3 "%s: Reading incoming mail..." method) (when (and (nnmail-move-inbox spool) (file-exists-p nnmail-crash-box)) diff --git a/lisp/nnmbox.el b/lisp/nnmbox.el index 171463740..9b7957247 100644 --- a/lisp/nnmbox.el +++ b/lisp/nnmbox.el @@ -484,7 +484,7 @@ (buffer-name nnmbox-mbox-buffer) (save-excursion (set-buffer nnmbox-mbox-buffer) - (= (buffer-size) (nth 7 (file-attributes nnmbox-mbox-file))))) + (= (buffer-size) (nnheader-file-size nnmbox-mbox-file)))) () (save-excursion (let ((delim (concat "^" message-unix-mail-delimiter)) diff --git a/texi/gnus.texi b/texi/gnus.texi index bde5417cb..6c3133019 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -8804,7 +8804,7 @@ silently to help keep the sizes of the score files down. * Score Variables:: Customize your scoring. (My, what terminology). * Score File Format:: What a score file may contain. * Score File Editing:: You can edit score files by hand as well. -* Adaptive Scoring:: Big Sister Gnus *knows* what you read. +* Adaptive Scoring:: Big Sister Gnus @emph{knows} what you read. * Followups To Yourself:: Having Gnus notice when people answer you. * Scoring Tips:: How to score effectively. * Reverse Scoring:: That problem child of old is not problem. @@ -10311,7 +10311,7 @@ may contain any number of @code{vertical} and @code{horizontal} splits. @cindex window height @cindex window width Finding the right sizes can be a bit complicated. No window may be less -than @code{gnus-window-min-height} (default 2) characters high, and all +than @code{gnus-window-min-height} (default 1) characters high, and all windows must be at least @code{gnus-window-min-width} (default 1) characters wide. Gnus will try to enforce this before applying the splits. If you want to use the normal Emacs window width/height limit, @@ -11233,10 +11233,10 @@ There are no known breaches of this standard. @cindex RFC 1036 There are no known breaches of this standard, either. -@item Usenet Seal of Approval -@cindex Usenet Seal of Approval -Gnus hasn't been formally through the Seal process, but I have read -through the Seal text and I think Gnus would pass. +@item Good Net-Keeping Seal of Approval +@cindex Good Net-Keeping Seal of Approval +Gnus has been through the Seal process and failed. I think it'll pass +the next inspection. @item Son-of-RFC 1036 @cindex Son-of-RFC 1036 -- 2.34.1