(message-check-news-body-syntax): Avoid mm-string-as-multibyte.

(message-hide-headers): Don't assume (point-min)==1.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index d14f01db614748b648690cc941c583d3e5c1dca4..b6d03bcf2185ea799d295c056daafb1823c11a33 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,8 @@
+2007-10-29  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * message.el (message-check-news-body-syntax): Avoid mm-string-as-multibyte.
+       (message-hide-headers): Don't assume (point-min)==1.
+
 2007-10-28  Reiner Steib  <Reiner.Steib@gmx.de>
 
        * gnus.el: Bump version to Gnus v5.13.

diff --git a/lisp/gnus/message.el b/lisp/gnus/message.el
index de8e0754036e8c9f1dca2c78e8587dee2b64979a..d14528ffe113eaf763b9828cf7251d394882c7bb 100644 (file)
--- a/lisp/gnus/message.el
+++ b/lisp/gnus/message.el
@@ -2877,6 +2877,8 @@ M-RET    `message-newline-and-reformat' (break the line and reformat)."
   ;; solution would be not to use `define-derived-mode', and run
   ;; `text-mode-hook' ourself at the end of the mode.
   ;; -- Per Abrahamsen <abraham@dina.kvl.dk> Date: 2001-10-19.
+  ;; This kludge is unneeded in Emacs>=21 since define-derived-mode is
+  ;; now careful to run parent hooks after the body.  --Stef
   (when auto-fill-function
     (setq auto-fill-function normal-auto-fill-function)))
 
@@ -4952,7 +4954,7 @@ Otherwise, generate and save a value for `canlock-password' first."
    ;; Check for control characters.
    (message-check 'control-chars
      (if (re-search-forward
-         (mm-string-as-multibyte "[\000-\007\013\015-\032\034-\037\200-\237]")
+         (mm-string-to-multibyte "[\000-\007\013\015-\032\034-\037\200-\237]")
          nil t)
         (y-or-n-p
          "The article contains control characters.  Really post? ")
@@ -7672,7 +7674,7 @@ From headers in the original article."
                   message-hidden-headers))
        (inhibit-point-motion-hooks t)
        (after-change-functions nil)
-       (end-of-headers 0))
+       (end-of-headers (point-min)))
     (when regexps
       (save-excursion
        (save-restriction
@@ -7687,11 +7689,11 @@ From headers in the original article."
                (setq header (buffer-substring begin (point))
                      header-len (- (point) begin))
                (delete-region begin (point))
-               (goto-char (1+ end-of-headers))
+               (goto-char end-of-headers)
                (insert header)
                (setq end-of-headers
                      (+ end-of-headers header-len))))))))
-    (narrow-to-region (1+ end-of-headers) (point-max))))
+    (narrow-to-region end-of-headers (point-max))))
 
 (defun message-hide-header-p (regexps)
   (let ((result nil)