summaryrefslogtreecommitdiff
path: root/doc/emacs
diff options
context:
space:
mode:
Diffstat (limited to 'doc/emacs')
-rw-r--r--doc/emacs/basic.texi15
-rw-r--r--doc/emacs/dired.texi11
-rw-r--r--doc/emacs/search.texi9
3 files changed, 24 insertions, 11 deletions
diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi
index cde7b475d95..2e03d0c04a3 100644
--- a/doc/emacs/basic.texi
+++ b/doc/emacs/basic.texi
@@ -464,13 +464,14 @@ Normally, this command undoes the last change, moving point back to
where it was before the change. The undo command applies only to
changes in the buffer; you can't use it to undo cursor motion.
- On a graphics terminal (including text-mode frames displayed by a
-terminal emulator, such as @command{xterm}), the easiest way to invoke
-@code{undo} is with @kbd{C-/}; that doesn't need the Shift key. On a
-text terminal, @kbd{C-/} does not exist, but in many cases you can type
-@kbd{C-_} without the Shift key (in effect pressing @kbd{C--}) and it
-will work anyway, at least with keyboards that produce the US ASCII
-character set.
+ On a terminal that supports the @key{Control} modifier on all other
+keys, the easiest way to invoke @code{undo} is with @kbd{C-/}, since
+that doesn't need the @key{Shift} modifier. On terminals which allow
+only the ASCII control characters, @kbd{C-/} does not exist, but for
+many of them @kbd{C-/} still works because it actually sends @kbd{C-_}
+to Emacs, while many others allow you to omit the @key{Shift} modifier
+when you type @kbd{C-_} (in effect pressing @kbd{C--}), making that
+the most convenient way to invoke @code{undo}.
Although each editing command usually makes a separate entry in the
undo records, very simple commands may be grouped together.
diff --git a/doc/emacs/dired.texi b/doc/emacs/dired.texi
index 24fd02aac1a..fdc4703e86f 100644
--- a/doc/emacs/dired.texi
+++ b/doc/emacs/dired.texi
@@ -129,6 +129,17 @@ options (that is, single characters) requiring no arguments, and long
options (starting with @samp{--}) whose arguments are specified with
@samp{=}.
+@vindex dired-switches-in-mode-line
+ Dired displays in the mode line an indication of what were the
+switches used to invoke @command{ls}. By default, Dired will try to
+determine whether the switches indicate sorting by name or date, and
+will say so in the mode line. If the @code{dired-switches-in-mode-line}
+variable is @code{as-is}, the switches will be shown verbatim. If
+this variable's value is an integer, the switch display will be
+truncated to that length. This variable can also be a function, which
+will be called with @code{dired-actual-switches} as the only
+parameter, and should return a string to display in the mode line.
+
@vindex dired-use-ls-dired
If your @command{ls} program supports the @samp{--dired} option,
Dired automatically passes it that option; this causes @command{ls} to
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi
index d44d7bee2ac..d982a9e8787 100644
--- a/doc/emacs/search.texi
+++ b/doc/emacs/search.texi
@@ -1984,10 +1984,11 @@ the @code{search-highlight-submatches} variable. If this variable's
value is @code{nil}, no special highlighting is done, but if the value
is non-@code{nil}, text that matches @samp{\( @dots{} \)} constructs
(a.k.a.@: ``subexpressions'') in the regular expression will be
-highlighted with distinct faces, named @code{isearch-group-@var{n}}.
-For instance, when searching for @samp{foo-\([0-9]+\)}, the part
-matched by @samp{[0-9]+} will be highlighted with the
-@code{isearch-group-1} face.
+highlighted with distinct faces, named @code{isearch-group-odd}
+for the odd group matches, and @code{isearch-group-even}
+for the even group matches. For instance, when searching for
+@samp{foo-\([0-9]+\)}, the part matched by @samp{[0-9]+} will be
+highlighted with the @code{isearch-group-odd} face.
@cindex lazy highlighting customizations
@vindex isearch-lazy-highlight