Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-48

Merge from emacs--cvs-trunk--0

Patches applied:

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-581
   Fix exec-shield autoconf test

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-582
 - miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-584
   Update from CVS

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-585
   Merge from gnus--rel--5.10

 * miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-586
   Update from CVS

 * miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-38
   Update from CVS

6 files changed, 73 insertions, 17 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 187fc607c27..0ed8630d850 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,16 @@
+2004-09-29  Luc Teirlinck  <teirllm@auburn.edu>
+
+        * textmodes/paragraphs.el (forward-paragraph): Avoid
+        args-out-of-range error when point winds up at the beginning of
+        the buffer and hard newlines are enabled.
+
+        * newcomment.el (comment-multi-line): Doc fix.
+
+2004-09-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * diff-mode.el (diff-file-header-re): Tighten up regexp a tiny bit.
+        (diff-fixup-modifs): Catch unified-diff file-headers.
+
 2004-09-28  Stefan  <monnier@iro.umontreal.ca>
 
         * dired.el (dired-view-command-alist): Use more efficient regexps.
@@ -35,8 +48,8 @@
         (pr-version): New version number (6.8.1).
         (pr-ps-file-using-ghostscript): Use make-temp-file instead of
         make-temp-name.
-        (pr-delete-file): Check if file exists before deleting it.  Reported by
-        Lennart Borgman <lennart.borgman.073@student.lu.se>.
+        (pr-delete-file): Check if file exists before deleting it.
+        Reported by Lennart Borgman <lennart.borgman.073@student.lu.se>.
 
 2004-09-26  Stefan  <monnier@iro.umontreal.ca>
 
@@ -48,21 +61,19 @@
 2004-09-26  Dan Nicolaescu  <dann@ics.uci.edu>
 
         * term.el (term-ansi-at-eval-string, term-ansi-default-fg)
