Revision: miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-268

Merge from gnus--rel--5.10

Patches applied:

 * gnus--rel--5.10  (patch 66)

   - Update from CVS

2005-04-18  Katsumi Yamaoka  <yamaoka@jpl.org>

   * lisp/gnus/qp.el (quoted-printable-encode-region): Save excursion.

diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 2ec1e0bc62e5b4d785b1000280f4d1842070c0ad..f08f21fadb76116e9ad20d0db2820b74d3be190a 100644 (file)
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,7 @@
+2005-04-18  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * qp.el (quoted-printable-encode-region): Save excursion.
+
 2005-04-13  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * gnus-art.el (gnus-mime-inline-part): Use mm-string-to-multibyte.

diff --git a/lisp/gnus/qp.el b/lisp/gnus/qp.el
index 3789e0efda8c34502567a92c99328d5ec7c6ed6d..1004abeb02b0cb4dd312a431161567dca0d4a780 100644 (file)
--- a/lisp/gnus/qp.el
+++ b/lisp/gnus/qp.el
@@ -1,6 +1,7 @@
 ;;; 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
@@ -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")
-  (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
+    (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.