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

Merge from gnus--rel--5.10

Patches applied:

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

2004-10-29  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/gnus-msg.el (gnus-configure-posting-styles): Work with empty
   signature file.  Suggested by Manoj Srivastava
   <srivasta@golden-gryphon.com>.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 2c658a4c56243e7f9b7f602a57acc703fed052b9..0484057a4fb10d984210961e13cc38c4442820a7 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,5 +1,9 @@
 2004-10-29  Katsumi Yamaoka  <yamaoka@jpl.org>
 
+       * gnus-msg.el (gnus-configure-posting-styles): Work with empty
+       signature file.  Suggested by Manoj Srivastava
+       <srivasta@golden-gryphon.com>.
+
        * mm-util.el (mm-coding-system-priorities): Prefer iso-8859-1 than
        iso-2022-jp even in the Japanese language environment.  Suggested
        by Jason Rumney <jasonr@gnu.org>.

diff --git a/lisp/gnus/gnus-msg.el b/lisp/gnus/gnus-msg.el
index 7dcef4b813bd19e27e980717f6f3734fa20d2cc0..886aa80368fb2f7e7c8e85f07844420d1aa86f21 100644 (file)
--- a/lisp/gnus/gnus-msg.el
+++ b/lisp/gnus/gnus-msg.el
@@ -1871,8 +1871,9 @@ this is a reply."
              (setq v (with-temp-buffer
                        (insert-file-contents v)
                        (goto-char (point-max))
-                       (while (bolp)
-                         (delete-char -1))
+                       (skip-chars-backward "\n")
+                       (delete-region (+ (point) (if (bolp) 0 1))
+                                      (point-max))
                        (buffer-string))))
            (setq results (delq (assoc element results) results))
            (push (cons element v) results))))