(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 c3b8373e6107986cc4b0f3d9b58e06fd1332c5f8..c537c2e458fab00cb8f8700074ca6973273e8b82 100644 (file)
--- 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))))