aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatsumi Yamaoka2010-03-17 02:51:21 +0000
committerKatsumi Yamaoka2010-03-17 02:51:21 +0000
commit4a44ff5f138c8e6ef5cfbd97f7c11fca79e80dff (patch)
tree36ae46e3cba83ce475e3719aab555574b35e5757
parentae84eb977523ab4effaeb629bb1bbca783dd57ec (diff)
downloademacs-4a44ff5f138c8e6ef5cfbd97f7c11fca79e80dff.tar.gz
emacs-4a44ff5f138c8e6ef5cfbd97f7c11fca79e80dff.zip
(mml-read-tag): Unquote values with `read' to reverse prin1 in mml-insert-tag
(just stripping the quotes gave wrong value if any backslash escapes). From Kevin Ryde <user42@zip.com.au>.
-rw-r--r--lisp/gnus/ChangeLog6
-rw-r--r--lisp/gnus/mml.el4
2 files changed, 8 insertions, 2 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 02a8513643f..f71c7a4300b 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,9 @@
12010-03-17 Kevin Ryde <user42@zip.com.au>
2
3 * mml.el (mml-read-tag): Unquote values with `read' to reverse
4 prin1 in mml-insert-tag (just stripping the quotes gave wrong
5 value if any backslash escapes).
6
12010-03-15 Katsumi Yamaoka <yamaoka@jpl.org> 72010-03-15 Katsumi Yamaoka <yamaoka@jpl.org>
2 8
3 * mm-util.el (mm-charset-to-coding-system): Use coding-system-from-name 9 * mm-util.el (mm-charset-to-coding-system): Use coding-system-from-name
diff --git a/lisp/gnus/mml.el b/lisp/gnus/mml.el
index 091a0ed90bd..87fcdf5b09c 100644
--- a/lisp/gnus/mml.el
+++ b/lisp/gnus/mml.el
@@ -392,8 +392,8 @@ A message part needs to be split into %d charset parts. Really send? "
392 (skip-chars-forward "= \t\n") 392 (skip-chars-forward "= \t\n")
393 (setq val (buffer-substring-no-properties 393 (setq val (buffer-substring-no-properties
394 (point) (progn (forward-sexp 1) (point)))) 394 (point) (progn (forward-sexp 1) (point))))
395 (when (string-match "^\"\\(.*\\)\"$" val) 395 (when (string-match "\\`\"" val)
396 (setq val (match-string 1 val))) 396 (setq val (read val))) ;; inverse of prin1 in mml-insert-tag
397 (push (cons (intern elem) val) contents) 397 (push (cons (intern elem) val) contents)
398 (skip-chars-forward " \t\n")) 398 (skip-chars-forward " \t\n"))
399 (goto-char (match-end 0)) 399 (goto-char (match-end 0))