[Emacs-diffs] /srv/bzr/emacs/trunk r105765: * lisp/dired-aux.el (dired-do-chmod): Don't provide initial input.

[Chong Yidong]

------------------------------------------------------------
revno: 105765
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Wed 2011-09-14 11:06:28 -0400
message:
  * lisp/dired-aux.el (dired-do-chmod): Don't provide initial input.
modified:
  lisp/ChangeLog
  lisp/dired-aux.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-09-14 09:17:30 +0000
+++ b/lisp/ChangeLog    2011-09-14 15:06:28 +0000
@@ -1,3 +1,7 @@
+2011-09-14  Chong Yidong  <address@hidden>
+
+       * dired-aux.el (dired-do-chmod): Don't provide initial input.
+
 2011-09-14  Martin Rudalics  <address@hidden>
 
        * window.el (display-buffer-window): Remove.

=== modified file 'lisp/dired-aux.el'
--- a/lisp/dired-aux.el 2011-09-12 20:45:56 +0000
+++ b/lisp/dired-aux.el 2011-09-14 15:06:28 +0000
@@ -285,11 +285,8 @@
                         (match-string 3 modestr)))))
         (modes (dired-mark-read-string
                 "Change mode of %s to: "
-                ;; Insert initial input if there's only one file.
-                (unless (cadr files) default)
-                'chmod arg files default))
+                nil 'chmod arg files default))
         num-modes)
-
     (cond ((equal modes "")
           ;; We used to treat empty input as DEFAULT, but that is not
           ;; such a good idea (Bug#9361).
@@ -388,7 +385,7 @@
     (dired-run-shell-command (dired-shell-stuff-it command file-list nil))))
 
 (defun dired-mark-read-string (prompt initial op-symbol arg files
-                              &optional standard-value)
+                              &optional default-value)
   "Read args for a Dired marked-files command, prompting with PROMPT.
 Return the user input (a string).
 
@@ -397,14 +394,14 @@
 ARG is normally the prefix argument for the calling command.
 FILES should be a list of file names.
 
-STANDARD-VALUE, if non-nil, should be a \"standard\" value or
-list of such values, available via history commands.  Note that
-if the user enters empty input, this function returns the empty
-string, not STANDARD-VALUE."
+DEFAULT-VALUE, if non-nil, should be a \"standard\" value or list
+of such values, available via history commands.  Note that if the
+user enters empty input, this function returns the empty string,
+not DEFAULT-VALUE."
   (dired-mark-pop-up nil op-symbol files
                     'read-from-minibuffer
                     (format prompt (dired-mark-prompt arg files))
-                    initial nil nil nil standard-value))
+                    initial nil nil nil default-value))
 
 ;;; Cleaning a directory: flagging some backups for deletion.