From: yamaoka Date: Thu, 27 Dec 2001 22:32:31 +0000 (+0000) Subject: Synch with Oort Gnus. X-Git-Tag: t-gnus-6_15_4-09-quimby-last-~4 X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5f498109ec429459516634359a50c2457e5678bc;p=elisp%2Fgnus.git- Synch with Oort Gnus. --- diff --git a/contrib/ChangeLog b/contrib/ChangeLog index 49cd5d0..2868fdb 100644 --- a/contrib/ChangeLog +++ b/contrib/ChangeLog @@ -1,3 +1,8 @@ +2001-12-26 Florian Weimer + + * gpg.el (gpg-command-default-alist): Using gpg-2comp is no longer + the default. + 2001-12-18 Josh Huber * ChangeLog: changed buffer-file-coding-system back to diff --git a/contrib/gpg.el b/contrib/gpg.el index fa1c5f3..c87dc64 100644 --- a/contrib/gpg.el +++ b/contrib/gpg.el @@ -39,8 +39,8 @@ ;; * Customization for all flavors of PGP is possible. ;; * The main operations (verify, decrypt, sign, encrypt, sign & ;; encrypt) are implemented. -;; * Gero Treuner's gpg-2comp script is supported, and data which is is -;; compatible with PGP 2.6.3 is generated. +;; * Optionally, Gero Treuner's gpg-2comp script is supported, +;; to generate data which is compatible with PGP 2.6.3. ;; Customizing external programs ;; ============================= @@ -225,12 +225,12 @@ If you are running Emacs 20, this directory must have mode 0700." (defcustom gpg-command-default-alist '((gpg . "gpg") - (gpg-2comp . "gpg-2comp")) + (gpg-2comp . "gpg")) "Default paths for some GnuPG-related programs. Modify this variable if you have to change the paths to the -executables required by the GnuPG interface. You can enter \"gpg\" -for `gpg-2comp' if you don't have this script, but you'll lose PGP -2.6.x compatibility." +executables required by the GnuPG interface. You can enter \"gpg-2comp\" +for `gpg-2comp' if you have obtained this script, in order to gain +PGP 2.6.x compatibility." :tag "GnuPG programs" :type 'gpg-command-alist :group 'gpg-options) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index e5e8d39..a37c8ce 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,23 @@ +2001-12-27 Simon Josefsson + + * gnus-sum.el (gnus-select-newsgroup): Make + `gnus-newsgroup-unseen' sorted. Make `gnus-newsgroup-unseen' + contain all articles (instead of none) when no seen marks have + been set for the group. + (gnus-update-marks): Use `gnus-range-add' on a uncompressed list + instead, it seems to result in shorter ranges. + +2001-12-26 11:00:00 ShengHuo ZHU + + * mm-util.el (mm-iso-8859-x-to-15-region): Use + insert-before-markers. + From Jesper Harder + +2001-12-26 Paul Jarc + + * nnmaildir.el (nnmaildir-save-mail): create the destination + groups if they do not exist. + 2001-12-26 Katsumi Yamaoka * canlock.el (canlock-sha1-with-openssl): Remove unused variable. @@ -248,14 +268,14 @@ * nnrss.el (nnrss-decode-entities-unibyte-string): Use mm-url-decode-entities-nbsp. - * nnlistserv.el, nnultimate.el, nnwarchive.el, nnweb.el, - webmail.el, nnwfm.el: Use mm-url. + * nnlistserv.el, nnultimate.el, nnwarchive.el, nnweb.el: + * webmail.el, nnwfm.el: Use mm-url. * mm-url.el (mm-url-fetch-form): Move from nnweb. (mm-url-remove-markup): Move from nnweb. (mm-url-fetch-simple): Move from webmail. - * nnslashdot.el (nnslashdot-request-post): mm-url-fetch-form. + * nnslashdot.el (nnslashdot-request-post): Use mm-url-fetch-form. 2001-12-07 01:00:00 ShengHuo ZHU @@ -268,7 +288,7 @@ * nnweb.el (nnweb-replace-in-string): Removed. - * gnus-util.el (gnus-replace-in-string): New. + * gnus-util.el (gnus-replace-in-string): New function. (gnus-mode-string-quote): Use it. * nnrss.el (nnrss-format-string): Use gnus-replace-in-string. @@ -429,7 +449,7 @@ 2001-11-25 09:00:00 ShengHuo ZHU - * gnus-util.el (gnus-directory-sep-char-regexp): New. + * gnus-util.el (gnus-directory-sep-char-regexp): New variable. * gnus-score.el (gnus-score-find-bnews): Use it. * gnus-sum.el (gnus-summary-limit-to-subject): An exclusion version. @@ -755,10 +775,10 @@ 2001-11-01 09:00:00 ShengHuo ZHU - * mm-util.el (mm-iso-8859-x-to-15-region): New. - (mm-hack-charsets): New. - (mm-iso-8859-15-compatible): New. - (mm-iso-8859-x-to-15-table): New. + * mm-util.el (mm-iso-8859-x-to-15-region): New function. + (mm-hack-charsets): New variable. + (mm-iso-8859-15-compatible): New variable. + (mm-iso-8859-x-to-15-table): New variable. (mm-find-mime-charset-region): Add parameter hack-charsets. * mm-bodies.el (mm-encode-body): Use it. @@ -777,10 +797,10 @@ * smiley-ems.el (smiley-update-cache): Auto detect file type. - * message.el (message-forward-rmail-make-body): + * message.el (message-forward-rmail-make-body): Use save-window-excursion. - (message-encode-message-body): no error. - (message-setup-1): compose-mail send-actions are different from + (message-encode-message-body): Search with noerror. + (message-setup-1): Convert compose-mail send-actions to message-send-actions. 2001-11-01 Simon Josefsson @@ -818,12 +838,12 @@ 2001-10-31 08:00:00 ShengHuo ZHU From: Josh Huber - * message.el (message-subscribed-address-functions): New. - (message-subscribed-addresses): New. - (message-subscribed-regexps): New. - (message-goto-mail-followup-to): New. - (message-send-mail): Mail-Followup-To. - (message-make-mft): New. + * message.el (message-subscribed-address-functions): New variable. + (message-subscribed-addresses): New variable. + (message-subscribed-regexps): New variable. + (message-goto-mail-followup-to): New function. + (message-send-mail): Add Mail-Followup-To. + (message-make-mft): New function. * gnus.el (gnus-find-subscribed-addresses): New. diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index 5681931..e0d0e12 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -4679,11 +4679,12 @@ If SELECT-ARTICLES, only select those articles from GROUP." (let ((marks (assq 'seen (gnus-info-marks info)))) ;; The `seen' marks are treated specially. - (when (setq gnus-newsgroup-seen (cdr marks)) - (dolist (article gnus-newsgroup-articles) - (unless (gnus-member-of-range - article gnus-newsgroup-seen) - (push article gnus-newsgroup-unseen))))) + (if (setq gnus-newsgroup-seen (cdr marks)) + (dolist (article gnus-newsgroup-articles) + (unless (gnus-member-of-range article gnus-newsgroup-seen) + (setq gnus-newsgroup-unseen + (append gnus-newsgroup-unseen (list article))))) + (setq gnus-newsgroup-unseen gnus-newsgroup-articles))) ;; Removed marked articles that do not exist. (gnus-update-missing-marks @@ -4977,7 +4978,8 @@ If SELECT-ARTICLES, only select those articles from GROUP." (when (eq (cdr type) 'seen) (setq list (if list - (gnus-add-to-range list gnus-newsgroup-unseen) + (gnus-range-add (gnus-uncompress-sequence list) + gnus-newsgroup-unseen) (gnus-compress-sequence gnus-newsgroup-articles)))) (when (eq (gnus-article-mark-to-type (cdr type)) 'list) diff --git a/lisp/mm-util.el b/lisp/mm-util.el index 5525a7b..59dae6d 100644 --- a/lisp/mm-util.el +++ b/lisp/mm-util.el @@ -484,7 +484,8 @@ If the charset is `composition', return the actual one." (setq inconvertible t) (forward-char)) (t - (insert (prog1 (+ c (car (cdr item))) (delete-char 1)))) + (insert-before-markers (prog1 (+ c (car (cdr item))) + (delete-char 1)))) (skip-chars-forward "\0-\177")))) (not inconvertible)))) diff --git a/lisp/nnmaildir.el b/lisp/nnmaildir.el index 041759d..61c7c41 100644 --- a/lisp/nnmaildir.el +++ b/lisp/nnmaildir.el @@ -37,7 +37,7 @@ ;; * 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. +;; * We use the filesystem as a database. ;; ;; Todo: ;; * Ignore old NOV data when gnus-extra-headers has changed. @@ -1383,18 +1383,23 @@ by nnmaildir-request-article.") (catch 'return (if group-art nil (throw 'return nil)) - (let ((group-art group-art) - x nnmaildir--file deactivate-mark) + (let ((ret group-art) + ga gname x groups nnmaildir--file deactivate-mark) (save-excursion (goto-char (point-min)) (save-match-data (while (looking-at "From ") (replace-match "X-From-Line: ") (forward-line 1)))) - (setq x (caar group-art) group-art (cdr group-art)) - (if (nnmaildir-request-accept-article x) nil - (throw 'return nil)) ; not that nnmail bothers to check - (setq x (nnmaildir--prepare nil x) + (setq groups (nnmaildir--srv-get-groups nnmaildir--cur-server) + ga (car group-art) group-art (cdr group-art) + gname (car ga)) + (or (intern-soft gname groups) + (nnmaildir-request-create-group gname) + (throw 'return nil)) ;; not that nnmail bothers to check :( + (if (nnmaildir-request-accept-article gname) nil + (throw 'return nil)) + (setq x (nnmaildir--prepare nil gname) nnmaildir--file (nnmaildir--srv-get-dir nnmaildir--cur-server) nnmaildir--file (concat nnmaildir--file (nnmaildir--grp-get-name x)) @@ -1406,10 +1411,13 @@ by nnmaildir-request-article.") (nnmaildir--art-get-prefix x) (nnmaildir--art-get-suffix x))) (while group-art - (setq x (caar group-art) group-art (cdr group-art)) - (if (nnmaildir-request-accept-article x) nil - (throw 'return nil)))) - group-art)) + (setq ga (car group-art) group-art (cdr group-art) + gname (car ga)) + (if (and (or (intern-soft gname groups) + (nnmaildir-request-create-group gname)) + (nnmaildir-request-accept-article gname)) nil + (setq ret (delq ga ret)))) ;; We'll still try the other groups + ret))) (defun nnmaildir-active-number (group) (let ((x (nnmaildir--prepare nil group))) diff --git a/texi/ChangeLog b/texi/ChangeLog index 36ceb22..3dab217 100644 --- a/texi/ChangeLog +++ b/texi/ChangeLog @@ -1,3 +1,12 @@ +2001-12-26 Florian Weimer + + * gnus.texi (Using GPG): Remove obsolete reference to gpg-2comp. + +2001-12-26 Simon Josefsson + + * gnus.texi (Summary Buffer Lines): Add xrefs. Suggested by + Arcady Genkin . + 2001-12-26 Katsumi Yamaoka * gnus.texi (NNTP): Add a note for `nntp-prepare-post-hook'. diff --git a/texi/gnus-ja.texi b/texi/gnus-ja.texi index deb9f0a..6304918 100644 --- a/texi/gnus-ja.texi +++ b/texi/gnus-ja.texi @@ -4398,12 +4398,12 @@ Gnus は変数 @code{gnus-extract-address-components} の値を @code{From @item < 二十引くスレッドレベルの空白。 @item U -未読。 +未読。@xref{Read Articles}。 @item R この紛らわしい名前指定子は @dfn{secondary mark} によって定義されます。こ のマークは記事が既に返答済みのものか、キャッシュされたものか、あるいは保 -存されたものかを表します。 +存されたものかを表します。@xref{Other Marks}。 @item i 数字としてのスコア (@pxref{Scoring})。 @@ -10295,21 +10295,6 @@ To use this correctly with GPG, you'll need the following lisp code in your The @code{gpg-temp-directory} need to point to a directory with permissions set to 700, for your own safety. -If you want to benefit of PGP2.6 compatibility, you might create a script named -@file{gpg-2comp} with these instructions: - -@example -#!/bin/sh -exec gpg --rfc1991 "$@@" -@end example - -If you don't want to use such compatibility, you can add the following line to -your @file{~/.emacs} or @file{~/.gnus}: - -@lisp -(setq gpg-command-default-alist (quote ((gpg . "gpg") (gpg-2comp . "gpg")))) -@end lisp - To sign or encrypt your message you may choose to use the MML Security menu or @kbd{C-c C-m s p} to sign your message using PGP/MIME, @kbd{C-c C-m s s} to sign your message using S/MIME. There's also diff --git a/texi/gnus.texi b/texi/gnus.texi index 33346b7..953e4d7 100644 --- a/texi/gnus.texi +++ b/texi/gnus.texi @@ -4346,12 +4346,12 @@ One space for each thread level. @item < Twenty minus thread level spaces. @item U -Unread. +Unread. @xref{Read Articles}. @item R This misleadingly named specifier is the @dfn{secondary mark}. This mark will say whether the article has been replied to, has been cached, -or has been saved. +or has been saved. @xref{Other Marks}. @item i Score as a number (@pxref{Scoring}). @@ -10803,21 +10803,6 @@ To use this correctly with GPG, you'll need the following lisp code in your The @code{gpg-temp-directory} need to point to a directory with permissions set to 700, for your own safety. -If you want to benefit of PGP2.6 compatibility, you might create a script named -@file{gpg-2comp} with these instructions: - -@example -#!/bin/sh -exec gpg --rfc1991 "$@@" -@end example - -If you don't want to use such compatibility, you can add the following line to -your @file{~/.emacs} or @file{~/.gnus}: - -@lisp -(setq gpg-command-default-alist (quote ((gpg . "gpg") (gpg-2comp . "gpg")))) -@end lisp - To sign or encrypt your message you may choose to use the MML Security menu or @kbd{C-c C-m s p} to sign your message using PGP/MIME, @kbd{C-c C-m s s} to sign your message using S/MIME. There's also