* 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.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 076b285..c56540b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,11 @@
+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.

diff --git a/lisp/gnus-util.el b/lisp/gnus-util.el
index 3126135..58c6633 100644 (file)
--- a/lisp/gnus-util.el
+++ b/lisp/gnus-util.el
@@ -1238,22 +1238,12 @@ SPEC is a predicate specifier that contains stuff like `or', `and',
    (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))
-  (gnus-completing-read-maybe-default
+  (completing-read
    (if (symbol-value history)
        (concat prompt " (" (car (symbol-value history)) "): ")
      (concat prompt ": "))

diff --git a/lisp/mm-view.el b/lisp/mm-view.el
index f6e4a66..a33448b 100644 (file)
--- a/lisp/mm-view.el
+++ b/lisp/mm-view.el
@@ -566,8 +566,6 @@ this keymap, add them to `w3m-minor-mode-map' instead of this keymap.")))
   (sit-for 1)
   t)
 
-(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))
@@ -578,7 +576,7 @@ this keymap, add them to `w3m-minor-mode-map' instead of this keymap.")))
    (if (= (length smime-keys) 1)
        (cadar smime-keys)
      (smime-get-key-by-email
-      (gnus-completing-read-maybe-default
+      (completing-read
        (concat "Decipher using which key? "
               (if smime-keys (concat "(default " (caar smime-keys) ") ")
                 ""))