* gnus-msg.el (gnus-posting-styles): Add x-face-file.

(gnus-configure-posting-styles): Use it.
(gnus-configure-posting-styles): Remove trailing newspaces.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index d57d069..636965c 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2002-02-06  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+       * gnus-msg.el (gnus-posting-styles): Add x-face-file.
+       (gnus-configure-posting-styles): Use it.
+       (gnus-configure-posting-styles): Remove trailing newspaces.
+
 2002-02-06  ShengHuo ZHU  <zsh@cs.rochester.edu>
        
        * gnus-sum.el (gnus-articles-to-read): Fetch all if the predicate

diff --git a/lisp/gnus-msg.el b/lisp/gnus-msg.el
index e5c9f31..eece155 100644 (file)
--- a/lisp/gnus-msg.el
+++ b/lisp/gnus-msg.el
@@ -127,6 +127,7 @@ See Info node `(gnus)Posting Styles'."
                                        (const signature-file)
                                        (const organization)
                                        (const address)
+                                       (const x-face-file)
                                        (const name)
                                        (const body)
                                        (symbol)
@@ -1642,13 +1643,20 @@ this is a reply."
                   ((listp value)
                    (eval value))))
            ;; Translate obsolescent value.
-           (when (eq element 'signature-file)
+           (cond
+            ((eq element 'signature-file)
              (setq element 'signature
                    filep t))
+            ((eq element 'x-face-file)
+             (setq element 'x-face
+                   filep t)))
            ;; Get the contents of file elems.
            (when (and filep v)
              (setq v (with-temp-buffer
                        (insert-file-contents v)
+                       (goto-char (point-max))
+                       (while (bolp)
+                         (delete-char -1))
                        (buffer-string))))
            (setq results (delq (assoc element results) results))
            (push (cons element v) results))))