(utf-7-encode): Use the right escape char depending on imap/nonimap encoding.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index fda00d685d4450b436128d52cb5e935e90b29026..8339022aac476a8fe7412ea2fbd9c0ecca8de95b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-29  Espen Wiborg  <espen.wiborg@telio.no>  (tiny change)
+
+       * international/utf-7.el (utf-7-encode): Use the right escape char
+       depending on imap/nonimap encoding.
+
 2008-05-29  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * minibuffer.el (completion-pcm-all-completions): Add the base-size.

diff --git a/lisp/international/utf-7.el b/lisp/international/utf-7.el
index 9bc58b121ecda01b4108cf3d65fb1e7ca6dc5d8f..e6f9d4f4c05e33dee208eeeba1556f5959123d07 100644 (file)
--- a/lisp/international/utf-7.el
+++ b/lisp/international/utf-7.el
@@ -92,7 +92,7 @@ ESC and SKIP-CHARS are adjusted for the normal and IMAP versions."
     (goto-char (point-min))
     (while (not (eobp))
       (skip-chars-forward skip-chars)
-      (if (eq ?+ (char-after))
+      (if (eq esc (char-after))
          (progn (forward-char)
                 (insert ?-))
        (unless (eobp)