From 82ff3c3828b5387582590779f3c5530c773aa158 Mon Sep 17 00:00:00 2001 From: yamaoka Date: Mon, 27 Aug 2001 00:20:30 +0000 Subject: [PATCH] Synch with Oort Gnus. --- GNUS-NEWS | 11 ++--- contrib/ChangeLog | 4 ++ contrib/gpg.el | 4 +- lisp/ChangeLog | 71 ++++++++++++++++++++++++++++++ lisp/gnus-group.el | 1 + lisp/gnus-spec.el | 7 +-- lisp/gnus-sum.el | 10 +++-- lisp/mml.el | 2 +- lisp/nnfolder.el | 124 +++++++++++++++++++++++++++++++++++++++++++++++++--- lisp/nnml.el | 43 ++++++++++++------ lisp/nnrss.el | 11 +++-- lisp/nnweb.el | 32 ++++++++------ texi/ChangeLog | 26 +++++++++++ texi/Makefile.in | 6 +-- texi/gnus-ja.texi | 54 ++++++++++++++++++++--- texi/gnus.texi | 65 ++++++++++++++++++++++----- texi/splitindex | 2 +- 17 files changed, 403 insertions(+), 70 deletions(-) diff --git a/GNUS-NEWS b/GNUS-NEWS index 898c768..8f63ecb 100644 --- a/GNUS-NEWS +++ b/GNUS-NEWS @@ -8,17 +8,18 @@ For older news, see Gnus info node "New Features". * Changes in Oort Gnus -** Nnml stores marks in the file ".marks" for each groups. +** The nnml and nnfolder backends store marks for each groups. -This makes it possible to take backup of nnml servers independently of -.newsrc.eld. It also makes it possible to share articles and marks -between users (without sharing .newsrc.eld) within e.g. a department. +This makes it possible to take backup of nnml/nnfolder servers/groups +separately of .newsrc.eld, while preserving marks. It also makes it +possible to share articles and marks between users (without sharing +.newsrc.eld) within e.g. a department. ** The menu bar (in Group and Summary buffer) named "Misc" has been renamed to "Gnus". ** The menu bar (in Message mode) named "MML" has been renamed to - "Attachment". + "Attachments". ** gnus-group-charset-alist and gnus-group-ignored-charsets-alist diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 2c857ba..be5b92b 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,7 @@ +2001-08-24 16:09:14 Fabien Penso + + * gpg.el (gpg-command-sign-detached): Doc fix. + 2001-08-07 Andreas Jaeger * gpg.el (gpg-passphrase-forget): Don't cache diff --git a/contrib/gpg.el b/contrib/gpg.el index e28118c..fa1c5f3 100644 --- a/contrib/gpg.el +++ b/contrib/gpg.el @@ -362,7 +362,7 @@ standard error." '(gpg-2comp . ("--batch" "--passphrase-fd=0" "--output=-" armor textmode "--clearsign" sign-with-key)) - "Command to create a create a \"clearsign\" text file. + "Command to create a \"clearsign\" text file. The invoked program has to read the passphrase from standard input, followed by the message to sign. It should write the ASCII-amored signed text message to standard output, and diagnostic messages to @@ -375,7 +375,7 @@ standard error." '(gpg-2comp . ("--batch" "--passphrase-fd=0" "--output=-" armor textmode "--detach-sign" sign-with-key)) - "Command to create a create a detached signature. + "Command to create a detached signature. The invoked program has to read the passphrase from standard input, followed by the message to sign. It should write the ASCII-amored detached signature to standard output, and diagnostic messages to diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f445159..1739e1f 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,74 @@ +2001-08-25 Simon Josefsson + + * nnfolder.el (nnfolder-save-marks): Don't create directory named + after group in ~/. + +2001-08-25 Simon Josefsson + From Andreas Jaeger + + * nnfolder.el (nnfolder-open-marks): Fix typo. + * nnml.el (nnml-open-marks): Likewise. + +2001-08-25 Simon Josefsson + + Make nnfolder groups self-contained as far as marks are concerned. + + * nnfolder.el (nnfolder-marks-directory, nnfolder-marks-is-evil) + (nnfolder-marks, nnfolder-marks-file-suffix): New variables. + (nnfolder-open-server): Make marks directory. + (nnfolder-request-delete-group): Delete marks file. + (nnfolder-request-delete-group): Check of nov/marks file exist + before deleting. + (nnfolder-request-rename-group): Rename marks file. + (nnfolder-request-rename-group): Only rename nov/mark if they exists. + (nnfolder-request-set-mark, nnfolder-request-update-info) + (nnfolder-group-marks-pathname, nnfolder-save-marks) + (nnfolder-open-marks): New functions. + (top-level): Require gnus. + +2001-08-25 09:00:00 ShengHuo ZHU + + * nnweb.el (nnweb-type-definition): Use google raw file. + (nnweb-google-parse-1): Ditto. + (nnweb-google-identity): Ditto. + (nnweb-reference-wash-article): Move nnweb-decode-entities here. + (nnweb-altavista-wash-article): Ditto. + (nnweb-request-article): Remove nnweb-decode-entities. + + * nnml.el: Require 'gnus. + +2001-08-25 Simon Josefsson + + * nnml.el (nnml-marks-is-evil): Add doc. + +2001-08-25 Simon Josefsson + + * nnml.el (nnml-save-marks): Wrap saving marks in a + condition-case, to allow user to start Gnus if saving marks failed + for some reason. + +2001-08-24 16:05:38 Lars Magne Ingebrigtsen + + * gnus-spec.el (gnus-compile): Don't compile gnus-version. + + * gnus-group.el (gnus-update-group-mark-positions): Bind + gnus-group-update-hook to nil. + +2001-08-24 13:00:00 ShengHuo ZHU + + * mml.el (mml-generate-mime-1): Force as multibyte string. + +2001-08-24 12:00:00 ShengHuo ZHU + + * gnus-sum.el (gnus-summary-insert-line) + (gnus-summary-prepare-threads): gnus-tmp-lines should be a string. + From Martin Kretzschmar + + * gnus-spec.el (gnus-correct-substring): Take optional END. + + * nnrss.el (nnrss-request-article): Remove \n. + (nnrss-retrieve-headers): Lines number is -1. + 2001-08-24 Simon Josefsson * gnus-group.el (gnus-info-clear-data): Call diff --git a/lisp/gnus-group.el b/lisp/gnus-group.el index cc9dacd..1b9fc0b 100644 --- a/lisp/gnus-group.el +++ b/lisp/gnus-group.el @@ -965,6 +965,7 @@ The following commands are available: (defun gnus-update-group-mark-positions () (save-excursion (let ((gnus-process-mark ?\200) + (gnus-group-update-hook nil) (gnus-group-marked '("dummy.group")) (gnus-active-hashtb (make-vector 10 0)) (topic "")) diff --git a/lisp/gnus-spec.el b/lisp/gnus-spec.el index fc6c03f..0171a91 100644 --- a/lisp/gnus-spec.el +++ b/lisp/gnus-spec.el @@ -309,7 +309,7 @@ by `gnus-xmas-redefine'." (mapcar (lambda (char) (incf length (gnus-char-width char))) string) length)) -(defun gnus-correct-substring (string start end) +(defun gnus-correct-substring (string start &optional end) (let ((wstart 0) (wend 0) (seek 0) @@ -323,7 +323,8 @@ by `gnus-xmas-redefine'." wstart seek) ;; Find the end position. (while (and (< seek length) - (<= wend end)) + (or (not end) + (<= wend end))) (incf wend (gnus-char-width (aref string seek))) (incf seek)) (setq wend seek) @@ -670,7 +671,7 @@ If PROPS, insert the result." (while entries (setq entry (pop entries) type (car entry)) - (if (memq type '(version gnus-version)) + (if (memq type '(gnus-version version)) (setq gnus-format-specs (delq entry gnus-format-specs)) (let ((form (caddr entry))) (when (and (listp form) diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index a5cafed..3537c3f 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -2979,8 +2979,9 @@ buffer that was in action when the last article was fetched." (setq gnus-tmp-name gnus-tmp-from)) (unless (numberp gnus-tmp-lines) (setq gnus-tmp-lines -1)) - (when (= gnus-tmp-lines -1) - (setq gnus-tmp-lines "?")) + (if (= gnus-tmp-lines -1) + (setq gnus-tmp-lines "?") + (setq gnus-tmp-lines (number-to-string gnus-tmp-lines))) (gnus-put-text-property-excluding-characters-with-faces (point) (progn (eval gnus-summary-line-format-spec) (point)) @@ -4411,8 +4412,9 @@ or a straight list of headers." (setq gnus-tmp-name gnus-tmp-from)) (unless (numberp gnus-tmp-lines) (setq gnus-tmp-lines -1)) - (when (= gnus-tmp-lines -1) - (setq gnus-tmp-lines "?")) + (if (= gnus-tmp-lines -1) + (setq gnus-tmp-lines "?") + (setq gnus-tmp-lines (number-to-string gnus-tmp-lines))) (gnus-put-text-property (point) (progn (eval gnus-summary-line-format-spec) (point)) diff --git a/lisp/mml.el b/lisp/mml.el index 84693d8..2826144 100644 --- a/lisp/mml.el +++ b/lisp/mml.el @@ -387,7 +387,7 @@ If MML is non-nil, return the buffer up till the correspondent mml tag." (t (insert (cdr (assq 'contents cont))))) (setq encoding (mm-encode-buffer type) - coded (buffer-string)))) + coded (mm-string-as-multibyte (buffer-string))))) (mml-insert-mime-headers cont type charset encoding) (insert "\n") (insert coded))) diff --git a/lisp/nnfolder.el b/lisp/nnfolder.el index f234b8d..2e89fc9 100644 --- a/lisp/nnfolder.el +++ b/lisp/nnfolder.el @@ -1,8 +1,9 @@ ;;; nnfolder.el --- mail folder access for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001 ;; Free Software Foundation, Inc. -;; Author: ShengHuo Zhu (adding NOV) +;; Author: Simon Josefsson (adding MARKS) +;; ShengHuo Zhu (adding NOV) ;; Scott Byer ;; Lars Magne Ingebrigtsen ;; Masanobu UMEDA @@ -36,6 +37,7 @@ (require 'message) (require 'nnmail) (require 'nnoo) +(require 'gnus) (require 'gnus-util) (require 'gnus-range) @@ -53,6 +55,10 @@ This variable is a virtual server slot. See the Gnus manual for details.") "The name of the nnfolder NOV directory. If nil, `nnfolder-directory' is used.") +(defvoo nnfolder-marks-directory nil + "The name of the nnfolder MARKS directory. +If nil, `nnfolder-directory' is used.") + (defvoo nnfolder-active-file (nnheader-concat nnfolder-directory "active") "The name of the active file. @@ -142,6 +148,21 @@ This variable is a virtual server slot. See the Gnus manual for details.") (defvar nnfolder-nov-buffer-file-name nil) +(defvoo nnfolder-marks-is-evil nil + "If non-nil, Gnus will never generate and use marks file for mail groups. +Using marks files makes it possible to backup and restore mail groups +separately from `.newsrc.eld'. If you have, for some reason, set +this to t, and want to set it to nil again, you should always remove +the corresponding marks file (usually base nnfolder file name +concatenated with `.mrk', but see `nnfolder-marks-file-suffix') for +the group. Then the marks file will be regenerated properly by Gnus. + +This variable is a virtual server slot. See the Gnus manual for details.") + +(defvoo nnfolder-marks nil) + +(defvoo nnfolder-marks-file-suffix ".mrk") + ;;; Interface functions @@ -188,6 +209,9 @@ This variable is a virtual server slot. See the Gnus manual for details.") (unless (or gnus-nov-is-evil nnfolder-nov-is-evil) (and nnfolder-nov-directory (gnus-make-directory nnfolder-nov-directory))) + (unless nnfolder-marks-is-evil + (and nnfolder-marks-directory + (gnus-make-directory nnfolder-marks-directory))) (cond ((not (file-exists-p nnfolder-directory)) (nnfolder-close-server) @@ -539,7 +563,10 @@ This variable is a virtual server slot. See the Gnus manual for details.") ;; Delete the file that holds the group. (ignore-errors (delete-file (nnfolder-group-pathname group)) - (delete-file (nnfolder-group-nov-pathname group)))) + (when (file-exists-p (nnfolder-group-nov-pathname group)) + (delete-file (nnfolder-group-nov-pathname group))) + (when (file-exists-p (nnfolder-group-marks-pathname group)) + (delete-file (nnfolder-group-marks-pathname group))))) ;; Remove the group from all structures. (setq nnfolder-group-alist (delq (assoc group nnfolder-group-alist) nnfolder-group-alist) @@ -558,9 +585,14 @@ This variable is a virtual server slot. See the Gnus manual for details.") (let ((new-file (nnfolder-group-pathname new-name))) (gnus-make-directory (file-name-directory new-file)) (rename-file buffer-file-name new-file) - (setq new-file (nnfolder-group-nov-pathname new-name)) - (rename-file (nnfolder-group-nov-pathname group) - new-file)) + (when (file-exists-p (nnfolder-group-nov-pathname group)) + (setq new-file (nnfolder-group-nov-pathname new-name)) + (gnus-make-directory (file-name-directory new-file)) + (rename-file (nnfolder-group-nov-pathname group) new-file)) + (when (file-exists-p (nnfolder-group-marks-pathname group)) + (setq new-file (nnfolder-group-marks-pathname new-name)) + (gnus-make-directory (file-name-directory new-file)) + (rename-file (nnfolder-group-marks-pathname group) new-file))) t) ;; That went ok, so we change the internal structures. (let ((entry (assoc group nnfolder-group-alist))) @@ -1111,6 +1143,86 @@ This command does not work if you use short group names." (mail-header-set-number headers article) (nnheader-insert-nov headers))) +(deffoo nnfolder-request-set-mark (group actions &optional server) + (nnfolder-possibly-change-group group server) + (unless nnfolder-marks-is-evil + (nnfolder-open-marks group server) + (dolist (action actions) + (let ((range (nth 0 action)) + (what (nth 1 action)) + (marks (nth 2 action))) + (assert (or (eq what 'add) (eq what 'del)) t + "Unknown request-set-mark action: %s" what) + (dolist (mark marks) + (setq nnfolder-marks (gnus-update-alist-soft + mark + (funcall (if (eq what 'add) 'gnus-range-add + 'gnus-remove-from-range) + (cdr (assoc mark nnfolder-marks)) range) + nnfolder-marks))))) + (nnfolder-save-marks group server)) + nil) + +(deffoo nnfolder-request-update-info (group info &optional server) + (nnfolder-possibly-change-group group server) + (unless nnfolder-marks-is-evil + (nnfolder-open-marks group server) + ;; Update info using `nnfolder-marks'. + (mapcar (lambda (pred) + (gnus-info-set-marks + info + (gnus-update-alist-soft + (cdr pred) + (cdr (assq (cdr pred) nnfolder-marks)) + (gnus-info-marks info)) + t)) + gnus-article-mark-lists) + (let ((seen (cdr (assq 'read nnfolder-marks)))) + (gnus-info-set-read info + (if (and (integerp (car seen)) + (null (cdr seen))) + (list (cons (car seen) (car seen))) + seen)))) + info) + +(defun nnfolder-group-marks-pathname (group) + "Make pathname for GROUP NOV." + (let ((nnfolder-directory (or nnfolder-marks-directory nnfolder-directory))) + (concat (nnfolder-group-pathname group) nnfolder-marks-file-suffix))) + +(defun nnfolder-save-marks (group server) + (let ((file-name-coding-system nnmail-pathname-coding-system) + (file (nnfolder-group-marks-pathname group))) + (condition-case err + (with-temp-file file + (erase-buffer) + (princ nnfolder-marks (current-buffer)) + (insert "\n")) + (error (or (gnus-yes-or-no-p + (format "Could not write to %s (%s). Continue? " file err)) + (error "Cannot write to %s (%s)" err)))))) + +(defun nnfolder-open-marks (group server) + (let ((file (nnfolder-group-marks-pathname group))) + (if (file-exists-p file) + (setq nnfolder-marks (condition-case err + (with-temp-buffer + (nnheader-insert-file-contents file) + (read (current-buffer))) + (error (or (gnus-yes-or-no-p + (format "Error reading nnfolder marks file %s (%s). Continuing will use marks from .newsrc.eld. Continue? " file err)) + (error "Cannot read nnfolder marks file %s (%s)" file err))))) + ;; User didn't have a .marks file. Probably first time + ;; user of the .marks stuff. Bootstrap it from .newsrc.eld. + (let ((info (gnus-get-info + (gnus-group-prefixed-name + group + (gnus-server-to-method (format "nnfolder:%s" server)))))) + (nnheader-message 6 "Bootstrapping nnfolder marks...") + (setq nnfolder-marks (gnus-info-marks info)) + (push (cons 'read (gnus-info-read info)) nnfolder-marks) + (nnfolder-save-marks group server))))) + (provide 'nnfolder) ;;; nnfolder.el ends here diff --git a/lisp/nnml.el b/lisp/nnml.el index 18b651d..7e15778 100644 --- a/lisp/nnml.el +++ b/lisp/nnml.el @@ -1,8 +1,9 @@ ;;; nnml.el --- mail spool access for Gnus -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000 +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001 ;; Free Software Foundation, Inc. -;; Author: Lars Magne Ingebrigtsen +;; Author: Simon Josefsson (adding MARKS) +;; Lars Magne Ingebrigtsen ;; Masanobu UMEDA ;; Keywords: news, mail @@ -34,6 +35,7 @@ (eval-when-compile (require 'cl)) (eval-when-compile (require 'gnus-clfns)) +(require 'gnus) (require 'nnheader) (require 'nnmail) (require 'nnoo) @@ -63,7 +65,7 @@ This variable is a virtual server slot. See the Gnus manual for details.") This variable is a virtual server slot. See the Gnus manual for details.") (defvoo nnml-nov-is-evil nil - "If non-nil, Gnus will never generate and use nov databases for mail groups. + "If non-nil, Gnus will never generate and use nov databases for mail spools. Using nov databases will speed up header fetching considerably. This variable shouldn't be flipped much. If you have, for some reason, set this to t, and want to set it to nil again, you should always run @@ -73,6 +75,17 @@ all. This may very well take some time. This variable is a virtual server slot. See the Gnus manual for details.") +(defvoo nnml-marks-is-evil nil + "If non-nil, Gnus will never generate and use marks file for mail spools. +Using marks files makes it possible to backup and restore mail groups +separately from `.newsrc.eld'. If you have, for some reason, set this +to t, and want to set it to nil again, you should always remove the +corresponding marks file (usually named `.marks' in the nnml group +directory, but see `nnml-marks-file-name') for the group. Then the +marks file will be regenerated properly by Gnus. + +This variable is a virtual server slot. See the Gnus manual for details.") + (defvoo nnml-prepare-save-mail-hook nil "Hook run narrowed to an article before saving. @@ -90,6 +103,7 @@ This variable is a virtual server slot. See the Gnus manual for details.") "nnml version.") (defvoo nnml-nov-file-name ".overview") +(defvoo nnml-marks-file-name ".marks") (defvoo nnml-current-directory nil) (defvoo nnml-current-group nil) @@ -108,6 +122,8 @@ check twice.") (defvoo nnml-file-coding-system nnmail-file-coding-system) +(defvoo nnml-marks nil) + ;;; Interface functions. @@ -865,10 +881,6 @@ check twice.") (setq nnml-article-file-alist (nnheader-article-to-file-alist nnml-current-directory)))) -(defvoo nnml-marks-file-name ".marks") -(defvoo nnml-marks-is-evil nil) -(defvoo nnml-marks nil) - (deffoo nnml-request-set-mark (group actions &optional server) (nnml-possibly-change-directory group server) (unless nnml-marks-is-evil @@ -915,11 +927,16 @@ check twice.") (let ((file-name-coding-system nnmail-pathname-coding-system) (file (expand-file-name nnml-marks-file-name (nnmail-group-pathname group nnml-directory)))) - (nnml-possibly-create-directory group) - (with-temp-file file - (erase-buffer) - (princ nnml-marks (current-buffer)) - (insert "\n")))) + (condition-case err + (progn + (nnml-possibly-create-directory group) + (with-temp-file file + (erase-buffer) + (princ nnml-marks (current-buffer)) + (insert "\n"))) + (error (or (gnus-yes-or-no-p + (format "Could not write to %s (%s). Continue? " file err)) + (error "Cannot write to %s (%s)" err)))))) (defun nnml-open-marks (group server) (let ((file (expand-file-name @@ -939,7 +956,7 @@ check twice.") (gnus-group-prefixed-name group (gnus-server-to-method (format "nnml:%s" server)))))) - (nnheader-message 6 "Boostrapping nnml marks...") + (nnheader-message 6 "Bootstrapping nnml marks...") (setq nnml-marks (gnus-info-marks info)) (push (cons 'read (gnus-info-read info)) nnml-marks) (nnml-save-marks group server))))) diff --git a/lisp/nnrss.el b/lisp/nnrss.el index f9af0e8..61c1e9b 100644 --- a/lisp/nnrss.el +++ b/lisp/nnrss.el @@ -204,8 +204,8 @@ To use the description in headers, put this name into `nnmail-extra-headers'.") (format "<%d@%s.nnrss>" (car e) group) "\t" ;; id "\t" ;; refs - "0" "\t" ;; chars - "0" "\t" ;; lines + "-1" "\t" ;; chars + "-1" "\t" ;; lines "" "\t" ;; Xref (if (and (nth 6 e) (memq nnrss-description-field @@ -262,7 +262,12 @@ To use the description in headers, put this name into `nnmail-extra-headers'.") (insert "\n") (if (nth 6 e) (let ((point (point))) - (insert (nnrss-string-as-multibyte (nth 6 e)) "\n\n") + (insert (nnrss-string-as-multibyte (nth 6 e))) + (goto-char point) + (while (search-forward "\n" nil t) + (delete-char -1)) + (goto-char (point-max)) + (insert "\n\n") (fill-region point (point)))) (if (nth 2 e) (insert (nth 2 e) "\n"))))) diff --git a/lisp/nnweb.el b/lisp/nnweb.el index 90c9d5d..760ef75 100644 --- a/lisp/nnweb.el +++ b/lisp/nnweb.el @@ -63,9 +63,12 @@ and `altavista'.") (defvar nnweb-type-definition '( (dejanews ;; bought by google.com - (article . nnweb-google-wash-article) - (id . "http://groups.google.com/groups?as_umsgid=%s") - (reference . nnweb-google-reference) + ;;(article . nnweb-google-wash-article) + ;;(id . "http://groups.google.com/groups?as_umsgid=%s") + (article . ignore) + (id . "http://groups.google.com/groups?selm=%s&output=gplain") + ;;(reference . nnweb-google-reference) + (reference . identity) (map . nnweb-google-create-mapping) (search . nnweb-google-search) (address . "http://groups.google.com/groups") @@ -189,7 +192,7 @@ and `altavista'.") (when (string-match "^<\\(.*\\)>$" article) (setq art (match-string 1 article))) (when (and fetch art) - (setq url (format fetch article)) + (setq url (format fetch art)) (mm-with-unibyte-current-buffer (nnweb-fetch-url url)) (if (nnweb-definition 'reference t) @@ -197,8 +200,7 @@ and `altavista'.") (funcall (nnweb-definition 'reference) article))))))) (unless nnheader-callback-function - (funcall (nnweb-definition 'article)) - (nnweb-decode-entities)) + (funcall (nnweb-definition 'article))) (nnheader-report 'nnweb "Fetched article %s" article) (cons group (and (numberp article) article)))))) @@ -574,6 +576,7 @@ and `altavista'.") (while (search-forward "," nil t) (replace-match " " t t))) (widen) + (nnweb-decode-entities) (set-marker body nil)))) (defun nnweb-reference-search (search) @@ -678,7 +681,8 @@ and `altavista'.") (while (re-search-forward "[0-9]+" nil t) (replace-match "<\\1> " t))) (widen) - (nnweb-remove-markup))) + (nnweb-remove-markup) + (nnweb-decode-entities))) (defun nnweb-altavista-search (search &optional part) (url-insert-file-contents @@ -733,7 +737,7 @@ and `altavista'.") (case-fold-search t) (active (cadr (assoc nnweb-group nnweb-group-alist))) Subject Score Date Newsgroups From - map url) + map url mid) (unless active (push (list nnweb-group (setq active (cons 1 0)) nnweb-type nnweb-search) @@ -741,10 +745,10 @@ and `altavista'.") ;; Go through all the article hits on this page. (goto-char (point-min)) (while (re-search-forward - "a href=/groups\\(\\?[^ \">]*selm=[^ \">]*\\)" nil t) - (setq url - (concat (nnweb-definition 'address) - (match-string 1))) + "a href=/groups\\(\\?[^ \">]*selm=\\([^ &\">]+\\)\\)" nil t) + (setq mid (match-string 2) + url (format + "http://groups.google.com/groups?selm=%s&output=gplain" mid)) (narrow-to-region (search-forward ">" nil t) (search-forward "" nil t)) (nnweb-remove-markup) @@ -779,7 +783,7 @@ and `altavista'.") (cdr active) (if Newsgroups (concat "(" Newsgroups ") " Subject) Subject) - From Date Message-ID + From Date (or Message-ID mid) nil 0 0 url)) map) (nnweb-set-hashtb (cadar map) (car map)))) @@ -827,7 +831,7 @@ and `altavista'.") (defun nnweb-google-identity (url) "Return an unique identifier based on URL." - (if (string-match "seld=\\([0-9]+\\)" url) + (if (string-match "selm=\\([^ &>]+\\)" url) (match-string 1 url) url)) diff --git a/texi/ChangeLog b/texi/ChangeLog index 9a5fc61..e3cc299 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,29 @@ +2001-08-25 Simon Josefsson + + * gnus.texi (Mail Spool): Add marks. + (MH Spool): Doesn't use marks file. + (Mail Folders): Add marks. + +2001-08-25 Simon Josefsson + From Henrik Enberg + + * gnus.texi (Group Parameters): Fix. + +2001-08-24 16:03:31 Lars Magne Ingebrigtsen + + * gnus.texi (Group Parameters): Fix. + +2001-08-24 Simon Josefsson + + * Makefile.in (latexps): Make tmps. + +2001-08-24 Simon Josefsson + From Jesper Harder + + * Makefile.in (latexps): Escape {. + + * splitindex: Ditto. + 2001-08-23 19:22:59 Lars Magne Ingebrigtsen * gnus.texi (Group Parameters): Fix. diff --git a/texi/Makefile.in b/texi/Makefile.in index a2fea5c..0e42c1b 100644 --- a/texi/Makefile.in +++ b/texi/Makefile.in @@ -113,7 +113,7 @@ texi2latex.elc: texi2latex.el latex gnus.latexi gnus-faq.latexi: $(srcdir)/gnus.texi $(srcdir)/gnus-faq.texi texi2latex.elc srcdir=$(srcdir) $(EMACSCOMP) -l ./texi2latex.elc -f latexi-translate -latexps: gnus.latexi +latexps: gnus.latexi tmps $(MAKE) texi2latex.elc rm -f gnus.aux egrep -v "label.*Index|chapter.*Index" gnus.latexi > gnus.tmplatexi1 @@ -124,7 +124,7 @@ latexps: gnus.latexi makeindex -o gnus.gind gnus.gidx sed 's/\\char 5E\\relax {}/\\symbol{"5E}/' < gnus.kind > gnus.tmpkind mv gnus.tmpkind gnus.kind - egrep -v "end{document}" gnus.tmplatexi1 > gnus.tmplatexi + egrep -v "end\{document\}" gnus.tmplatexi1 > gnus.tmplatexi cat postamble.tex >> gnus.tmplatexi $(LATEX) gnus.tmplatexi $(LATEX) gnus.tmplatexi @@ -134,7 +134,7 @@ pss: $(MAKE) latex $(MAKE) latexps -psout: +psout: tmps $(MAKE) latex $(MAKE) latexboth $(MAKE) out diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index 6a0a5e9..917c0fc 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -2820,8 +2820,8 @@ kiboze $B%0%k!<%W$r:n@.$7$^$9!#%W%m%s%W%H$GL>A0$H!"(Bkiboze $B%0%k!<%W$K!V4^$ $B$$$/$D$+Nc$r5s$2$^$9(B: @table @code -@item [unread] -$BL$FI$N5-;v$@$1$rI=<($7$^$9!#(B +@item [read] +$B4{FI$N5-;v$@$1$rI=<($7$^$9!#(B @item [not expire] $B4|8B@Z$l>C5n2DG=$J5-;v0J30$N$9$Y$F$rI=<($7$^$9!#(B @@ -10767,7 +10767,7 @@ Emacs $B$N%;%C%7%g%sA4BN$r%i%C%W$7$F!"%G%#%U%)%k%H$N%a%=%C%I$r;H$&$H$$$&$N(B @item nntp-via-envuser @vindex nntp-via-envuser -$B$b$7Hs(B-@code{nil}$B$J$i!"Cf4V$N(B @code{telnet} $B$N%;%C%7%g%s(B ($B%/%i%$%"%s%H$H(B +$B$b$7Hs(B@code{nil}$B$J$i!"Cf4V$N(B @code{telnet} $B$N%;%C%7%g%s(B ($B%/%i%$%"%s%H$H(B $B%5!<%P!<$NN>J}(B) $B$G(B @code{ENVIRON} $B%*%W%7%g%s$r%5%]!<%H$7!"%m%0%$%sL>$NF~(B $BNO$rMW5a$7$^$;$s!#$3$l$ONc$($P(B Solaris $B$N(B @code{telnet} $B$GF0:n$7$^$9!#(B @@ -12458,6 +12458,17 @@ rmail box $B$N$?$a$N%"%/%F%#%V%U%!%$%k$NL>A0!#4{DjCM(B $B$N(B @sc{nov} $B%G!<%?%Y!<%9$b:n@.$7$J$1$l$P$J$j$^$;$s!#$3$l$N$?$a$K!"%a!<%k(B $B$rFI$`;v$K4X$7$F$O:GB.$N%P%C%/%(%s%I$K$J$j$^$9!#(B +@cindex self contained nnml servers +$B0u%U%!%$%k(B ($BLuCm(B: marks file) $B$,;H$o$l$k$H(B ($B$=$l$,%G%#%U%)%k%H$G$9$,(B)$B!"(B +@code{nnml} $B%5!<%P!<$O(B @code{tar} $B$J$I$r;H$C$F%P%C%/%"%C%W$7$?$j!"8e$G$"(B +$B$J$?$,IU$1$?0u$,$9$Y$FJ]$?$l$?>uBV$G(B gnus $B$KLa$9(B ($BK\Mh$N(B @code{nnml} $B%5!<(B +$B%P!<$K$h$C$FDI2C$9$k(B) $B$3$H$,$G$-$kFC$l$N(B @code{nnml} $B%0%k!<%W$N%G%#%l%/%H%jFb$N!"DL(B +$B>o(B @code{.marks} $B%U%!%$%k(B (@code{nnml-marks-file-name} $B$r;2>H(B) $B$K3JG<$5(B +$B$l$^$9!#$^$?!"8D!9$N(B @code{nnml} $B%0%k!<%W$K$D$$$F$b%P%C%/%"%C%W$9$k$3$H(B +$B$,2DG=$G!"(B($B%P%C%/%"%C%W$r(B nnml $B%G%#%l%/%$%H%j$KLa$7$?8e$G(B) @kbd{G m} $B%-!<(B +$B$r;H$C$F$=$N%0%k!<%W$r85$KLa$7$^$9!#(B + $B;ve$N%5!<%P!<$N@_Dj(B: @table @code @@ -12493,6 +12504,15 @@ rmail box $B$N$?$a$N%"%/%F%#%V%U%!%$%k$NL>A0!#4{DjCM(B @item nnml-prepare-save-mail-hook @vindex nnml-prepare-save-mail-hook $BJ]B8$9$kA0$K5-;v$KHO0O$r69$a$FA0$G$9!#%G%#%U%)%k%H$O(B @file{.marks} $B$G$9!#(B @end table @findex nnml-generate-nov-databases @@ -12509,7 +12529,7 @@ rmail box $B$N$?$a$N%"%/%F%#%V%U%!%$%k$NL>A0!#4{DjCM(B @cindex mh-e mail spool @code{nnmh} $B$O!"(B@sc{nov} $B%G!<%?%Y!<%9$r:n$i$J$$$3$H$H%"%/%F%#%V%U%!%$%k(B -$B$rJ];}$7$J$$;v$r=|$$$F!"(B@code{nnml} $B$H;w$F$$$^$9!#$=$N$3$H(B +$B$d0u%U%!%$%k$rJ];}$7$J$$;v$r=|$$$F!"(B@code{nnml} $B$H;w$F$$$^$9!#$=$N$3$H(B $B$O(B @code{nnmh} $B$r(B @code{nnml} $B$h$j(B @emph{$B$+$J$j(B} $BCY$$%P%C%/%(%s%I$K$7$F(B $B$$$^$9$,!"$=$l$O(B procmail $B$N%9%/%j%W%H$r=q$/$?$a$K$:$C$H$d$j$d$9$/$J$C$F(B $B$b$$$^$9!#(B @@ -12548,6 +12568,17 @@ rmail box $B$N$?$a$N%"%/%F%#%V%U%!%$%k$NL>A0!#4{DjCM(B @code{nnfolder} $B$O5-;vHV9f$HE~CeF|$r5-O?$7$F$*$/$?$a$NDI2C$N%X%C%@!<$r2C(B $B$($^$9!#(B +@cindex self contained nnfolder servers +$B0u%U%!%$%k(B ($BLuCm(B: marks file) $B$,;H$o$l$k$H(B ($B$=$l$,%G%#%U%)%k%H$G$9$,(B)$B!"(B +@code{nnfolder} $B%5!<%P!<$O(B @code{tar} $B$J$I$r;H$C$F%P%C%/%"%C%W$7$?$j!"8e(B +$B$G$"$J$?$,IU$1$?0u$,$9$Y$FJ]$?$l$?>uBV$G(B gnus $B$KLa$9(B ($BK\Mh(B +$B$N(B @code{nnfolder} $B%5!<%P!<$K$h$C$FDI2C$9$k(B) $B$3$H$,$G$-$kFCo(B @code{.mrk} (@code{nnfolder-marks-file-name} $B$r;2>H(B) $B$,IU2C$5$l(B +$B$?L>A0$N%U%!%$%k$K3JG<$5$l$^$9!#$^$?!"8D!9$N(B @code{nnfolder} $B%0%k!<%W$K(B +$B$D$$$F$b%P%C%/%"%C%W$9$k$3$H$,2DG=$G!"(B($B%P%C%/%"%C%W$r(B nnfolder $B%G%#%l%/(B +$B%$%H%j$KLa$7$?8e$G(B) @kbd{G m} $B%-!<$r;H$C$F$=$N%0%k!<%W$r85$KLa$7$^$9!#(B + $B;ve$N%5!<%P!<$N@_Dj(B: @table @code @@ -12596,6 +12627,19 @@ rmail box $B$N$?$a$N%"%/%F%#%V%U%!%$%k$NL>A0!#4{DjCM(B @vindex nnfolder-nov-is-evil $B$b$7Hs(B@code{nil}$B$J$i!"$3$N%P%C%/%(%s%I$O(B @sc{nov} $B%U%!%$%k$rL5;k$7$^$9!#(B $B4{DjCM$O(B @code{nil} $B$G$9!#(B + +@item nnfolder-nov-file-suffix +@vindex nnfolder-nov-file-suffix +@sc{nov} $B%U%!%$%k$N3HD%;R$G$9!#%G%#%U%)%k%H$O(B @file{.nov} $B$G$9!#(B + +@item nnfolder-marks-is-evil +@vindex nnfolder-marks-is-evil +$BHs(B@code{nil} $B$G$"$k$H!"$3$N%P%C%/%(%s%I$O$$$+$J$k(B @sc{$B0u(B} $B%U%!%$%k$r$b(B +$BL5;k$7$^$9!#%G%#%U%)%k%H$O(B @code{nil} $B$G$9!#(B + +@item nnfolder-marks-file-suffix +@vindex nnfolder-marks-file-suffix +@sc{$B0u(B} $B%U%!%$%k$N3HD%;R$G$9!#%G%#%U%)%k%H$O(B @file{.mrk} $B$G$9!#(B @end table @findex nnfolder-generate-active-file @@ -14226,7 +14270,7 @@ nnimap $B$O$=$l$b%5%]!<%H$7$^$9!#$7$+$7!"(BSSLeay $B$N:G?7HG$G$"$k(B 0.9.x  @item nnimap-importantize-dormant @vindex nnimap-importantize-dormant -$BHs(B-nil $B$@$C$?$i!"B>$N(B IMAP $B%/%i%$%"%s%H$N$?$a$KJ]N15-;v$r0uIU$-$H$7$F$b(B +$BHs(B nil $B$@$C$?$i!"B>$N(B IMAP $B%/%i%$%"%s%H$N$?$a$KJ]N15-;v$r0uIU$-$H$7$F$b(B $B0u$rIU$1$^$9!#(Bgnus $B$NFbIt$G$O!"J]N15-;v$O85!9$9$G$K0uIU$-$H$7$F$N$_0u$,(B $BIU$1$i$l$F$$$^$9!#$3$l$O!"B>$N(B IMAP $B%/%i%$%"%s%H$K$*$1$kJ]N15-;v$r!"$"$?(B $B$+$b0uIU$-$N$h$&$K$-$oN)$?$;$^$9!#(B($BJL$N8@$$J}$r$9$k$H!"(Bgnus $B$OFs$D$N0u$r(B diff --git a/texi/gnus.texi b/texi/gnus.texi index a076e8f..d9130a5 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -2735,8 +2735,8 @@ Display articles that satisfy a predicate. Here are some examples: @table @code -@item [unread] -Display only unread articles. +@item [read] +Display only read articles. @item [not expire] Display everything except expirable articles. @@ -2766,7 +2766,7 @@ gnus, but provide a place for you to store information on particular groups. @item charset -@item charset +@cindex charset Elements that look like @code{(charset . iso-8859-1)} will make @code{iso-8859-1} the default charset; that is, the charset that will be used for all articles that do not specify a charset. @@ -2774,7 +2774,7 @@ used for all articles that do not specify a charset. See also @code{gnus-group-charset-alist}. @item ignored-charsets -@item ignored-charset +@cindex ignored-charset Elements that look like @code{(ignored-charsets x-known iso-8859-1)} will make @code{iso-8859-1} and @code{x-unknown} ignored; that is, the default charset will be used for decoding articles. @@ -13044,6 +13044,17 @@ splitting. It has to create lots of files, and it also generates @sc{nov} databases for the incoming mails. This makes it the fastest backend when it comes to reading mail. +@cindex self contained nnml servers +When the marks file is used (which it is by default), @code{nnml} +servers have the property that you may backup them using @code{tar} or +similar, and later be able to restore them into Gnus (by adding the +proper @code{nnml} server) and have all your marks be preserved. Marks +for a group is usually stored in the @code{.marks} file (but see +@code{nnml-marks-file-name}) within each @code{nnml} group's directory. +Individual @code{nnml} groups are also possible to backup, use @kbd{G m} +to restore the group (after restoring the backup into the nnml +directory). + Virtual server settings: @table @code @@ -13051,7 +13062,7 @@ Virtual server settings: @vindex nnml-directory All @code{nnml} directories will be placed under this directory. The default is the value of `message-directory' (whose default value is -@file{~/Mail}) +@file{~/Mail}). @item nnml-active-file @vindex nnml-active-file @@ -13066,12 +13077,12 @@ Format}. The default is @file{~/Mail/newsgroups"}. @item nnml-get-new-mail @vindex nnml-get-new-mail If non-@code{nil}, @code{nnml} will read incoming mail. The default is -@code{t} +@code{t}. @item nnml-nov-is-evil @vindex nnml-nov-is-evil If non-@code{nil}, this backend will ignore any @sc{nov} files. The -default is @code{nil} +default is @code{nil}. @item nnml-nov-file-name @vindex nnml-nov-file-name @@ -13081,6 +13092,15 @@ The name of the @sc{nov} files. The default is @file{.overview}. @vindex nnml-prepare-save-mail-hook Hook run narrowed to an article before saving. +@item nnml-marks-is-evil +@vindex nnml-marks-is-evil +If non-@code{nil}, this backend will ignore any @sc{marks} files. The +default is @code{nil}. + +@item nnml-marks-file-name +@vindex nnml-marks-file-name +The name of the @sc{marks} files. The default is @file{.marks}. + @end table @findex nnml-generate-nov-databases @@ -13099,9 +13119,9 @@ Commands}). @cindex mh-e mail spool @code{nnmh} is just like @code{nnml}, except that is doesn't generate -@sc{nov} databases and it doesn't keep an active file. This makes -@code{nnmh} a @emph{much} slower backend than @code{nnml}, but it also -makes it easier to write procmail scripts for. +@sc{nov} databases and it doesn't keep an active file or marks file. +This makes @code{nnmh} a @emph{much} slower backend than @code{nnml}, +but it also makes it easier to write procmail scripts for. Virtual server settings: @@ -13139,6 +13159,18 @@ file. Each file is in the standard Un*x mbox format. @code{nnfolder} will add extra headers to keep track of article numbers and arrival dates. +@cindex self contained nnfolder servers +When the marks file is used (which it is by default), @code{nnfolder} +servers have the property that you may backup them using @code{tar} or +similar, and later be able to restore them into Gnus (by adding the +proper @code{nnfolder} server) and have all your marks be preserved. +Marks for a group is usually stored in a file named as the mbox file +with @code{.mrk} concatenated to it (but see +@code{nnfolder-marks-file-suffix}) within the @code{nnfolder} directory. +Individual @code{nnfolder} groups are also possible to backup, use +@kbd{G m} to restore the group (after restoring the backup into the +@code{nnfolder} directory). + Virtual server settings: @table @code @@ -13188,6 +13220,19 @@ extract some information from it before removing it. If non-@code{nil}, this backend will ignore any @sc{nov} files. The default is @code{nil}. +@item nnfolder-nov-file-suffix +@vindex nnfolder-nov-file-suffix +The extension for @sc{nov} files. The default is @file{.nov}. + +@item nnfolder-marks-is-evil +@vindex nnfolder-marks-is-evil +If non-@code{nil}, this backend will ignore any @sc{marks} files. The +default is @code{nil}. + +@item nnfolder-marks-file-suffix +@vindex nnfolder-marks-file-suffix +The extension for @sc{marks} files. The default is @file{.mrk}. + @end table diff --git a/texi/splitindex b/texi/splitindex index 956ad3d..cfd568c 100755 --- a/texi/splitindex +++ b/texi/splitindex @@ -1,6 +1,6 @@ #!/bin/sh match='M-x |(Group)|(Summary)|(Article)|(Server)|(Browse)|(Post)|(Mail)|(Score)|(Binary)|(Topic)|(Pick)' -fun='{gnus-|{nn.*-|{grouplens-' +fun='\{gnus-|\{nn.*-|\{grouplens-' egrep "$match" gnus.idx > gnus.kidx egrep "$fun" gnus.idx > gnus.gidx egrep -v "$match|$fun" gnus.idx > gnus.cidx -- 1.7.10.4