From d732b08348289aa51a21d445f3332a67bb3985a7 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Wed, 26 Dec 2001 00:37:09 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 27 ++++++++++++++++++++++++++- lisp/gnus-art.el | 2 +- lisp/gnus-group.el | 3 ++- lisp/gnus-mailcap.el | 2 +- lisp/gnus-picon.el | 4 ++-- lisp/gnus-sieve.el | 2 +- lisp/gnus-sum.el | 5 +++-- lisp/gnus-xmas.el | 2 +- lisp/gnus.el | 6 ++++-- lisp/imap.el | 12 ++++++------ lisp/mm-util.el | 2 +- lisp/nnfolder.el | 2 +- lisp/nnheader.el | 2 +- lisp/nnmail.el | 2 +- lisp/nnmaildir.el | 28 +++++++++++++++++++++++++--- 15 files changed, 76 insertions(+), 25 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 7a60ad9..b200db3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,28 @@ +2001-12-22 22:00:00 ShengHuo ZHU + + * gnus-group.el (gnus-group-read-ephemeral-group): Call + gnus-group-real-name. + + * gnus-sum.el (gnus-decode-encoded-word-methods): Backslash paren. + (gnus-newsgroup-variables): Ditto. + + * gnus.el (gnus-group-prefixed-name): If group name is prefixed, + return it. + +2001-12-21 Paul Jarc + + * gnus.el (gnus-valid-select-methods): Include nnmaildir. + * nnmaildir.el (top-level): Add commentary. + (nnmaildir-version): Indicate that nnmaildir is now a standard + part of Gnus, not separately released. + +2001-12-21 08:00:00 ShengHuo ZHU + + * gnus-art.el, gnus-picon.el, gnus-sieve.el, gnus-sum.el: + * gnus-xmas.el, imap.el, mailcap.el, mm-util.el, nnfolder.el: + * nnheader.el, nnmail.el: Nil/NIL vs. nil. + From Pavel Jan,Bm(Bk + 2001-12-20 15:00:00 ShengHuo ZHU * nnmaildir.el: Copyright changes. Require cl only at compile time. @@ -1106,7 +1131,7 @@ * message.el (message-setup-1): Really add text property to all of the header, not just part of it. -2001-09-04 21:42:23 Lars Magne Ingebrigtsen +2001-09-04 Lars Magne Ingebrigtsen * gnus-group.el (gnus-group-sort-by-server): Use it. diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index 35e5f32..9d89b0a 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -2351,7 +2351,7 @@ Put point at the beginning of the signature separator." (defun gnus-article-check-hidden-text (type arg) "Return nil if hiding is necessary. -Arg can be nil or a number. Nil and positive means hide, negative +Arg can be nil or a number. nil and positive means hide, negative means show, 0 means toggle." (save-excursion (save-restriction diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el index 82f3bc8..e85bc8b 100644 --- a/lisp/gnus-group.el +++ b/lisp/gnus-group.el @@ -1897,7 +1897,8 @@ Return the name of the group if selection was successful." (,(intern (format "%s-address" (car method))) ,(cadr method)) ,@(cddr method))) (let ((group (if (gnus-group-foreign-p group) group - (gnus-group-prefixed-name group method)))) + (gnus-group-prefixed-name (gnus-group-real-name group) + method)))) (gnus-sethash group `(-1 nil (,group diff --git a/lisp/gnus-mailcap.el b/lisp/gnus-mailcap.el index 0dae2a9..ee15a12 100644 --- a/lisp/gnus-mailcap.el +++ b/lisp/gnus-mailcap.el @@ -282,7 +282,7 @@ to return a true or false shell value for the validity.") (defcustom mailcap-download-directory nil "*Directory to which `mailcap-save-binary-file' downloads files by default. -Nil means your home directory." +nil means your home directory." :type '(choice (const :tag "Home directory" nil) directory) :group 'mailcap) diff --git a/lisp/gnus-picon.el b/lisp/gnus-picon.el index 9a4c9ba..fd62658 100644 --- a/lisp/gnus-picon.el +++ b/lisp/gnus-picon.el @@ -354,7 +354,7 @@ arguments necessary for the job.") (defun gnus-picons-lookup (addrs dirs) "Lookup the picon for ADDRS in databases DIRS. -Returns the picon filename or NIL if none found." +Returns the picon filename or nil if none found." (let (result) (while (and dirs (null result)) (setq result (gnus-picons-lookup-internal addrs (pop dirs)))) @@ -384,7 +384,7 @@ DOMAINS is a list of strings from the fully qualified domain name." (defun gnus-picons-lookup-pairs (domains directories) "Lookup picons for DOMAINS and all its parents in DIRECTORIES. -Returns a list of PAIRS whose CAR is the picon filename or NIL if +Returns a list of PAIRS whose CAR is the picon filename or nil if none, and whose CDR is the corresponding element of DOMAINS." (let (picons) (setq directories (if (listp directories) diff --git a/lisp/gnus-sieve.el b/lisp/gnus-sieve.el index 2553358..36c99d0 100644 --- a/lisp/gnus-sieve.el +++ b/lisp/gnus-sieve.el @@ -116,7 +116,7 @@ See the documentation for these variables and functions for details." (defun gnus-sieve-guess-rule-for-article () "Guess a sieve rule based on RFC822 article in buffer. -Return NIL if no rule could be guessed." +Return nil if no rule could be guessed." (when (message-fetch-field "sender") `(sieve address "sender" ,(regexp-quote (message-fetch-field "sender"))))) diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 7846ca6..5681931 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -1867,8 +1867,9 @@ increase the score of each group you read." ["Increase score..." gnus-summary-increase-score t] ["Lower score..." gnus-summary-lower-score t])))) - ;; Define both the Article menu in the summary buffer and the equivalent - ;; Commands menu in the article buffer here for consistency. + ;; Define both the Article menu in the summary buffer and the + ;; equivalent Commands menu in the article buffer here for + ;; consistency. (let ((innards `(("Hide" ["All" gnus-article-hide t] diff --git a/lisp/gnus-xmas.el b/lisp/gnus-xmas.el index cee9ee9..775f54b 100644 --- a/lisp/gnus-xmas.el +++ b/lisp/gnus-xmas.el @@ -737,7 +737,7 @@ If it is non-nil, it must be a toolbar. The five valid values are (cons (current-buffer) bar))))) (defun gnus-xmas-mail-strip-quoted-names (address) - "Protect mail-strip-quoted-names from NIL input. + "Protect mail-strip-quoted-names from nil input. XEmacs compatibility workaround." (if (null address) nil diff --git a/lisp/gnus.el b/lisp/gnus.el index febf6eb..89b2d7a 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -1436,7 +1436,8 @@ slower, and `std11-extract-address-components'." ("nnwarchive" none) ("nnlistserv" none) ("nnagent" post-mail) - ("nnimap" post-mail address prompt-address physical-address)) + ("nnimap" post-mail address prompt-address physical-address) + ("nnmaildir" mail respool address)) "*An alist of valid select methods. The first element of each list lists should be a string with the name of the select method. The other elements may be the category of @@ -2797,7 +2798,8 @@ that that variable is buffer-local to the summary buffers." "Return the whole name from GROUP and METHOD." (and (stringp method) (setq method (gnus-server-to-method method))) (if (or (not method) - (gnus-server-equal method "native")) + (gnus-server-equal method "native") + (string-match ":" group)) group (concat (gnus-method-to-server-name method) ":" group))) diff --git a/lisp/imap.el b/lisp/imap.el index 417b0c1..618889f 100644 --- a/lisp/imap.el +++ b/lisp/imap.el @@ -1824,21 +1824,21 @@ Return nil if no complete line has arrived." ;; ;; addr-adl = nstring ;; ; Holds route from [RFC-822] route-addr if -;; ; non-NIL +;; ; non-nil ;; ;; addr-host = nstring -;; ; NIL indicates [RFC-822] group syntax. +;; ; nil indicates [RFC-822] group syntax. ;; ; Otherwise, holds [RFC-822] domain name ;; ;; addr-mailbox = nstring -;; ; NIL indicates end of [RFC-822] group; if -;; ; non-NIL and addr-host is NIL, holds +;; ; nil indicates end of [RFC-822] group; if +;; ; non-nil and addr-host is nil, holds ;; ; [RFC-822] group name. ;; ; Otherwise, holds [RFC-822] local-part ;; ; after removing [RFC-822] quoting ;; ;; addr-name = nstring -;; ; If non-NIL, holds phrase from [RFC-822] +;; ; If non-nil, holds phrase from [RFC-822] ;; ; mailbox after removing [RFC-822] quoting ;; @@ -2539,7 +2539,7 @@ Return nil if no complete line has arrived." (push (imap-parse-nstring) body);; body-fld-desc (imap-forward) ;; next `or' for Sun SIMS bug, it regard body-fld-enc as a - ;; nstring and return NIL instead of defaulting back to 7BIT + ;; nstring and return nil instead of defaulting back to 7BIT ;; as the standard says. (push (or (imap-parse-nstring) "7BIT") body);; body-fld-enc (imap-forward) diff --git a/lisp/mm-util.el b/lisp/mm-util.el index 42a0e5c..5525a7b 100644 --- a/lisp/mm-util.el +++ b/lisp/mm-util.el @@ -494,7 +494,7 @@ If the charset is `composition', return the actual one." (defun mm-find-mime-charset-region (b e &optional hack-charsets) "Return the MIME charsets needed to encode the region between B and E. -Nil means ASCII, a single-element list represents an appropriate MIME +nil means ASCII, a single-element list represents an appropriate MIME charset, and a longer list means no appropriate charset." (let (charsets) ;; The return possibilities of this function are a mess... diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el index c19711a..3ca1246 100644 --- a/lisp/nnfolder.el +++ b/lisp/nnfolder.el @@ -118,7 +118,7 @@ message, a huge time saver for large mailboxes.") (defvoo nnfolder-file-coding-system nnheader-text-coding-system) (defvoo nnfolder-file-coding-system-for-write nnheader-file-coding-system "Coding system for save nnfolder file. -If NIL, NNFOLDER-FILE-CODING-SYSTEM is used.") +if nil, `nnfolder-file-coding-system' is used.") ; FIXME: fill-in the doc-string of this variable (defvoo nnfolder-nov-is-evil nil "If non-nil, Gnus will never generate and use nov databases for mail groups. diff --git a/lisp/nnheader.el b/lisp/nnheader.el index ba9b422..3301b5f 100644 --- a/lisp/nnheader.el +++ b/lisp/nnheader.el @@ -68,7 +68,7 @@ they will keep on jabbering all the time." (defvar nnheader-max-head-length 4096 "*Max length of the head of articles. -Value is an integer, nil, or t. Nil means read in chunks of a file +Value is an integer, nil, or t. nil means read in chunks of a file indefinitely until a complete head is found\; t means always read the entire file immediately, disregarding `nnheader-head-chop-length'. diff --git a/lisp/nnmail.el b/lisp/nnmail.el index f564950..848e772 100644 --- a/lisp/nnmail.el +++ b/lisp/nnmail.el @@ -360,7 +360,7 @@ GROUP: Mail will be stored in GROUP (a string). \(FIELD VALUE [- RESTRICT [- RESTRICT [...]]] SPLIT): If the message field FIELD (a regexp) contains VALUE (a regexp), store the messages as specified by SPLIT. If RESTRICT (a regexp) matches some string - after FIELD and before the end of the matched VALUE, return NIL, + after FIELD and before the end of the matched VALUE, return nil, otherwise process SPLIT. Multiple RESTRICTs add up, further restricting the possibility of processing SPLIT. diff --git a/lisp/nnmaildir.el b/lisp/nnmaildir.el index b4c0a8f..041759d 100644 --- a/lisp/nnmaildir.el +++ b/lisp/nnmaildir.el @@ -23,7 +23,30 @@ ;;; Commentary: -;;; +;; Maildir format is documented in the maildir(5) man page from qmail +;; and at . nnmaildir also +;; stores extra information in the .nnmaildir/ directory within a +;; maildir. +;; +;; Some goals of nnmaildir: +;; * Everything Just Works, and correctly. E.g., stale NOV data is +;; ignored when articles have been edited; no need for +;; -generate-nov-databases. +;; * Perfect reliability: [C-g] will never corrupt its data in memory, +;; and SIGKILL will never corrupt its data in the filesystem. +;; * We make it easy to manipulate marks, etc., from outside Gnus. +;; * All information about a group is stored in the maildir, for easy +;; backup and restoring. +;; * Use the filesystem as a database. +;; +;; Todo: +;; * Ignore old NOV data when gnus-extra-headers has changed. +;; * Don't force article renumbering, so nnmaildir can be used with +;; the cache and agent. Alternatively, completely rewrite the Gnus +;; backend interface, which would have other advantages. +;; +;; See also until that +;; information is added to the Gnus manual. ;;; Code: @@ -39,8 +62,7 @@ (require 'cl) (require 'nnmail)) -(gnus-declare-backend "nnmaildir" 'mail 'respool 'address) -(defconst nnmaildir-version "2001.12.19") +(defconst nnmaildir-version "Gnus") (defvar nnmaildir-article-file-name nil "*The filename of the most recently requested article. This variable is set -- 1.7.10.4