From: Richard M. Stallman <rms@gnu.org>
Date: Sun, 12 Mar 1995 18:38:20 +0000 (+0000)
Subject: (dired-do-print): Allow lpr-switches to be a string.  Clean up.
X-Git-Tag: emacs-19.34~4876
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c572e732aeba7bf8530930996ea03a6261d845f5;p=emacs.git

(dired-do-print): Allow lpr-switches to be a string.  Clean up.
---

diff --git a/lisp/dired-aux.el b/lisp/dired-aux.el
index c3b8373e610..c537c2e458f 100644
--- a/lisp/dired-aux.el
+++ b/lisp/dired-aux.el
@@ -164,8 +164,12 @@ Uses the shell command coming from variables `lpr-command' and
   (let* ((file-list (dired-get-marked-files t arg))
 	 (command (dired-mark-read-string
 		   "Print %s with: "
- 		   (mapconcat 'concat (append (list lpr-command)
- 					      lpr-switches) " ")
+ 		   (mapconcat 'identity
+			      (cons lpr-command
+				    (if (stringp lpr-switches)
+					(list lpr-switches)
+				      lpr-switches))
+			      " ")
 		   'print arg file-list)))
     (dired-run-shell-command (dired-shell-stuff-it command file-list nil))))