summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1995-03-12 18:38:20 +0000
committerRichard M. Stallman <rms@gnu.org>1995-03-12 18:38:20 +0000
commitc572e732aeba7bf8530930996ea03a6261d845f5 (patch)
tree9b9df8e36ecb2947a2149dc823aa6ab12b3cafc0 /lisp
parent9e983c78164531768e55aee496b36ac73f1901a8 (diff)
downloademacs-c572e732aeba7bf8530930996ea03a6261d845f5.tar.gz
(dired-do-print): Allow lpr-switches to be a string. Clean up.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/dired-aux.el8
1 files changed, 6 insertions, 2 deletions
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))))