projects
/
gnus
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update copyright for several files.
[gnus]
/
lisp
/
mm-view.el
diff --git
a/lisp/mm-view.el
b/lisp/mm-view.el
index
0c036f6
..
9de2f94
100644
(file)
--- a/
lisp/mm-view.el
+++ b/
lisp/mm-view.el
@@
-1,5
+1,5
@@
;;; mm-view.el --- functions for viewing MIME objects
;;; mm-view.el --- functions for viewing MIME objects
-;; Copyright (C) 1998, 1999, 2000, 2001, 2002 Free Software Foundation, Inc.
+;; Copyright (C) 1998, 1999, 2000, 2001, 2002
, 2003
Free Software Foundation, Inc.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; This file is part of GNU Emacs.
;; Author: Lars Magne Ingebrigtsen <larsi@gnus.org>
;; This file is part of GNU Emacs.
@@
-327,7
+327,7
@@
map.")))
(if entry
(setq func (cdr entry)))
(cond
(if entry
(setq func (cdr entry)))
(cond
- ((
gnus-
functionp func)
+ ((functionp func)
(funcall func handle))
(t
(apply (car func) handle (cdr func))))))
(funcall func handle))
(t
(apply (car func) handle (cdr func))))))
@@
-558,8
+558,10
@@
map.")))
(sit-for 1)
t)
(sit-for 1)
t)
+(autoload 'gnus-completing-read-maybe-default "gnus-util" nil nil 'macro)
+
(defun mm-view-pkcs7-decrypt (handle)
(defun mm-view-pkcs7-decrypt (handle)
- (insert-buffer (mm-handle-buffer handle))
+ (insert-buffer
-substring
(mm-handle-buffer handle))
(goto-char (point-min))
(insert "MIME-Version: 1.0\n")
(mm-insert-headers "application/pkcs7-mime" "base64" "smime.p7m")
(goto-char (point-min))
(insert "MIME-Version: 1.0\n")
(mm-insert-headers "application/pkcs7-mime" "base64" "smime.p7m")
@@
-568,7
+570,7
@@
map.")))
(if (= (length smime-keys) 1)
(cadar smime-keys)
(smime-get-key-by-email
(if (= (length smime-keys) 1)
(cadar smime-keys)
(smime-get-key-by-email
- (
completing-read
+ (
gnus-completing-read-maybe-default
(concat "Decipher using which key? "
(if smime-keys (concat "(default " (caar smime-keys) ") ")
""))
(concat "Decipher using which key? "
(if smime-keys (concat "(default " (caar smime-keys) ") ")
""))