Synch to No Gnus 200504180045.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 37111d6..91664b3 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * qp.el (quoted-printable-encode-region): Save excursion.
+

 2005-04-14  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * message.el (message-kill-buffer-query-if-modified): new variable
 2005-04-14  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * message.el (message-kill-buffer-query-if-modified): new variable

diff --git a/lisp/qp.el b/lisp/qp.el
index 6a8839d..e458dc2 100644 (file)
--- a/lisp/qp.el
+++ b/lisp/qp.el
@@ -1,6 +1,7 @@
 ;;; qp.el --- Quoted-Printable functions
 
 ;;; qp.el --- Quoted-Printable functions
 

-;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005
+;;        Free Software Foundation, Inc.

 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: mail, extensions
 
 ;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
 ;; Keywords: mail, extensions

@@ -100,15 +101,15 @@ You should probably avoid non-ASCII characters in this arg.
 If `mm-use-ultra-safe-encoding' is set, fold lines unconditionally and
 encode lines starting with \"From\"."
   (interactive "r")
 If `mm-use-ultra-safe-encoding' is set, fold lines unconditionally and
 encode lines starting with \"From\"."
   (interactive "r")

-  (goto-char from)
-  (if (re-search-forward (mm-string-to-multibyte "[^\x0-\x7f\x80-\xff]")
-                        to t)
-      (error "Multibyte character in QP encoding region"))

   (unless class
     ;; Avoid using 8bit characters. = is \075.
     ;; Equivalent to "^\000-\007\013\015-\037\200-\377="
     (setq class "\010-\012\014\040-\074\076-\177"))
   (save-excursion
   (unless class
     ;; Avoid using 8bit characters. = is \075.
     ;; Equivalent to "^\000-\007\013\015-\037\200-\377="
     (setq class "\010-\012\014\040-\074\076-\177"))
   (save-excursion

+    (goto-char from)
+    (if (re-search-forward (mm-string-to-multibyte "[^\x0-\x7f\x80-\xff]")
+                          to t)
+       (error "Multibyte character in QP encoding region"))

     (save-restriction
       (narrow-to-region from to)
       ;; Encode all the non-ascii and control characters.
     (save-restriction
       (narrow-to-region from to)
       ;; Encode all the non-ascii and control characters.