Mercurial > emacs
diff lisp/gnus/rfc2047.el @ 72632:d69718b12697
Merge from gnus--rel--5.10
Patches applied:
* gnus--rel--5.10 (patch 129-130)
- Merge from emacs--devo--0
- Update from CVS
2006-09-04 Daiki Ueno <ueno@unixuser.org>
* lisp/pgg-gpg.el (pgg-gpg-process-region): Revert two patches from Satyaki
Das. http://article.gmane.org/gmane.emacs.gnus.general/49947
http://article.gmane.org/gmane.emacs.gnus.general/50457
2006-09-04 Katsumi Yamaoka <yamaoka@jpl.org>
* lisp/gnus/rfc2047.el (rfc2047-strip-backslashes-in-quoted-strings): Decode `\\'
in quoted string into `\'.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-421
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Mon, 04 Sep 2006 06:27:27 +0000 |
| parents | de654a6735da |
| children | 709ee6c1e02a c358d0861b16 |
line wrap: on
line diff
--- a/lisp/gnus/rfc2047.el Sun Sep 03 22:51:22 2006 +0000 +++ b/lisp/gnus/rfc2047.el Mon Sep 04 06:27:27 2006 +0000 @@ -859,7 +859,7 @@ them.") (defun rfc2047-strip-backslashes-in-quoted-strings () - "Strip backslashes in quoted strings. `\\\"' and `\\\\' remain." + "Strip backslashes in quoted strings. `\\\"' remains." (goto-char (point-min)) (let (beg) (with-syntax-table (standard-syntax-table) @@ -874,7 +874,7 @@ (narrow-to-region beg (1- (point))) (goto-char beg) (while (search-forward "\\" nil 'move) - (unless (memq (char-after) '(?\" ?\\)) + (unless (memq (char-after) '(?\")) (delete-backward-char 1)) (forward-char))) (forward-char))