Synch to No Gnus 200409101504.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2bc5798..5b9d011 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,39 @@
+2004-09-10  Miles Bader  <miles@gnu.ai.mit.edu>
+
+       * 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  <Reiner.Steib@gmx.de>
+
+       * 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  <monnier@iro.umontreal.ca>
+
+       * 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  <jas@extundo.com>
 
        * 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  <kgreiner@compsol.cc>
+
        * gnus-agent.el (directory-files-and-attributes): Optionally
        defined to support XEmacs.
 
 2004-09-09  Kevin Greiner  <kgreiner@compsol.cc>
+
        * 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 e8f0b98..06c68c4 100644 (file)
--- 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 95b1ade..5cb93b1 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -7184,6 +7184,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 0d0822a..7d59621 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -1774,14 +1774,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)))
     ;; Remove any control chars - they seem to cause trouble for some

diff --git a/lisp/gnus-salt.el b/lisp/gnus-salt.el
index 739d073..96ccbc3 100644 (file)
--- 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))
@@ -277,6 +277,7 @@ This must be bound to a button-down mouse event."
             (let* ((this-line (1+ (count-lines 1 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

diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 1fe6090..f4bb199 100644 (file)
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -8452,7 +8452,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 f3d6044..ec84bce 100644 (file)
--- a/lisp/gnus.el
+++ b/lisp/gnus.el
@@ -160,7 +160,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
@@ -1627,6 +1627,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.
@@ -1653,6 +1654,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.
@@ -1671,6 +1673,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.
@@ -1777,6 +1780,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 6759e4e..3fa139b 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -1817,7 +1817,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
@@ -4344,8 +4344,8 @@ to find out how to use this."
   (case
       (as-binary-process
        (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 0957969..62acf57 100644 (file)
--- 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 <larsi@gnus.org>
 ;; This file is part of GNU Emacs.

diff --git a/lisp/mml-sec.el b/lisp/mml-sec.el
index be4665b..b159c92 100644 (file)
--- 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 96ca14a..599ca72 100644 (file)
--- 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 58cbc4e..fb6d166 100644 (file)
--- 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 <larsi@gnus.org>

diff --git a/lisp/nntp.el b/lisp/nntp.el
index e30bd02..bdaa7b6 100644 (file)
--- a/lisp/nntp.el
+++ b/lisp/nntp.el
@@ -36,6 +36,10 @@
 
 (nnoo-declare nntp)
 
+(defgroup nntp nil
+  "NNTP access for Gnus."
+  :group 'gnus)
+
 (defvoo nntp-address nil
   "Address of the physical nntp server.")
 
@@ -236,6 +240,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 0038731..b0c3535 100644 (file)
--- 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)