gnus-completing-read-maybe-default with completing-read.
* gnus-util.el (gnus-completing-read): do.
(gnus-completing-read-maybe-default): Remove.
+2004-01-06 Jesper Harder <harder@ifa.au.dk>
+
+ * mm-view.el (mm-view-pkcs7-decrypt): Replace
+ gnus-completing-read-maybe-default with completing-read.
+
+ * gnus-util.el (gnus-completing-read): do.
+ (gnus-completing-read-maybe-default): Remove.
+
2004-01-06 Steve Youngs <sryoungs@bigpond.net.au>
* password.el: Only autoload `run-at-time' if not XEmacs.
2004-01-06 Steve Youngs <sryoungs@bigpond.net.au>
* password.el: Only autoload `run-at-time' if not XEmacs.
(t
(list 'local-map map))))
(t
(list 'local-map map))))
-(defmacro gnus-completing-read-maybe-default (prompt table &optional predicate
- require-match initial-contents
- history default)
- "Like `completing-read', allowing for non-existent 7th arg in older XEmacsen."
- `(completing-read ,prompt ,table ,predicate ,require-match
- ,initial-contents ,history
- ,@(if (and (featurep 'xemacs) (< emacs-minor-version 2))
- ()
- (list default))))
-
(defun gnus-completing-read (prompt table &optional predicate require-match
history)
(when (and history
(not (boundp history)))
(set history nil))
(defun gnus-completing-read (prompt table &optional predicate require-match
history)
(when (and history
(not (boundp history)))
(set history nil))
- (gnus-completing-read-maybe-default
(if (symbol-value history)
(concat prompt " (" (car (symbol-value history)) "): ")
(concat prompt ": "))
(if (symbol-value history)
(concat prompt " (" (car (symbol-value history)) "): ")
(concat prompt ": "))
-(autoload 'gnus-completing-read-maybe-default "gnus-util" nil nil 'macro)
-
(defun mm-view-pkcs7-decrypt (handle)
(insert-buffer-substring (mm-handle-buffer handle))
(goto-char (point-min))
(defun mm-view-pkcs7-decrypt (handle)
(insert-buffer-substring (mm-handle-buffer handle))
(goto-char (point-min))
(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
- (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) ") ")
""))