(gnus-read-string): Remove.

(gnus-summary-pipe-to-muttprint): Replace gnus-read-string with
read-string.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b2d4573..be6fce2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-06  Jesper Harder  <harder@ifa.au.dk>
+
+       * gnus-art.el (gnus-read-string): Remove.
+       (gnus-summary-pipe-to-muttprint): Replace gnus-read-string with
+       read-string.
+
 2004-01-05  Teodor Zlatanov  <tzz@lifelogs.com>
 
        * netrc.el: autoload password-read

diff --git a/lisp/gnus-art.el b/lisp/gnus-art.el
index 3fbb865..14e3f1a 100644 (file)
--- a/lisp/gnus-art.el
+++ b/lisp/gnus-art.el
@@ -3303,17 +3303,9 @@ The directory to save in defaults to `gnus-article-save-directory'."
       (shell-command-on-region (point-min) (point-max) command nil)))
   (setq gnus-last-shell-command command))
 
-(defmacro gnus-read-string (prompt &optional initial-contents history
-                           default-value)
-  "Like `read-string' but allow for older XEmacsen that don't have the 5th arg."
-  (if (and (featurep 'xemacs)
-          (< emacs-minor-version 2))
-      `(read-string ,prompt ,initial-contents ,history)
-    `(read-string ,prompt ,initial-contents ,history ,default-value)))
-
 (defun gnus-summary-pipe-to-muttprint (&optional command)
   "Pipe this article to muttprint."
-  (setq command (gnus-read-string
+  (setq command (read-string
                 "Print using command: " gnus-summary-muttprint-program
                 nil gnus-summary-muttprint-program))
   (gnus-summary-save-in-pipe command))