Sync

with `t-gnus-6_14'.

diff --git a/ChangeLog b/ChangeLog
index bb09399..afdbc44 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2000-06-06  Katsumi Yamaoka <yamaoka@jpl.org>
+
+       * lisp/gnus-vers.el (gnus-revision-number): Increment to 03.
+
+       * lisp/message.el (message-fix-before-sending): Don't check for
+       invisible X-Face fields if
+       `message-check-ignore-invisible-x-face-field' is non-nil.
+       (message-send): Call `message-fix-before-sending' before encoding.
+       (message-check-ignore-invisible-x-face-field): New user option.
+
 2000-06-01  KANEMATSU Daiji <kanematu@sra.co.jp>
 
        * texi/gnus-ja.texi (gnus-summary-hide-all-threads): Fix typo.
@@ -30,7 +40,7 @@
 
 2000-05-25  Tanaka Akira      <akr@m17n.org>
 
-        * README.semi, README.semi.ja: Update for CVS via SSH.
+       * README.semi, README.semi.ja: Update for CVS via SSH.
 
 2000-05-25  Katsumi Yamaoka <yamaoka@jpl.org>
 

diff --git a/lisp/gnus-vers.el b/lisp/gnus-vers.el
index 9d32cdd..d88ade0 100644 (file)
--- a/lisp/gnus-vers.el
+++ b/lisp/gnus-vers.el
@@ -31,7 +31,7 @@
 (require 'product)
 (provide 'gnus-vers)
 
-(defconst gnus-revision-number "02"
+(defconst gnus-revision-number "03"
   "Revision number for this version of gnus.")
 
 ;; Product information of this gnus.

diff --git a/lisp/message.el b/lisp/message.el
index 98eeae0..01e477d 100644 (file)
--- a/lisp/message.el
+++ b/lisp/message.el
@@ -205,6 +205,11 @@ shorten-followup-to existing-newsgroups buffer-file-name unchanged
 newsgroups."
   :group 'message-news)
 
+(defcustom message-check-ignore-invisible-x-face-field t
+  "Non-nil means don't check for invisible X-Face fields before sending."
+  :type 'boolean
+  :group 'message-sending)
+
 (defcustom message-required-news-headers
   '(From Newsgroups Subject Date Message-ID
         (optional . Organization) Lines
@@ -2630,6 +2635,7 @@ It should typically alter the sending method in some way or other."
     (undo-boundary)
     (let ((inhibit-read-only t))
       (put-text-property (point-min) (point-max) 'read-only nil))
+    (message-fix-before-sending)
     (run-hooks 'message-send-hook)
     (message "Sending...")
     (let ((message-encoding-buffer
@@ -2644,7 +2650,6 @@ It should typically alter the sending method in some way or other."
        (erase-buffer)
        (insert-buffer message-edit-buffer)
        (funcall message-encode-function)
-       (message-fix-before-sending)
        (while (and success
                    (setq elem (pop alist)))
          (when (or (not (funcall (cadr elem)))
@@ -2698,7 +2703,22 @@ It should typically alter the sending method in some way or other."
   (goto-char (point-max))
   (unless (bolp)
     (insert "\n"))
-  ;; Delete all invisible text.
+  ;; Expose all invisible X-Face fields.
+  (when message-check-ignore-invisible-x-face-field
+    (message-narrow-to-headers)
+    (let ((inhibit-point-motion-hooks t)
+         (case-fold-search t))
+      (while (not (eobp))
+       (if (looking-at "X-Face:")
+           (put-text-property (point)
+                              (progn
+                                (while (progn (forward-line 1)
+                                              (looking-at "[\t ]")))
+                                (point))
+                              'invisible nil)
+         (forward-line 1))))
+    (widen))
+  ;; Expose all invisible text.
   (message-check 'invisible-text
     (when (text-property-any (point-min) (point-max) 'invisible t)
       (put-text-property (point-min) (point-max) 'invisible nil)