From bd066f82903ac055109882189646d39c2a75e044 Mon Sep 17 00:00:00 2001
From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Fri, 12 Feb 2016 18:24:30 +1100
Subject: Revert the gnus-replace-in-string change, fix arguments, reapply

---
 lisp/gnus/mailcap.el | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'lisp/gnus/mailcap.el')

diff --git a/lisp/gnus/mailcap.el b/lisp/gnus/mailcap.el
index a82768fed04..609a8f4d64b 100644
--- a/lisp/gnus/mailcap.el
+++ b/lisp/gnus/mailcap.el
@@ -1028,11 +1028,12 @@ If FORCE, re-parse even if already parsed."
 			      (replace-regexp-in-string
 			       ;; Replace mailcap's `%s' placeholder
 			       ;; with dired's `?' placeholder
+			       "%s" "?"
 			       (replace-regexp-in-string
 				;; Remove the final filename placeholder
-				command "[ \t\n]*\\('\\)?%s\\1?[ \t\n]*\\'" ""
-				nil t)
-			       "%s" "?" nil t))))
+				"[ \t\n]*\\('\\)?%s\\1?[ \t\n]*\\'" ""
+				command nil t)
+			       nil t))))
 			     common-mime-info)))))
     commands))
 
-- 
cgit v1.2.3