aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKatsumi Yamaoka2010-05-07 07:28:15 +0000
committerKatsumi Yamaoka2010-05-07 07:28:15 +0000
commit9581ba4d12ac893530bd13e3480e25a411f273cc (patch)
tree617751a9a96bae3af36536287c77cfe48401e190
parent765d43190e16d6093aa794743b9f92f40566bb15 (diff)
downloademacs-9581ba4d12ac893530bd13e3480e25a411f273cc.tar.gz
emacs-9581ba4d12ac893530bd13e3480e25a411f273cc.zip
Synch with Gnus trunk.
Note: Julien has already sent a form to FSF to sign a paper. 2010-05-07 Julien Danjou <julien@danjou.info> * gnus-art.el (gnus-mime-pipe-part): Add optional argument `cmd'; pass it to mm-pipe-part. * mm-decode.el (mm-pipe-part): Add optional argument `cmd'; use it if it is given.
-rw-r--r--lisp/gnus/ChangeLog8
-rw-r--r--lisp/gnus/gnus-art.el7
-rw-r--r--lisp/gnus/mm-decode.el13
3 files changed, 19 insertions, 9 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog
index 5516a8c81c8..330fb457089 100644
--- a/lisp/gnus/ChangeLog
+++ b/lisp/gnus/ChangeLog
@@ -1,3 +1,11 @@
12010-05-07 Julien Danjou <julien@danjou.info>
2
3 * gnus-art.el (gnus-mime-pipe-part): Add optional argument `cmd'; pass
4 it to mm-pipe-part.
5
6 * mm-decode.el (mm-pipe-part): Add optional argument `cmd'; use it if
7 it is given.
8
12010-05-07 Katsumi Yamaoka <yamaoka@jpl.org> 92010-05-07 Katsumi Yamaoka <yamaoka@jpl.org>
2 10
3 * nnweb.el (nnweb-gmane-search) 11 * nnweb.el (nnweb-gmane-search)
diff --git a/lisp/gnus/gnus-art.el b/lisp/gnus/gnus-art.el
index 7ce3a4374d1..5f899b3067a 100644
--- a/lisp/gnus/gnus-art.el
+++ b/lisp/gnus/gnus-art.el
@@ -5041,13 +5041,14 @@ Deleting parts may malfunction or destroy the article; continue? "))
5041 (when data 5041 (when data
5042 (mm-save-part data)))) 5042 (mm-save-part data))))
5043 5043
5044(defun gnus-mime-pipe-part () 5044(defun gnus-mime-pipe-part (&optional cmd)
5045 "Pipe the MIME part under point to a process." 5045 "Pipe the MIME part under point to a process.
5046Use CMD as the process."
5046 (interactive) 5047 (interactive)
5047 (gnus-article-check-buffer) 5048 (gnus-article-check-buffer)
5048 (let ((data (get-text-property (point) 'gnus-data))) 5049 (let ((data (get-text-property (point) 'gnus-data)))
5049 (when data 5050 (when data
5050 (mm-pipe-part data)))) 5051 (mm-pipe-part data cmd))))
5051 5052
5052(defun gnus-mime-view-part () 5053(defun gnus-mime-view-part ()
5053 "Interactively choose a viewing method for the MIME part under point." 5054 "Interactively choose a viewing method for the MIME part under point."
diff --git a/lisp/gnus/mm-decode.el b/lisp/gnus/mm-decode.el
index 171afac31ff..410b4f045d7 100644
--- a/lisp/gnus/mm-decode.el
+++ b/lisp/gnus/mm-decode.el
@@ -1301,12 +1301,13 @@ text/\\(\\sw+\\)\\(?:\;\\s-*charset=\\(.+\\)\\)?[\"'][^>]*>" nil t)
1301 (mm-write-region (point-min) (point-max) file nil nil nil 'binary t) 1301 (mm-write-region (point-min) (point-max) file nil nil nil 'binary t)
1302 (set-default-file-modes current-file-modes))))) 1302 (set-default-file-modes current-file-modes)))))
1303 1303
1304(defun mm-pipe-part (handle) 1304(defun mm-pipe-part (handle &optional cmd)
1305 "Pipe HANDLE to a process." 1305 "Pipe HANDLE to a process.
1306 (let* ((name (mail-content-type-get (mm-handle-type handle) 'name)) 1306Use CMD as the process."
1307 (command 1307 (let ((name (mail-content-type-get (mm-handle-type handle) 'name))
1308 (gnus-read-shell-command 1308 (command (or cmd
1309 "Shell command on MIME part: " mm-last-shell-command))) 1309 (gnus-read-shell-command
1310 "Shell command on MIME part: " mm-last-shell-command))))
1310 (mm-with-unibyte-buffer 1311 (mm-with-unibyte-buffer
1311 (mm-insert-part handle) 1312 (mm-insert-part handle)
1312 (mm-add-meta-html-tag handle) 1313 (mm-add-meta-html-tag handle)