From: Miles Bader <miles@gnu.org>
Date: Tue, 9 Nov 2004 04:38:27 +0000 (+0000)
Subject: Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-679
X-Git-Tag: ttn-vms-21-2-B4~4082
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5f49be3fae17d1e1d5890e3629ef9d3da11865ef;p=emacs.git

Revision: miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-679

Merge from gnus--rel--5.10

Patches applied:

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

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

2004-11-07  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-msg.el (gnus-configure-posting-styles): Don't cause the
   "Args out of range" error.  Reported by Arnaud Giersch
   <arnaud.giersch@free.fr>.
---

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index d7ebedc53f8..2dbe85b2aac 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
+2004-11-07  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+	* gnus-msg.el (gnus-configure-posting-styles): Don't cause the
+	"Args out of range" error.  Reported by Arnaud Giersch
+	<arnaud.giersch@free.fr>.
+
 2004-11-04  Richard M. Stallman  <rms@gnu.org>
 
 	* spam.el (spam group): Add :version.
diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 6b093480940..7948efc2572 100644
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1871,11 +1871,13 @@ this is a reply."
 	    (when (and filep v)
 	      (setq v (with-temp-buffer
 			(insert-file-contents v)
-			(goto-char (point-max))
-			(skip-chars-backward "\n")
-			(delete-region (+ (point) (if (bolp) 0 1))
-				       (point-max))
-			(buffer-string))))
+			(buffer-substring
+			 (point-min)
+			 (progn
+			   (goto-char (point-max))
+			   (if (zerop (skip-chars-backward "\n"))
+			       (point)
+			     (1+ (point))))))))
 	    (setq results (delq (assoc element results) results))
 	    (push (cons element v) results))))
       ;; Now we have all the styles, so we insert them.