From: yamaoka <yamaoka>
Date: Mon, 8 Nov 2004 00:03:28 +0000 (+0000)
Subject: Synch to No Gnus 200411072356.
X-Git-Tag: t-gnus-6_17_4-quimby-~683
X-Git-Url: http://git.chise.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=433c50e183006fa9fcb833f72263d169844545ec;p=elisp%2Fgnus.git-

Synch to No Gnus 200411072356.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 7b17b4a..c8c05ad 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+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-07  Jesper Harder  <harder@ifa.au.dk>
+
+	* gnus-sum.el (gnus-summary-clear-local-variables): Use symbolp.
+	From Stefan Wiens <s.wi@gmx.net>.
+
 2004-11-04  Richard M. Stallman  <rms@gnu.org>
 
 	* spam.el (spam group): Add :version.
diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index 6904bb4..50c625c 100644
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -2165,10 +2165,12 @@ 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))))))))
       (if (eq element 'import)
 	  (progn
 	    (if (member v stack)
diff --git a/lisp/gnus-sum.el b/lisp/gnus-sum.el
index 58d612c..9872347 100644
--- a/lisp/gnus-sum.el
+++ b/lisp/gnus-sum.el
@@ -2791,9 +2791,9 @@ The following commands are available:
   (let ((locals gnus-summary-local-variables))
     (while locals
       (if (consp (car locals))
-	  (and (vectorp (caar locals))
+	  (and (symbolp (caar locals))
 	       (set (caar locals) nil))
-	(and (vectorp (car locals))
+	(and (symbolp (car locals))
 	     (set (car locals) nil)))
       (setq locals (cdr locals)))))