Sync up with gnus-6_10.

[elisp/gnus.git-] / lisp / nnmail.el

diff --git a/lisp/nnmail.el b/lisp/nnmail.el
index a6b2f2e..04478b0 100644 (file)
--- a/lisp/nnmail.el
+++ b/lisp/nnmail.el
@@ -740,9 +740,8 @@ If this variable is `t', do not use password cache.")
                      (delete-region (point-min) (match-end 0)))
                    (unless (yes-or-no-p
                             (format "movemail: %s (%d return).  Continue? "
-                                    (buffer-substring
-                                     (point-min) (point-max)) result))
-                     (error "%s" (buffer-substring (point-min) (point-max))))
+                                    (buffer-string)))
+                            (error "%s" (buffer-string)))
                    (setq tofile nil)))
                ))))
        (nnmail-set-password inbox nnmail-internal-password)
@@ -1802,10 +1801,9 @@ If ARGS, PROMPT is used as an argument to `format'."
        ;; Narrow to the status.
        (narrow-to-region
         (point)
-        (progn
-          (while (and (zerop (forward-line 1))
-                      (memq (char-after) '(?\t ?\ ))))
-          (point)))
+        (if (re-search-forward "^[^ \t]" nil t)
+            (1- (point))
+          (point-max)))
        ;; Go through all elements and add them to the list.
        (goto-char (point-min))
        (while (re-search-forward "[^ \t=]+" nil t)