Synch to No Gnus 200504130641.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a138054..bbdbba5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2005-04-13  Katsumi Yamaoka  <yamaoka@jpl.org>
+
+       * lpath.el: Fbind display-time-event-handler; don't fbind
+       string-to-multibyte.
+
+       * qp.el (quoted-printable-encode-region): Use mm-string-to-multibyte.
+
 2005-04-12  Katsumi Yamaoka  <yamaoka@jpl.org>
 
        * nnrss.el (nnrss-node-text): Replace CRLFs (which might be

diff --git a/lisp/lpath.el b/lisp/lpath.el
index ef64cbf..db11ae0 100644 (file)
--- a/lisp/lpath.el
+++ b/lisp/lpath.el
@@ -10,16 +10,17 @@
   (mapcar (lambda (var) (unless (boundp var) (set var nil))) args))
 
 (maybe-fbind '(Info-directory
-              Info-menu create-image
-              display-graphic-p find-coding-system find-image image-size
-              image-type-available-p insert-image make-mode-line-mouse-map
-              make-temp-file propertize put-image replace-regexp-in-string
-              rmail-msg-is-pruned rmail-msg-restore-non-pruned-header
-              sort-coding-systems string-to-multibyte tool-bar-add-item
-              tool-bar-add-item-from-menu tool-bar-local-item-from-menu
-              url-generic-parse-url url-http-file-exists-p
-              url-insert-file-contents vcard-pretty-print w32-focus-frame
-              w3m-detect-meta-charset w3m-region x-focus-frame))
+              Info-menu create-image display-graphic-p
+              display-time-event-handler find-coding-system find-image
+              image-size image-type-available-p insert-image
+              make-mode-line-mouse-map make-temp-file propertize put-image
+              replace-regexp-in-string rmail-msg-is-pruned
+              rmail-msg-restore-non-pruned-header sort-coding-systems
+              tool-bar-add-item tool-bar-add-item-from-menu
+              tool-bar-local-item-from-menu url-generic-parse-url
+              url-http-file-exists-p url-insert-file-contents
+              vcard-pretty-print w32-focus-frame w3m-detect-meta-charset
+              w3m-region x-focus-frame))
 (maybe-bind '(eudc-protocol
              filladapt-mode mc-pgp-always-sign
              rmail-insert-mime-forwarded-message-function url-current-object

diff --git a/lisp/qp.el b/lisp/qp.el
index f87ec66..6a8839d 100644 (file)
--- a/lisp/qp.el
+++ b/lisp/qp.el
@@ -100,15 +100,10 @@ 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")
-  (save-excursion
-    (goto-char from)
-    (if (fboundp 'string-to-multibyte) ; Emacs 22
-       (if (re-search-forward (string-to-multibyte "[^\x0-\x7f\x80-\xff]")
-                              to t)
-           ;; Fixme: This is somewhat misleading.
-           (error "Multibyte character in QP encoding region"))
-      (if (re-search-forward (mm-string-as-multibyte "[^\0-\377]") to t)
-         (error "Multibyte character in QP encoding region"))))
+  (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="