[Emacs-diffs] /srv/bzr/emacs/trunk r104994: * dired.el (dired-mode): Clarify "unmark or unflag".

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 104994
fixes bug(s): http://debbugs.gnu.org/8770
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Wed 2011-07-06 19:10:36 +0200
message:
  * dired.el (dired-mode): Clarify "unmark or unflag".
  (dired-unmark-backward): Ditto.
  (dired-flag-backup-files): Ditto.
  
  * dired-x.el (dired-mark-sexp): Ditto.
modified:
  lisp/ChangeLog
  lisp/dired-x.el
  lisp/dired.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-06 16:48:37 +0000
+++ b/lisp/ChangeLog    2011-07-06 17:10:36 +0000
@@ -1,3 +1,11 @@
+2011-07-06  Lars Magne Ingebrigtsen  <address@hidden>
+
+       * dired.el (dired-mode): Clarify "unmark or unflag" (bug#8770).
+       (dired-unmark-backward): Ditto.
+       (dired-flag-backup-files): Ditto.
+
+       * dired-x.el (dired-mark-sexp): Ditto.
+
 2011-07-06  Richard Stallman  <address@hidden>
 
        * mail/rmailmm.el: Give entity a new slot, TRUNCATED.

=== modified file 'lisp/dired-x.el'
--- a/lisp/dired-x.el   2011-06-18 20:17:30 +0000
+++ b/lisp/dired-x.el   2011-07-06 17:10:36 +0000
@@ -1406,7 +1406,7 @@
 
 (defun dired-mark-sexp (predicate &optional unflag-p)
   "Mark files for which PREDICATE returns non-nil.
-With a prefix arg, unflag those files instead.
+With a prefix arg, unmark or unflag those files instead.
 
 PREDICATE is a lisp expression that can refer to the following symbols:
 

=== modified file 'lisp/dired.el'
--- a/lisp/dired.el     2011-07-05 10:24:56 +0000
+++ b/lisp/dired.el     2011-07-06 17:10:36 +0000
@@ -1812,7 +1812,7 @@
   Mark-using commands display a list of failures afterwards.  Type 
\\[dired-summary]
   to see why something went wrong.
 Type \\[dired-unmark] to Unmark a file or all files of an inserted 
subdirectory.
-Type \\[dired-unmark-backward] to back up one line and unflag.
+Type \\[dired-unmark-backward] to back up one line and unmark or unflag.
 Type \\[dired-do-flagged-delete] to delete (eXecute) the files flagged `D'.
 Type \\[dired-find-file] to Find the current line's file
   (or dired it in another buffer, if it is a directory).
@@ -3028,8 +3028,9 @@
     (dired-mark arg)))
 
 (defun dired-unmark-backward (arg)
-  "In Dired, move up lines and remove deletion flag there.
-Optional prefix ARG says how many lines to unflag; default is one line."
+  "In Dired, move up lines and remove marks or deletion flags there.
+Optional prefix ARG says how many lines to unmark/unflag; default
+is one line."
   (interactive "p")
   (dired-unmark (- arg)))
 
@@ -3123,14 +3124,14 @@
 
 (defun dired-mark-symlinks (unflag-p)
   "Mark all symbolic links.
-With prefix argument, unflag all those files."
+With prefix argument, unmark or unflag all those files."
   (interactive "P")
   (let ((dired-marker-char (if unflag-p ?\040 dired-marker-char)))
     (dired-mark-if (looking-at dired-re-sym) "symbolic link")))
 
 (defun dired-mark-directories (unflag-p)
   "Mark all directory file lines except `.' and `..'.
-With prefix argument, unflag all those files."
+With prefix argument, unmark or unflag all those files."
   (interactive "P")
   (let ((dired-marker-char (if unflag-p ?\040 dired-marker-char)))
     (dired-mark-if (and (looking-at dired-re-dir)
@@ -3139,7 +3140,7 @@
 
 (defun dired-mark-executables (unflag-p)
   "Mark all executable files.
-With prefix argument, unflag all those files."
+With prefix argument, unmark or unflag all those files."
   (interactive "P")
   (let ((dired-marker-char (if unflag-p ?\040 dired-marker-char)))
     (dired-mark-if (looking-at dired-re-exe) "executable file")))
@@ -3149,7 +3150,7 @@
 
 (defun dired-flag-auto-save-files (&optional unflag-p)
   "Flag for deletion files whose names suggest they are auto save files.
-A prefix argument says to unflag those files instead."
+A prefix argument says to unmark or unflag those files instead."
   (interactive "P")
   (let ((dired-marker-char (if unflag-p ?\040 dired-del-marker)))
     (dired-mark-if
@@ -3189,7 +3190,7 @@
 
 (defun dired-flag-backup-files (&optional unflag-p)
   "Flag all backup files (names ending with `~') for deletion.
-With prefix argument, unflag these files."
+With prefix argument, unmark or unflag these files."
   (interactive "P")
   (let ((dired-marker-char (if unflag-p ?\s dired-del-marker)))
     (dired-mark-if