From bbaa6736e285258f29be9409b7b75751bb847e96 Mon Sep 17 00:00:00 2001 From: Miles Bader Date: Fri, 10 Sep 2004 15:04:34 +0000 Subject: [PATCH] Revision: miles@gnu.org--gnu-2004/gnus--devo--0--patch-99 Merge from emacs--cvs-trunk--0, gnus--rel--5.10 Patches applied: * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-530 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-533 Update from CVS * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-536 sync-tree with gnus--rel--5.10 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-12 Update from CVS: make.bat: Fix line endings around arch-tag. * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-13 - miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-18 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-19 Remove autoconf-generated files from archive * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-20 Update from CVS * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-21 Merge from emacs--cvs-trunk--0 --- .arch-inventory | 4 ++++ lisp/ChangeLog | 38 ++++++++++++++++++++++++++++++++++++++ lisp/flow-fill.el | 2 ++ lisp/gnus-art.el | 3 +++ lisp/gnus-msg.el | 16 ++++++++-------- lisp/gnus-salt.el | 16 +++++++++------- lisp/gnus-sum.el | 2 +- lisp/gnus.el | 6 +++++- lisp/message.el | 10 +++++----- lisp/mm-view.el | 4 ++-- lisp/mml-sec.el | 1 + lisp/mml2015.el | 1 + lisp/nnmail.el | 2 +- lisp/nntp.el | 5 +++++ lisp/spam-stat.el | 2 +- 15 files changed, 86 insertions(+), 26 deletions(-) create mode 100644 .arch-inventory diff --git a/.arch-inventory b/.arch-inventory new file mode 100644 index 000000000..059a4f039 --- /dev/null +++ b/.arch-inventory @@ -0,0 +1,4 @@ +# Generated files +precious ^(configure|config\.status|config\.cache)$ + +# arch-tag: 62f59105-7e14-4869-a14d-1030bd187a09 diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 19cc80aaa..67d66b699 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,39 @@ +2004-09-10 Miles Bader + + * gnus-art.el (article-decode-mime-words, article-babel) + (gnus-article-highlight-signature, gnus-article-add-buttons) + (gnus-signature-toggle): Remove unnecessary bindings of + `inhibit-read-only' inherited from v5.10 merge. + +2004-09-08 Reiner Steib + + * nntp.el (nntp): New customization group. + (nntp-authinfo-file): Added customization group. + + * mml2015.el (mml2015-unabbrev-trust-alist): Added customization + group. + + * mml-sec.el (mml-signencrypt-style-alist): Ditto. + + * gnus.el (to-address, to-list, subscribed) + (large-newsgroup-initial): Ditto. + + * flow-fill.el (fill-flowed-display-column) + (fill-flowed-encode-column): Ditto. + +2004-09-06 Stefan + + * message.el (message-tokenize-header, message-send-mail-with-qmail): + Use point-min rather than 1. + (message-send-mail): Use buffer-size rather than point-max. + + * gnus-sum.el (gnus-summary-search-article-forward): + Signal a specific `search-failed' rather than a generic `error'. + + * gnus-salt.el (gnus-pick-mouse-pick-region): Switch 1 => point-min. + (gnus-generate-vertical-tree): Usue `bobp' rather than compare to 1. + (gnus-highlight-selected-tree): Use point-min rather than 1 and 2. + 2004-09-10 Simon Josefsson * nndb.el (require): Remove tcp and duplicate cl. @@ -7,10 +43,12 @@ * gnus-agent.el (directory-files-and-attributes): Move forward. 2004-09-09 Kevin Greiner + * gnus-agent.el (directory-files-and-attributes): Optionally defined to support XEmacs. 2004-09-09 Kevin Greiner + * gnus-agent.el (gnus-agent-cat-groups): rewrote avoiding defsetf to avoid run-time CL dependencies. (gnus-agent-unfetch-articles): New function. diff --git a/lisp/flow-fill.el b/lisp/flow-fill.el index 3ecb06f01..c0398a844 100644 --- a/lisp/flow-fill.el +++ b/lisp/flow-fill.el @@ -56,6 +56,7 @@ (defcustom fill-flowed-display-column 'fill-column "Column beyond which format=flowed lines are wrapped, when displayed. This can be a Lisp expression or an integer." + :group 'mime-display :type '(choice (const :tag "Standard `fill-column'" fill-column) (const :tag "Fit Window" (- (window-width) 5)) (sexp) @@ -65,6 +66,7 @@ This can be a Lisp expression or an integer." "Column beyond which format=flowed lines are wrapped, in outgoing messages. This can be a Lisp expression or an integer. RFC 2646 suggests 66 characters for readability." + :group 'mime-display :type '(choice (const :tag "Standard fill-column" fill-column) (const :tag "RFC 2646 default (66)" 66) (sexp) diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el index e98f8fc18..abe618fb6 100644 --- a/lisp/gnus-art.el +++ b/lisp/gnus-art.el @@ -6648,6 +6648,9 @@ specified by `gnus-button-alist'." (defvar gnus-next-page-map (let ((map (make-sparse-keymap))) + (unless (>= emacs-major-version 21) + ;; XEmacs doesn't care. + (set-keymap-parent map gnus-article-mode-map)) (define-key map gnus-mouse-2 'gnus-button-next-page) (define-key map "\r" 'gnus-button-next-page) map)) diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el index ae421f80a..556bb40e3 100644 --- a/lisp/gnus-msg.el +++ b/lisp/gnus-msg.el @@ -1521,14 +1521,14 @@ The source file has to be in the Emacs load path." (while olist (if (boundp (car olist)) (ignore-errors - (gnus-pp - `(setq ,(car olist) - ,(if (or (consp (setq sym (symbol-value (car olist)))) - (and (symbolp sym) - (not (or (eq sym nil) - (eq sym t))))) - (list 'quote (symbol-value (car olist))) - (symbol-value (car olist)))))) + (gnus-pp + `(setq ,(car olist) + ,(if (or (consp (setq sym (symbol-value (car olist)))) + (and (symbolp sym) + (not (or (eq sym nil) + (eq sym t))))) + (list 'quote (symbol-value (car olist))) + (symbol-value (car olist)))))) (insert ";; (makeunbound '" (symbol-name (car olist)) ")\n")) (setq olist (cdr olist))) (insert "\n\n") diff --git a/lisp/gnus-salt.el b/lisp/gnus-salt.el index b0329d128..cd2aec850 100644 --- a/lisp/gnus-salt.el +++ b/lisp/gnus-salt.el @@ -230,7 +230,7 @@ This must be bound to a button-down mouse event." (let* ((echo-keystrokes 0) (start-posn (event-start start-event)) (start-point (posn-point start-posn)) - (start-line (1+ (count-lines 1 start-point))) + (start-line (1+ (count-lines (point-min) start-point))) (start-window (posn-window start-posn)) (bounds (gnus-window-edges start-window)) (top (nth 1 bounds)) @@ -266,17 +266,18 @@ This must be bound to a button-down mouse event." ;; Are we moving within the original window? ((and (eq (posn-window end) start-window) (integer-or-marker-p end-point)) - ;; Go to START-POINT first, so that when we move to END-POINT, + ;; Go to START-POINT first, so that when we move to END-POINT, ;; if it's in the middle of intangible text, ;; point jumps in the direction away from START-POINT. (goto-char start-point) (goto-char end-point) (gnus-pick-article) ;; In case the user moved his mouse really fast, pick - ;; articles on the line between this one and the last one. - (let* ((this-line (1+ (count-lines 1 end-point))) + ;; articles on the line between this one and the last one. + (let* ((this-line (1+ (count-lines (point-min) end-point))) (min-line (min this-line start-line)) (max-line (max this-line start-line))) + ;; Why not use `forward-line'? --Stef (while (< min-line max-line) (goto-line min-line) (gnus-pick-article) @@ -787,7 +788,7 @@ Two predefined functions are available: (setq beg (point)) (forward-char -1) ;; Draw "-" lines leftwards. - (while (and (> (point) 1) + (while (and (not (bobp)) (eq (char-after (1- (point))) ? )) (delete-char -1) (insert (car gnus-tree-parent-child-edges)) @@ -858,7 +859,8 @@ Two predefined functions are available: (gnus-extent-detached-p gnus-selected-tree-overlay)) ;; Create a new overlay. (gnus-overlay-put - (setq gnus-selected-tree-overlay (gnus-make-overlay 1 2)) + (setq gnus-selected-tree-overlay + (gnus-make-overlay (point-min) (1+ (point-min)))) 'face gnus-selected-tree-face)) ;; Move the overlay to the article. (gnus-move-overlay @@ -1062,5 +1064,5 @@ The following commands are available: (provide 'gnus-salt) -;;; arch-tag: 35449164-77b3-4398-bcbd-a2e3e998f810 +;; arch-tag: 35449164-77b3-4398-bcbd-a2e3e998f810 ;;; gnus-salt.el ends here diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el index fa49d19c1..1f95ec084 100644 --- a/lisp/gnus-sum.el +++ b/lisp/gnus-sum.el @@ -8443,7 +8443,7 @@ If BACKWARD, search backward instead." (let ((gnus-last-article gnus-last-article)) (if (gnus-summary-search-article regexp backward) (gnus-summary-show-thread) - (error "Search failed: \"%s\"" regexp)))) + (signal 'search-failed (list regexp))))) (defun gnus-summary-search-article-backward (regexp) "Search for an article containing REGEXP backward." diff --git a/lisp/gnus.el b/lisp/gnus.el index a41c5429c..54a162009 100644 --- a/lisp/gnus.el +++ b/lisp/gnus.el @@ -155,7 +155,7 @@ (defgroup gnus-summary-sort nil "Sorting the summary buffer." - :link '(custom-manual "(gnus)Summary Sorting") + :link '(custom-manual "(gnus)Sorting the Summary Buffer") :group 'gnus-summary) (defgroup gnus-summary-visual nil @@ -1589,6 +1589,7 @@ to be desirable; see the manual for further details." "Return GROUP's to-address." :variable-document "*Alist of group regexps and correspondent to-addresses." + :variable-group gnus-group-parameter :parameter-type '(gnus-email-address :tag "To Address") :parameter-document "\ This will be used when doing followups and posts. @@ -1615,6 +1616,7 @@ address was listed in gnus-group-split Addresses (see below).") "Return GROUP's to-list." :variable-document "*Alist of group regexps and correspondent to-lists." + :variable-group gnus-group-parameter :parameter-type '(gnus-email-address :tag "To List") :parameter-document "\ This address will be used when doing a `a' in the group. @@ -1633,6 +1635,7 @@ address was listed in gnus-group-split Addresses (see below).") "Return GROUP's subscription status." :variable-document "*Groups which are automatically considered subscribed." + :variable-group gnus-group-parameter :parameter-type '(const :tag "Subscribed" t) :parameter-document "\ Gnus assumed that you are subscribed to the To/List address. @@ -1739,6 +1742,7 @@ posting an article." "Return GROUP's initial input of the number of articles." :variable-document "*Alist of group regexps and its initial input of the number of articles." + :variable-group gnus-group-parameter :parameter-type '(choice :tag "Initial Input for Large Newsgroup" (const :tag "All" nil) (integer)) diff --git a/lisp/message.el b/lisp/message.el index 8d04e65b2..1752b9283 100644 --- a/lisp/message.el +++ b/lisp/message.el @@ -1592,7 +1592,7 @@ is used by default." (if (not header) nil (let ((regexp (format "[%s]+" (or separator ","))) - (beg 1) + (beg (point-min)) (first t) quoted elems paren) (with-temp-buffer @@ -3763,13 +3763,13 @@ not have PROP." "content-transfer-encoding"))))))) (message-insert-courtesy-copy)) (if (or (not message-send-mail-partially-limit) - (< (point-max) message-send-mail-partially-limit) + (< (buffer-size) message-send-mail-partially-limit) (not (message-y-or-n-p "The message size is too large, split? " t "\ The message size, " - (/ (point-max) 1000) "KB, is too large. + (/ (buffer-size) 1000) "KB, is too large. Some mail gateways (MTA's) bounce large messages. To avoid the problem, answer `y', and the message will be split into several @@ -3879,8 +3879,8 @@ to find out how to use this." (case (let ((coding-system-for-write message-send-coding-system)) (apply - 'call-process-region 1 (point-max) message-qmail-inject-program - nil nil nil + 'call-process-region (point-min) (point-max) + message-qmail-inject-program nil nil nil ;; qmail-inject's default behaviour is to look for addresses on the ;; command line; if there're none, it scans the headers. ;; yes, it does The Right Thing w.r.t. Resent-To and it's kin. diff --git a/lisp/mm-view.el b/lisp/mm-view.el index b25aa4906..f1ee340e8 100644 --- a/lisp/mm-view.el +++ b/lisp/mm-view.el @@ -1,6 +1,6 @@ ;;; mm-view.el --- functions for viewing MIME objects -;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, -;; 2004 Free Software Foundation, Inc. +;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004 +;; Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen ;; This file is part of GNU Emacs. diff --git a/lisp/mml-sec.el b/lisp/mml-sec.el index 7362731ed..b81073644 100644 --- a/lisp/mml-sec.el +++ b/lisp/mml-sec.el @@ -83,6 +83,7 @@ Note that the output generated by using a `combined' mode is NOT understood by all PGP implementations, in particular PGP version 2 does not support it! See Info node `(message)Security' for details." + :group 'message :type '(repeat (list (choice (const :tag "S/MIME" "smime") (const :tag "PGP" "pgp") (const :tag "PGP/MIME" "pgpmime") diff --git a/lisp/mml2015.el b/lisp/mml2015.el index 09c9a964c..9b118500b 100644 --- a/lisp/mml2015.el +++ b/lisp/mml2015.el @@ -87,6 +87,7 @@ Valid packages include `pgg', `gpg' and `mailcrypt'.") ("TRUST_FULLY" . t) ("TRUST_ULTIMATE" . t)) "Map GnuPG trust output values to a boolean saying if you trust the key." + :group 'mime-security :type '(repeat (cons (regexp :tag "GnuPG output regexp") (boolean :tag "Trust key")))) diff --git a/lisp/nnmail.el b/lisp/nnmail.el index d1fc35180..2cab38c12 100644 --- a/lisp/nnmail.el +++ b/lisp/nnmail.el @@ -1,5 +1,5 @@ ;;; nnmail.el --- mail support functions for the Gnus mail backends -;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +;; Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 ;; Free Software Foundation, Inc. ;; Author: Lars Magne Ingebrigtsen diff --git a/lisp/nntp.el b/lisp/nntp.el index 5a28986f7..3b4e7c1bd 100644 --- a/lisp/nntp.el +++ b/lisp/nntp.el @@ -35,6 +35,10 @@ (eval-when-compile (require 'cl)) +(defgroup nntp nil + "NNTP access for Gnus." + :group 'gnus) + (defvoo nntp-address nil "Address of the physical nntp server.") @@ -207,6 +211,7 @@ See `nnml-marks-is-evil' for more information.") (defcustom nntp-authinfo-file "~/.authinfo" ".netrc-like file that holds nntp authinfo passwords." + :group 'nntp :type '(choice file (repeat :tag "Entries" diff --git a/lisp/spam-stat.el b/lisp/spam-stat.el index 18aa68f3d..cba703f9a 100644 --- a/lisp/spam-stat.el +++ b/lisp/spam-stat.el @@ -383,7 +383,7 @@ Use `spam-stat-ngood', `spam-stat-nbad', `spam-stat-good', ;; Saving and Loading (defun spam-stat-save (&optional force) - "Save the `spam-stat' hash table as Lisp file. + "Save the `spam-stat' hash table as lisp file. With a prefix argument save unconditionally." (interactive "P") (when (or force spam-stat-dirty) -- 2.25.1