From df093b990a47e572c852a6025e129b25eef6200b Mon Sep 17 00:00:00 2001 From: yamaoka Date: Sun, 22 Dec 2002 11:25:01 +0000 Subject: [PATCH] Synch with Oort Gnus. --- lisp/ChangeLog | 6 ++++++ lisp/mm-decode.el | 4 ++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 4b20657..b37fc19 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2002-12-21 Kai Gro,A_(Bjohann + + * mm-decode.el (mm-mailcap-command): Do not backslash-quote + special chars if the mailcap file uses single quotes around %s. + From Laurent Martelli . + 2002-12-19 Paul Jarc * gnus-int.el (gnus-request-update-info): nnchoke-r-u-i might not diff --git a/lisp/mm-decode.el b/lisp/mm-decode.el index cb5890c..617686f 100644 --- a/lisp/mm-decode.el +++ b/lisp/mm-decode.el @@ -778,7 +778,7 @@ external if displayed external." (beg 0) (uses-stdin t) out sub total) - (while (string-match "%{\\([^}]+\\)}\\|%s\\|%t\\|%%" method beg) + (while (string-match "%{\\([^}]+\\)}\\|'%s'\\|%s\\|%t\\|%%" method beg) (push (substring method beg (match-beginning 0)) out) (setq beg (match-end 0) total (match-string 0 method) @@ -786,7 +786,7 @@ external if displayed external." (cond ((string= total "%%") (push "%" out)) - ((string= total "%s") + ((or (string= total "%s") (string= total "'%s'")) (setq uses-stdin nil) (push (mm-quote-arg (gnus-map-function mm-path-name-rewrite-functions file)) out)) -- 1.7.10.4