-        (term-ansi-default-bg, term-ansi-current-temp): Delete unused
-        vars.
+        (term-ansi-default-bg, term-ansi-current-temp): Delete unused vars.
         (map): Bind S-prior, S-next and S-insert.
         (term-mode): Set `indent-tabs-mode' to nil.
         (term-paste): New function to be bound to S-insert.
         (term-send-del, term-send-backspace): Change the strings sent.
         (term-termcap-format): Synchronyze with etc/e/eterm.ti.
         (term-handle-colors-array): Fix handling of underline and reverse.
-        (term-handle-ansi-escape): Do not handle smcup/rmcup. Add
-        comments.
+        (term-handle-ansi-escape): Do not handle smcup/rmcup.  Add comments.
         (term-erase-in-line): Fix comparison.
-        (term-emulate-terminal): Fix line wrap handling.
-        (term-start-output-log): Renamed from `term-set-output-log'.
-        (term-stop-output-log): Renamed from `term-stop-photo'.
-        (term-switch-to-alternate-sub-buffer): Comment out, unused.
+        (term-emulate-terminal): Fix line wrap handling.
+        (term-start-output-log): Rename from `term-set-output-log'.
+        (term-stop-output-log): Rename from `term-stop-photo'.
+        (term-switch-to-alternate-sub-buffer): Comment out, unused.
 
 2004-09-25  Stefan  <monnier@iro.umontreal.ca>
 
diff --git a/lisp/diff-mode.el b/lisp/diff-mode.el
index 21b1c6446e5..0a7f1a1950a 100644
--- a/lisp/diff-mode.el
+++ b/lisp/diff-mode.el
@@ -301,7 +301,7 @@ when editing big diffs)."
 ;;;;
 
 (defconst diff-hunk-header-re "^\\(@@ -[0-9,]+ \\+[0-9,]+ @@.*\\|\\*\\{15\\}.*\n\\*\\*\\* .+ \\*\\*\\*\\*\\|[0-9]+\\(,[0-9]+\\)?[acd][0-9]+\\(,[0-9]+\\)?\\)$")
-(defconst diff-file-header-re (concat "^\\(--- .+\n\\+\\+\\+\\|\\*\\*\\* .+\n---\\|[^-+!<>0-9@* ]\\).+\n" (substring diff-hunk-header-re 1)))
+(defconst diff-file-header-re (concat "^\\(--- .+\n\\+\\+\\+ \\|\\*\\*\\* .+\n--- \\|[^-+!<>0-9@* ]\\).+\n" (substring diff-hunk-header-re 1)))
 (defvar diff-narrowed-to nil)
 
 (defun diff-end-of-hunk (&optional style)
@@ -798,9 +798,12 @@ else cover the whole bufer."
       (goto-char end) (diff-end-of-hunk)
       (let ((plus 0) (minus 0) (space 0) (bang 0))
         (while (and (= (forward-line -1) 0) (<= start (point)))
-          (if (not (looking-at "\\(@@ -[0-9,]+ \\+[0-9,]+ @@.*\\|[-*][-*][-*] .+ [-*][-*][-*][-*]\\)$"))
+          (if (not (looking-at
+                    (concat "@@ -[0-9,]+ \\+[0-9,]+ @@"
+                            "\\|[-*][-*][-*] [0-9,]+ [-*][-*][-*][-*]$"
+                            "\\|--- .+\n\\+\\+\\+ ")))
               (case (char-after)
-                (?\  (incf space))
+                (?\s (incf space))
                 (?+ (incf plus))
                 (?- (incf minus))
                 (?! (incf bang))
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 3cdda661e86..6ac6d46e28f 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2004-09-29  Jesper Harder  <harder@ifa.au.dk>
+
+        * gnus.el (gnus-method-to-server): Oops, move it don't delete it.
+
 2004-09-28  Jesper Harder  <harder@ifa.au.dk>
 
         * gnus-picon.el: Require cl.
diff --git a/lisp/gnus/gnus.el b/lisp/gnus/gnus.el
index 28ef2c22a15..979ee2a7c24 100644
--- a/lisp/gnus/gnus.el
+++ b/lisp/gnus/gnus.el
@@ -3261,6 +3261,38 @@ that that variable is buffer-local to the summary buffers."
                                    (nth 1 method))))
       method)))
 
+(defsubst gnus-method-to-server (method)
+  (catch 'server-name
+    (setq method (or method gnus-select-method))
+
+    ;; Perhaps it is already in the cache.
+    (mapc (lambda (name-method)
+            (if (equal (cdr name-method) method)
+                (throw 'server-name (car name-method))))
+          gnus-server-method-cache)
+
+    (mapc
+     (lambda (server-alist)
+       (mapc (lambda (name-method)
+               (when (gnus-methods-equal-p (cdr name-method) method)
+                 (unless (member name-method gnus-server-method-cache)
+                   (push name-method gnus-server-method-cache))
+                 (throw 'server-name (car name-method))))
+             server-alist))
+     (let ((alists (list gnus-server-alist
+                         gnus-predefined-server-alist)))
+       (if gnus-select-method
+           (push (list (cons "native" gnus-select-method)) alists))
+       alists))
+
+    (let* ((name (if (member (cadr method) '(nil ""))
+                     (format "%s" (car method))
+                   (format "%s:%s" (car method) (cadr method))))
+           (name-method (cons name method)))
+      (unless (member name-method gnus-server-method-cache)
+        (push name-method gnus-server-method-cache))
+      name)))
+
 (defsubst gnus-server-to-method (server)
   "Map virtual server names to select methods."
   (or (and server (listp server) server)
diff --git a/lisp/newcomment.el b/lisp/newcomment.el
index 3a63636b757..120777ab704 100644
--- a/lisp/newcomment.el
+++ b/lisp/newcomment.el
@@ -215,8 +215,13 @@ makes the comment easier to read.  Default is 1.  nil means 0."
 
 ;;;###autoload
 (defcustom comment-multi-line nil
-  "*Non-nil means \\[comment-indent-new-line] continues comments, with no new terminator or starter.
-This is obsolete because you might as well use \\[newline-and-indent]."
+  "*Non-nil means `comment-indent-new-line' continues comments.
+That is, it inserts no new terminator or starter.
+This affects `auto-fill-mode', which is the main reason to
+customize this variable.
+
+It also affects \\[indent-new-comment-line].  However, if you want this
+behavior for explicit filling, you might as well use \\[newline-and-indent]."
   :type 'boolean)
 
 (defcustom comment-empty-lines nil
diff --git a/lisp/textmodes/paragraphs.el b/lisp/textmodes/paragraphs.el
index e5f38971e40..868dcb2d107 100644
--- a/lisp/textmodes/paragraphs.el
+++ b/lisp/textmodes/paragraphs.el
@@ -274,8 +274,9 @@ Returns the count of paragraphs left to move."
                                    (not (looking-at parsep)))
                             (not (and (looking-at parstart)
                                       (or (not use-hard-newlines)
-                                          (get-text-property (1- start) 'hard)
-                                          (bobp)))))
+                                          (bobp)
+                                          (get-text-property
+                                           (1- start) 'hard)))))
                   (setq found-start nil)
                   (goto-char start))
                 found-start)