Merge from emacs-24; up to 2014-06-06T02:22:40Z!monnier@iro.umontreal.ca

[gnu-emacs] / doc / emacs / dired-xtra.texi

diff --git a/doc/emacs/dired-xtra.texi b/doc/emacs/dired-xtra.texi
index 2827ff3cdea40445de73fd28f517c1f39e810c8a..f8719e84de07d9652784218577dea22e5f7156a4 100644 (file)
--- a/doc/emacs/dired-xtra.texi
+++ b/doc/emacs/dired-xtra.texi
@@ -1,5 +1,5 @@
 @c This is part of the Emacs manual.
 @c This is part of the Emacs manual.

-@c Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
+@c Copyright (C) 2004-2014 Free Software Foundation, Inc.

 @c See file emacs.texi for copying conditions.
 @c
 @c This file is included either in emacs-xtra.texi (when producing the
 @c See file emacs.texi for copying conditions.
 @c
 @c This file is included either in emacs-xtra.texi (when producing the


@@ -7,43 +7,44 @@
 @node Subdir Switches
 @section Subdirectory Switches in Dired
 
 @node Subdir Switches
 @section Subdirectory Switches in Dired
 

-You can insert subdirectories with specified @code{ls} switches in
-Dired buffers, using @kbd{C-u i}.  You can change the @code{ls}
-switches of an already inserted subdirectory using @kbd{C-u l}.
+You can insert subdirectories with specified @command{ls} switches in
+Dired buffers using @kbd{C-u i}.  You can change the @command{ls}
+switches of an already inserted subdirectory at point using @kbd{C-u l}.

 
 

-In Emacs versions 22.1 and later, Dired remembers the switches, so
-that reverting the buffer will not change them back to the main
-directory's switches.  Deleting a subdirectory forgets about its
-switches.
+Dired preserves the switches if you revert the buffer.  Deleting a
+subdirectory forgets about its switches.

 
 

-Using @code{dired-undo} (usually bound to @kbd{C-_} and @kbd{C-x u})
-to reinsert or delete subdirectories, that were inserted with explicit
-switches, can bypass Dired's machinery for remembering (or forgetting)
-switches.  Deleting a subdirectory using @code{dired-undo} does not
-forget its switches.  When later reinserted using @kbd{i}, it will be
-reinserted using its old switches.  Using @code{dired-undo} to
-reinsert a subdirectory that was deleted using the regular
-Dired commands (not @code{dired-undo}) will originally insert it with
-its old switches.  However, reverting the buffer will relist it using
-the buffer's default switches.  If any of this yields problems, you
-can easily correct the situation using @kbd{C-u i} or @kbd{C-u l}.
+Using @code{dired-undo}
+@iftex
+(@pxref{Marks vs Flags,,, emacs, the Emacs Manual})
+@end iftex
+@ifnottex
+(@pxref{Marks vs Flags})
+@end ifnottex
+to reinsert or delete
+subdirectories that were inserted with explicit switches can bypass
+Dired's machinery for remembering (or forgetting) switches.  Deleting
+a subdirectory using @code{dired-undo} does not forget its switches.
+When later reinserted using @kbd{i}, it will be reinserted using its
+old switches.  Using @code{dired-undo} to reinsert a subdirectory that
+was deleted using the regular Dired commands (not @code{dired-undo})
+will originally insert it with its old switches.  Reverting the
+buffer, however, will relist it using the buffer's default switches.
+If any of this yields problems, you can easily correct the situation
+using @kbd{C-u i} or @kbd{C-u l}.

 
 Dired does not remember the @code{R} switch.  Inserting a subdirectory
 
 Dired does not remember the @code{R} switch.  Inserting a subdirectory

-with switches that include the @code{R} switch is equivalent with
+with switches that include the @code{R} switch is equivalent to

 inserting each of its subdirectories using all remaining switches.
 For instance, updating or killing a subdirectory that was inserted
 with the @code{R} switch will not update or kill its subdirectories.
 
 The buffer's default switches do not affect subdirectories that were
 inserted using explicitly specified switches.  In particular,
 inserting each of its subdirectories using all remaining switches.
 For instance, updating or killing a subdirectory that was inserted
 with the @code{R} switch will not update or kill its subdirectories.
 
 The buffer's default switches do not affect subdirectories that were
 inserted using explicitly specified switches.  In particular,

-commands such as @kbd{s}, that change the buffer's switches do not
-affect such subdirectories.  (They do affect subdirectories without
-explicitly assigned switches, however.)
+commands such as @kbd{s} that change the buffer's switches do not
+affect such subdirectories.  (They do, however, affect subdirectories
+without explicitly assigned switches.)

 
 You can make Dired forget about all subdirectory switches and relist
 all subdirectories with the buffer's default switches using
 @kbd{M-x dired-reset-subdir-switches}.  This also reverts the Dired buffer.
 
 You can make Dired forget about all subdirectory switches and relist
 all subdirectories with the buffer's default switches using
 @kbd{M-x dired-reset-subdir-switches}.  This also reverts the Dired buffer.

-
-@ignore
-   arch-tag: e3865701-9179-4ffb-bc34-d321111c688d
-@end ignore