aboutsummaryrefslogtreecommitdiffstats
path: root/doc
diff options
context:
space:
mode:
authorGlenn Morris2013-10-23 13:20:09 -0400
committerGlenn Morris2013-10-23 13:20:09 -0400
commit76f1a3c3143b61dd58c02a3bd2eb533802646679 (patch)
treed7f68bdff0336c45c976ca5dae661d9a37027b65 /doc
parentbc4aaa31e2538c6992f9408f0190460eef79b655 (diff)
downloademacs-76f1a3c3143b61dd58c02a3bd2eb533802646679.tar.gz
emacs-76f1a3c3143b61dd58c02a3bd2eb533802646679.zip
Remove remaining @refills from doc/*/*.texi files
Diffstat (limited to 'doc')
-rw-r--r--doc/emacs/ChangeLog3
-rw-r--r--doc/emacs/files.texi2
-rw-r--r--doc/emacs/glossary.texi2
-rw-r--r--doc/emacs/killing.texi2
-rw-r--r--doc/emacs/search.texi12
-rw-r--r--doc/emacs/sending.texi2
-rw-r--r--doc/lispref/ChangeLog6
-rw-r--r--doc/lispref/eval.texi2
-rw-r--r--doc/lispref/files.texi6
-rw-r--r--doc/lispref/intro.texi2
-rw-r--r--doc/lispref/objects.texi2
-rw-r--r--doc/lispref/searching.texi18
-rw-r--r--doc/misc/ChangeLog4
-rw-r--r--doc/misc/dired-x.texi3
-rw-r--r--doc/misc/ebrowse.texi16
-rw-r--r--doc/misc/ede.texi85
-rw-r--r--doc/misc/eieio.texi1
-rw-r--r--doc/misc/eshell.texi12
-rw-r--r--doc/misc/pcl-cvs.texi88
-rw-r--r--doc/misc/sc.texi106
-rw-r--r--doc/misc/srecode.texi3
-rw-r--r--doc/misc/vip.texi51
-rw-r--r--doc/misc/viper.texi74
-rw-r--r--doc/misc/widget.texi5
24 files changed, 212 insertions, 295 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index eb82535031f..cdb1ac845c9 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,8 @@
12013-10-23 Glenn Morris <rgm@gnu.org> 12013-10-23 Glenn Morris <rgm@gnu.org>
2 2
3 * files.texi, glossary.texi, killing.texi, search.texi, sending.texi:
4 Nuke @refill.
5
3 * Makefile.in (install-dvi, install-html, install-pdf) 6 * Makefile.in (install-dvi, install-html, install-pdf)
4 (install-ps, uninstall-dvi, uninstall-html, uninstall-ps) 7 (install-ps, uninstall-dvi, uninstall-html, uninstall-ps)
5 (uninstall-pdf): Quote entities that might contain whitespace. 8 (uninstall-pdf): Quote entities that might contain whitespace.
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 1ebe4caa290..4117248cbe4 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -1089,7 +1089,7 @@ of data with the command @kbd{M-x recover-file @key{RET} @var{file}
1089restores the contents from its auto-save file @file{#@var{file}#}. 1089restores the contents from its auto-save file @file{#@var{file}#}.
1090You can then save with @kbd{C-x C-s} to put the recovered text into 1090You can then save with @kbd{C-x C-s} to put the recovered text into
1091@var{file} itself. For example, to recover file @file{foo.c} from its 1091@var{file} itself. For example, to recover file @file{foo.c} from its
1092auto-save file @file{#foo.c#}, do:@refill 1092auto-save file @file{#foo.c#}, do:
1093 1093
1094@example 1094@example
1095M-x recover-file @key{RET} foo.c @key{RET} 1095M-x recover-file @key{RET} foo.c @key{RET}
diff --git a/doc/emacs/glossary.texi b/doc/emacs/glossary.texi
index e4693a5293f..c8b4b40416f 100644
--- a/doc/emacs/glossary.texi
+++ b/doc/emacs/glossary.texi
@@ -256,7 +256,7 @@ abbreviation for a name into the entire name. Completion is done for
256minibuffer (q.v.@:) arguments when the set of possible valid inputs 256minibuffer (q.v.@:) arguments when the set of possible valid inputs
257is known; for example, on command names, buffer names, and 257is known; for example, on command names, buffer names, and
258file names. Completion usually occurs when @key{TAB}, @key{SPC} or 258file names. Completion usually occurs when @key{TAB}, @key{SPC} or
259@key{RET} is typed. @xref{Completion}.@refill 259@key{RET} is typed. @xref{Completion}.
260 260
261@anchor{Glossary---Continuation Line} 261@anchor{Glossary---Continuation Line}
262@item Continuation Line 262@item Continuation Line
diff --git a/doc/emacs/killing.texi b/doc/emacs/killing.texi
index cb33327faa1..30b3a2c5ff0 100644
--- a/doc/emacs/killing.texi
+++ b/doc/emacs/killing.texi
@@ -423,7 +423,7 @@ ring. But you can force it to append by first typing the command
423tells the following command, if it is a kill command, to append the text 423tells the following command, if it is a kill command, to append the text
424it kills to the last killed text, instead of starting a new entry. With 424it kills to the last killed text, instead of starting a new entry. With
425@kbd{C-M-w}, you can kill several separated pieces of text and 425@kbd{C-M-w}, you can kill several separated pieces of text and
426accumulate them to be yanked back in one place.@refill 426accumulate them to be yanked back in one place.
427 427
428 A kill command following @kbd{M-w} (@code{kill-ring-save}) does not 428 A kill command following @kbd{M-w} (@code{kill-ring-save}) does not
429append to the text that @kbd{M-w} copied into the kill ring. 429append to the text that @kbd{M-w} copied into the kill ring.
diff --git a/doc/emacs/search.texi b/doc/emacs/search.texi
index ead7c3cbf16..13e61b70264 100644
--- a/doc/emacs/search.texi
+++ b/doc/emacs/search.texi
@@ -668,7 +668,7 @@ it possible to match the rest of the pattern. For example, in matching
668tries to match all three @samp{a}s; but the rest of the pattern is 668tries to match all three @samp{a}s; but the rest of the pattern is
669@samp{ar} and there is only @samp{r} left to match, so this try fails. 669@samp{ar} and there is only @samp{r} left to match, so this try fails.
670The next alternative is for @samp{a*} to match only two @samp{a}s. 670The next alternative is for @samp{a*} to match only two @samp{a}s.
671With this choice, the rest of the regexp matches successfully.@refill 671With this choice, the rest of the regexp matches successfully.
672 672
673@item @kbd{+} 673@item @kbd{+}
674is a postfix operator, similar to @samp{*} except that it must match 674is a postfix operator, similar to @samp{*} except that it must match
@@ -830,11 +830,11 @@ either @var{a} matches it or @var{b} matches it. It works by trying to
830match @var{a}, and if that fails, by trying to match @var{b}. 830match @var{a}, and if that fails, by trying to match @var{b}.
831 831
832Thus, @samp{foo\|bar} matches either @samp{foo} or @samp{bar} 832Thus, @samp{foo\|bar} matches either @samp{foo} or @samp{bar}
833but no other string.@refill 833but no other string.
834 834
835@samp{\|} applies to the largest possible surrounding expressions. Only a 835@samp{\|} applies to the largest possible surrounding expressions. Only a
836surrounding @samp{\( @dots{} \)} grouping can limit the grouping power of 836surrounding @samp{\( @dots{} \)} grouping can limit the grouping power of
837@samp{\|}.@refill 837@samp{\|}.
838 838
839Full backtracking capability exists to handle multiple uses of @samp{\|}. 839Full backtracking capability exists to handle multiple uses of @samp{\|}.
840 840
@@ -850,7 +850,7 @@ Thus, @samp{\(foo\|bar\)x} matches either @samp{foox} or @samp{barx}.
850To enclose a complicated expression for the postfix operators @samp{*}, 850To enclose a complicated expression for the postfix operators @samp{*},
851@samp{+} and @samp{?} to operate on. Thus, @samp{ba\(na\)*} matches 851@samp{+} and @samp{?} to operate on. Thus, @samp{ba\(na\)*} matches
852@samp{bananana}, etc., with any (zero or more) number of @samp{na} 852@samp{bananana}, etc., with any (zero or more) number of @samp{na}
853strings.@refill 853strings.
854 854
855@item 855@item
856To record a matched substring for future reference. 856To record a matched substring for future reference.
@@ -912,7 +912,7 @@ matches the empty string, but only at point.
912matches the empty string, but only at the beginning or 912matches the empty string, but only at the beginning or
913end of a word. Thus, @samp{\bfoo\b} matches any occurrence of 913end of a word. Thus, @samp{\bfoo\b} matches any occurrence of
914@samp{foo} as a separate word. @samp{\bballs?\b} matches 914@samp{foo} as a separate word. @samp{\bballs?\b} matches
915@samp{ball} or @samp{balls} as a separate word.@refill 915@samp{ball} or @samp{balls} as a separate word.
916 916
917@samp{\b} matches at the beginning or end of the buffer 917@samp{\b} matches at the beginning or end of the buffer
918regardless of what text appears next to it. 918regardless of what text appears next to it.
@@ -1005,7 +1005,7 @@ searching through, if you specify the text in lower case. Thus, if
1005you specify searching for @samp{foo}, then @samp{Foo} and @samp{foo} 1005you specify searching for @samp{foo}, then @samp{Foo} and @samp{foo}
1006also match. Regexps, and in particular character sets, behave 1006also match. Regexps, and in particular character sets, behave
1007likewise: @samp{[ab]} matches @samp{a} or @samp{A} or @samp{b} or 1007likewise: @samp{[ab]} matches @samp{a} or @samp{A} or @samp{b} or
1008@samp{B}.@refill 1008@samp{B}.
1009 1009
1010 An upper-case letter anywhere in the incremental search string makes 1010 An upper-case letter anywhere in the incremental search string makes
1011the search case-sensitive. Thus, searching for @samp{Foo} does not find 1011the search case-sensitive. Thus, searching for @samp{Foo} does not find
diff --git a/doc/emacs/sending.texi b/doc/emacs/sending.texi
index 1402d8a85be..ac723fb63ad 100644
--- a/doc/emacs/sending.texi
+++ b/doc/emacs/sending.texi
@@ -256,7 +256,7 @@ This means that @var{nick} should expand into @var{fulladdresses},
256where @var{fulladdresses} can be either a single address, or multiple 256where @var{fulladdresses} can be either a single address, or multiple
257addresses separated with spaces. For instance, to make @code{maingnu} 257addresses separated with spaces. For instance, to make @code{maingnu}
258stand for @code{gnu@@gnu.org} plus a local address of your own, put in 258stand for @code{gnu@@gnu.org} plus a local address of your own, put in
259this line:@refill 259this line:
260 260
261@example 261@example
262alias maingnu gnu@@gnu.org local-gnu 262alias maingnu gnu@@gnu.org local-gnu
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog
index 7efe70f683d..944c7f7649b 100644
--- a/doc/lispref/ChangeLog
+++ b/doc/lispref/ChangeLog
@@ -1,12 +1,16 @@
12013-10-23 Glenn Morris <rgm@gnu.org> 12013-10-23 Glenn Morris <rgm@gnu.org>
2 2
3 * eval.texi, files.texi, intro.texi, objects.texi, searching.texi:
4 Nuke @refill.
5
3 * Makefile.in (install-dvi, install-html, install-pdf) 6 * Makefile.in (install-dvi, install-html, install-pdf)
4 (install-ps, uninstall-dvi, uninstall-html, uninstall-ps) 7 (install-ps, uninstall-dvi, uninstall-html, uninstall-ps)
5 (uninstall-pdf): Quote entities that might contain whitespace. 8 (uninstall-pdf): Quote entities that might contain whitespace.
6 9
72013-10-19 Xue Fuqiao <xfq.free@gmail.com> 102013-10-19 Xue Fuqiao <xfq.free@gmail.com>
8 11
9 * display.texi (Face Attributes): Add indexes for the ‘:box’ face attribute. 12 * display.texi (Face Attributes): Add indexes for the ‘:box’
13 face attribute.
10 14
112013-10-18 Xue Fuqiao <xfq.free@gmail.com> 152013-10-18 Xue Fuqiao <xfq.free@gmail.com>
12 16
diff --git a/doc/lispref/eval.texi b/doc/lispref/eval.texi
index 4b83d575fef..1139331f0ef 100644
--- a/doc/lispref/eval.texi
+++ b/doc/lispref/eval.texi
@@ -523,7 +523,7 @@ GNU Emacs Lisp and Common Lisp. @code{setq}, @code{if}, and
523doesn't exist in Common Lisp. @code{throw} is a special form in 523doesn't exist in Common Lisp. @code{throw} is a special form in
524Common Lisp (because it must be able to throw multiple values), but it 524Common Lisp (because it must be able to throw multiple values), but it
525is a function in Emacs Lisp (which doesn't have multiple 525is a function in Emacs Lisp (which doesn't have multiple
526values).@refill 526values).
527@end quotation 527@end quotation
528 528
529@node Autoloading 529@node Autoloading
diff --git a/doc/lispref/files.texi b/doc/lispref/files.texi
index 1f7169522cc..944a1e37cc4 100644
--- a/doc/lispref/files.texi
+++ b/doc/lispref/files.texi
@@ -2378,7 +2378,7 @@ buffer's default directory is prepended to @var{directory}, if
2378In the following example, suppose that @file{~rms/lewis} is the current 2378In the following example, suppose that @file{~rms/lewis} is the current
2379default directory, and has five files whose names begin with @samp{f}: 2379default directory, and has five files whose names begin with @samp{f}:
2380@file{foo}, @file{file~}, @file{file.c}, @file{file.c.~1~}, and 2380@file{foo}, @file{file~}, @file{file.c}, @file{file.c.~1~}, and
2381@file{file.c.~2~}.@refill 2381@file{file.c.~2~}.
2382 2382
2383@example 2383@example
2384@group 2384@group
@@ -2409,7 +2409,7 @@ function returns @code{t}. The function returns @code{nil} if directory
2409In the following example, suppose that the current default directory 2409In the following example, suppose that the current default directory
2410has five files whose names begin with @samp{f}: @file{foo}, 2410has five files whose names begin with @samp{f}: @file{foo},
2411@file{file~}, @file{file.c}, @file{file.c.~1~}, and 2411@file{file~}, @file{file.c}, @file{file.c.~1~}, and
2412@file{file.c.~2~}.@refill 2412@file{file.c.~2~}.
2413 2413
2414@example 2414@example
2415@group 2415@group
@@ -2438,7 +2438,7 @@ has five files whose names begin with @samp{f}: @file{foo},
2438@code{file-name-completion} usually ignores file names that end in any 2438@code{file-name-completion} usually ignores file names that end in any
2439string in this list. It does not ignore them when all the possible 2439string in this list. It does not ignore them when all the possible
2440completions end in one of these suffixes. This variable has no effect 2440completions end in one of these suffixes. This variable has no effect
2441on @code{file-name-all-completions}.@refill 2441on @code{file-name-all-completions}.
2442 2442
2443A typical value might look like this: 2443A typical value might look like this:
2444 2444
diff --git a/doc/lispref/intro.texi b/doc/lispref/intro.texi
index 84da0bd3769..82c4d851762 100644
--- a/doc/lispref/intro.texi
+++ b/doc/lispref/intro.texi
@@ -456,7 +456,7 @@ described using a format like that for functions, except that there
456are no arguments. 456are no arguments.
457 457
458 Here is a description of the imaginary @code{electric-future-map} 458 Here is a description of the imaginary @code{electric-future-map}
459variable.@refill 459variable.
460 460
461@defvar electric-future-map 461@defvar electric-future-map
462The value of this variable is a full keymap used by Electric Command 462The value of this variable is a full keymap used by Electric Command
diff --git a/doc/lispref/objects.texi b/doc/lispref/objects.texi
index 3b7dc41335b..a145b1e9bd2 100644
--- a/doc/lispref/objects.texi
+++ b/doc/lispref/objects.texi
@@ -1301,7 +1301,7 @@ called @dfn{subrs} or @dfn{built-in functions}. (The word ``subr'' is
1301derived from ``subroutine''.) Most primitive functions evaluate all 1301derived from ``subroutine''.) Most primitive functions evaluate all
1302their arguments when they are called. A primitive function that does 1302their arguments when they are called. A primitive function that does
1303not evaluate all its arguments is called a @dfn{special form} 1303not evaluate all its arguments is called a @dfn{special form}
1304(@pxref{Special Forms}).@refill 1304(@pxref{Special Forms}).
1305 1305
1306 It does not matter to the caller of a function whether the function is 1306 It does not matter to the caller of a function whether the function is
1307primitive. However, this does matter if you try to redefine a primitive 1307primitive. However, this does matter if you try to redefine a primitive
diff --git a/doc/lispref/searching.texi b/doc/lispref/searching.texi
index 4a222a6e7af..15aa23f77ea 100644
--- a/doc/lispref/searching.texi
+++ b/doc/lispref/searching.texi
@@ -273,12 +273,12 @@ expression is ordinary, unless a @samp{\} precedes it.
273therefore @samp{f} is a regular expression that matches the string 273therefore @samp{f} is a regular expression that matches the string
274@samp{f} and no other string. (It does @emph{not} match the string 274@samp{f} and no other string. (It does @emph{not} match the string
275@samp{fg}, but it does match a @emph{part} of that string.) Likewise, 275@samp{fg}, but it does match a @emph{part} of that string.) Likewise,
276@samp{o} is a regular expression that matches only @samp{o}.@refill 276@samp{o} is a regular expression that matches only @samp{o}.
277 277
278 Any two regular expressions @var{a} and @var{b} can be concatenated. The 278 Any two regular expressions @var{a} and @var{b} can be concatenated. The
279result is a regular expression that matches a string if @var{a} matches 279result is a regular expression that matches a string if @var{a} matches
280some amount of the beginning of that string and @var{b} matches the rest of 280some amount of the beginning of that string and @var{b} matches the rest of
281the string.@refill 281the string.
282 282
283 As a simple example, we can concatenate the regular expressions @samp{f} 283 As a simple example, we can concatenate the regular expressions @samp{f}
284and @samp{o} to get the regular expression @samp{fo}, which matches only 284and @samp{o} to get the regular expression @samp{fo}, which matches only
@@ -304,7 +304,7 @@ expression.
304is a special character that matches any single character except a newline. 304is a special character that matches any single character except a newline.
305Using concatenation, we can make regular expressions like @samp{a.b}, which 305Using concatenation, we can make regular expressions like @samp{a.b}, which
306matches any three-character string that begins with @samp{a} and ends with 306matches any three-character string that begins with @samp{a} and ends with
307@samp{b}.@refill 307@samp{b}.
308 308
309@item @samp{*} 309@item @samp{*}
310@cindex @samp{*} in regexp 310@cindex @samp{*} in regexp
@@ -488,7 +488,7 @@ example, the regular expression that matches the @samp{\} character is
488@samp{\\}. To write a Lisp string that contains the characters 488@samp{\\}. To write a Lisp string that contains the characters
489@samp{\\}, Lisp syntax requires you to quote each @samp{\} with another 489@samp{\\}, Lisp syntax requires you to quote each @samp{\} with another
490@samp{\}. Therefore, the read syntax for a regular expression matching 490@samp{\}. Therefore, the read syntax for a regular expression matching
491@samp{\} is @code{"\\\\"}.@refill 491@samp{\} is @code{"\\\\"}.
492@end table 492@end table
493 493
494@strong{Please note:} For historical compatibility, special characters 494@strong{Please note:} For historical compatibility, special characters
@@ -496,7 +496,7 @@ are treated as ordinary ones if they are in contexts where their special
496meanings make no sense. For example, @samp{*foo} treats @samp{*} as 496meanings make no sense. For example, @samp{*foo} treats @samp{*} as
497ordinary since there is no preceding expression on which the @samp{*} 497ordinary since there is no preceding expression on which the @samp{*}
498can act. It is poor practice to depend on this behavior; quote the 498can act. It is poor practice to depend on this behavior; quote the
499special character anyway, regardless of where it appears.@refill 499special character anyway, regardless of where it appears.
500 500
501As a @samp{\} is not special inside a character alternative, it can 501As a @samp{\} is not special inside a character alternative, it can
502never remove the special meaning of @samp{-} or @samp{]}. So you 502never remove the special meaning of @samp{-} or @samp{]}. So you
@@ -599,14 +599,14 @@ a table of the special @samp{\} constructs.
599specifies an alternative. 599specifies an alternative.
600Two regular expressions @var{a} and @var{b} with @samp{\|} in 600Two regular expressions @var{a} and @var{b} with @samp{\|} in
601between form an expression that matches anything that either @var{a} or 601between form an expression that matches anything that either @var{a} or
602@var{b} matches.@refill 602@var{b} matches.
603 603
604Thus, @samp{foo\|bar} matches either @samp{foo} or @samp{bar} 604Thus, @samp{foo\|bar} matches either @samp{foo} or @samp{bar}
605but no other string.@refill 605but no other string.
606 606
607@samp{\|} applies to the largest possible surrounding expressions. Only a 607@samp{\|} applies to the largest possible surrounding expressions. Only a
608surrounding @samp{\( @dots{} \)} grouping can limit the grouping power of 608surrounding @samp{\( @dots{} \)} grouping can limit the grouping power of
609@samp{\|}.@refill 609@samp{\|}.
610 610
611If you need full backtracking capability to handle multiple uses of 611If you need full backtracking capability to handle multiple uses of
612@samp{\|}, use the POSIX regular expression functions (@pxref{POSIX 612@samp{\|}, use the POSIX regular expression functions (@pxref{POSIX
@@ -785,7 +785,7 @@ matches the empty string, but only at point.
785matches the empty string, but only at the beginning or 785matches the empty string, but only at the beginning or
786end of a word. Thus, @samp{\bfoo\b} matches any occurrence of 786end of a word. Thus, @samp{\bfoo\b} matches any occurrence of
787@samp{foo} as a separate word. @samp{\bballs?\b} matches 787@samp{foo} as a separate word. @samp{\bballs?\b} matches
788@samp{ball} or @samp{balls} as a separate word.@refill 788@samp{ball} or @samp{balls} as a separate word.
789 789
790@samp{\b} matches at the beginning or end of the buffer (or string) 790@samp{\b} matches at the beginning or end of the buffer (or string)
791regardless of what text appears next to it. 791regardless of what text appears next to it.
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 3563c1e768d..ad045fc6d5f 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,5 +1,9 @@
12013-10-23 Glenn Morris <rgm@gnu.org> 12013-10-23 Glenn Morris <rgm@gnu.org>
2 2
3 * dired-x.texi, ebrowse.texi, ede.texi, eieio.texi, eshell.texi:
4 * pcl-cvs.texi, sc.texi, srecode.texi, vip.texi, viper.texi:
5 * widget.texi: Nuke @refill.
6
3 * Makefile.in (install-dvi, install-html, install-pdf) 7 * Makefile.in (install-dvi, install-html, install-pdf)
4 (install-ps, uninstall-dvi, uninstall-html, uninstall-ps) 8 (install-ps, uninstall-dvi, uninstall-html, uninstall-ps)
5 (uninstall-pdf): Quote entities that might contain whitespace. 9 (uninstall-pdf): Quote entities that might contain whitespace.
diff --git a/doc/misc/dired-x.texi b/doc/misc/dired-x.texi
index 1e3d11f6dc6..0b88604543e 100644
--- a/doc/misc/dired-x.texi
+++ b/doc/misc/dired-x.texi
@@ -560,7 +560,7 @@ of marked files.
560@vindex dired-guess-shell-alist-default 560@vindex dired-guess-shell-alist-default
561Predefined rules for shell commands. Set this to @code{nil} to turn guessing off. 561Predefined rules for shell commands. Set this to @code{nil} to turn guessing off.
562The elements of @code{dired-guess-shell-alist-user} (defined by the 562The elements of @code{dired-guess-shell-alist-user} (defined by the
563user) will override these rules.@refill 563user) will override these rules.
564 564
565@item dired-guess-shell-alist-user 565@item dired-guess-shell-alist-user
566@vindex dired-guess-shell-alist-user 566@vindex dired-guess-shell-alist-user
@@ -568,7 +568,6 @@ If non-@code{nil}, a user-defined alist of file regexps and their suggested
568commands. These rules take precedence over the predefined rules in the 568commands. These rules take precedence over the predefined rules in the
569variable @code{dired-guess-shell-alist-default} (to which they are prepended) 569variable @code{dired-guess-shell-alist-default} (to which they are prepended)
570when @code{dired-do-shell-command} is run). 570when @code{dired-do-shell-command} is run).
571@refill
572 571
573Each element of the alist looks like 572Each element of the alist looks like
574 573
diff --git a/doc/misc/ebrowse.texi b/doc/misc/ebrowse.texi
index c7f3e3b1a61..aa9df988969 100644
--- a/doc/misc/ebrowse.texi
+++ b/doc/misc/ebrowse.texi
@@ -138,7 +138,7 @@ list of the pseudo-class @samp{*Globals*};
138 138
139@item 139@item
140Types (@code{enum}s, and @code{typedef}s defined with class 140Types (@code{enum}s, and @code{typedef}s defined with class
141scope).@refill 141scope).
142@end itemize 142@end itemize
143 143
144You can switch member buffers from one list to another, or to another 144You can switch member buffers from one list to another, or to another
@@ -210,7 +210,7 @@ per line.
210 210
211@findex --help 211@findex --help
212When invoked with option @samp{--help}, @command{ebrowse} prints a list of 212When invoked with option @samp{--help}, @command{ebrowse} prints a list of
213available command line options.@refill 213available command line options.
214 214
215@menu 215@menu
216* Input files:: Specifying which files to parse 216* Input files:: Specifying which files to parse
@@ -478,12 +478,12 @@ name.
478This command views the class declaration if the database 478This command views the class declaration if the database
479contains information about it. If you don't parse the entire source 479contains information about it. If you don't parse the entire source
480you are working on, some classes will only be known to exist but the 480you are working on, some classes will only be known to exist but the
481location of their declarations and definitions will not be known.@refill 481location of their declarations and definitions will not be known.
482 482
483@item RET 483@item RET
484Works like @kbd{SPC}, except that it finds the class 484Works like @kbd{SPC}, except that it finds the class
485declaration rather than viewing it, so that it is ready for 485declaration rather than viewing it, so that it is ready for
486editing.@refill 486editing.
487@end table 487@end table
488 488
489The same functionality is available from the menu opened with 489The same functionality is available from the menu opened with
@@ -570,7 +570,7 @@ positions the cursor on the class in the class tree.
570If the branch of the class tree containing the class searched for is 570If the branch of the class tree containing the class searched for is
571currently collapsed, the class itself and all its base classes are 571currently collapsed, the class itself and all its base classes are
572recursively made visible. (See also @ref{Expanding and 572recursively made visible. (See also @ref{Expanding and
573Collapsing}.)@refill 573Collapsing}.)
574 574
575This function is also available from the tree buffer's context menu. 575This function is also available from the tree buffer's context menu.
576 576
@@ -634,7 +634,7 @@ Here is an example of a tree buffer with file names displayed.
634You can expand and collapse parts of a tree to reduce the complexity of 634You can expand and collapse parts of a tree to reduce the complexity of
635large class hierarchies. Expanding or collapsing branches of a tree has 635large class hierarchies. Expanding or collapsing branches of a tree has
636no impact on the functionality of other commands, like @kbd{/}. (See 636no impact on the functionality of other commands, like @kbd{/}. (See
637also @ref{Go to Class}.)@refill 637also @ref{Go to Class}.)
638 638
639Collapsed branches are indicated with an ellipsis following the class 639Collapsed branches are indicated with an ellipsis following the class
640name like in the example below. 640name like in the example below.
@@ -734,7 +734,7 @@ context menu.
734 734
735Classes can be marked for operations similar to the standard Emacs 735Classes can be marked for operations similar to the standard Emacs
736commands @kbd{M-x tags-search} and @kbd{M-x tags-query-replace} (see 736commands @kbd{M-x tags-search} and @kbd{M-x tags-query-replace} (see
737also @xref{Tags-like Functions}.)@refill 737also @xref{Tags-like Functions}.)
738 738
739@table @kbd 739@table @kbd
740@cindex toggle mark 740@cindex toggle mark
@@ -1292,7 +1292,7 @@ When jumping to a member declaration or definition with one of
1292Ebrowse's commands, the position from where you performed the 1292Ebrowse's commands, the position from where you performed the
1293jump and the position where you jumped to are recorded in a 1293jump and the position where you jumped to are recorded in a
1294@dfn{position stack}. There are several ways in which you can quickly 1294@dfn{position stack}. There are several ways in which you can quickly
1295move to positions in the stack:@refill 1295move to positions in the stack:
1296 1296
1297@table @kbd 1297@table @kbd
1298@cindex return to original position 1298@cindex return to original position
diff --git a/doc/misc/ede.texi b/doc/misc/ede.texi
index f2e787fd588..283082141dc 100644
--- a/doc/misc/ede.texi
+++ b/doc/misc/ede.texi
@@ -1564,26 +1564,22 @@ Type: @code{string} @*
1564Default Value: @code{"Untitled"} 1564Default Value: @code{"Untitled"}
1565 1565
1566The name used when generating distribution files. 1566The name used when generating distribution files.
1567@refill
1568 1567
1569@item :version 1568@item :version
1570Type: @code{string} @* 1569Type: @code{string} @*
1571Default Value: @code{"1.0"} 1570Default Value: @code{"1.0"}
1572 1571
1573The version number used when distributing files. 1572The version number used when distributing files.
1574@refill
1575 1573
1576@item :directory 1574@item :directory
1577Type: @code{string} 1575Type: @code{string}
1578 1576
1579Directory this project is associated with. 1577Directory this project is associated with.
1580@refill
1581 1578
1582@item :file 1579@item :file
1583Type: @code{string} 1580Type: @code{string}
1584 1581
1585File name where this project is stored. 1582File name where this project is stored.
1586@refill
1587 1583
1588@end table 1584@end table
1589 1585
@@ -1656,35 +1652,30 @@ Make sure placeholder @var{THIS} is replaced with the real thing, and pass throu
1656Type: @code{list} 1652Type: @code{list}
1657 1653
1658List of top level targets in this project. 1654List of top level targets in this project.
1659@refill
1660 1655
1661@item :tool-cache 1656@item :tool-cache
1662Type: @code{list} 1657Type: @code{list}
1663 1658
1664List of tool cache configurations in this project. 1659List of tool cache configurations in this project.
1665This allows any tool to create, manage, and persist project-specific settings. 1660This allows any tool to create, manage, and persist project-specific settings.
1666@refill
1667 1661
1668@item :web-site-url 1662@item :web-site-url
1669Type: @code{string} @* 1663Type: @code{string} @*
1670 1664
1671URL to this projects web site. 1665URL to this projects web site.
1672This is a URL to be sent to a web site for documentation. 1666This is a URL to be sent to a web site for documentation.
1673@refill
1674 1667
1675@item :web-site-directory @* 1668@item :web-site-directory @*
1676 1669
1677A directory where web pages can be found by Emacs. 1670A directory where web pages can be found by Emacs.
1678For remote locations use a path compatible with ange-ftp or EFS@. 1671For remote locations use a path compatible with ange-ftp or EFS@.
1679You can also use TRAMP for use with rcp & scp. 1672You can also use TRAMP for use with rcp & scp.
1680@refill
1681 1673
1682@item :web-site-file @* 1674@item :web-site-file @*
1683 1675
1684A file which contains the home page for this project. 1676A file which contains the home page for this project.
1685This file can be relative to slot @code{web-site-directory}. 1677This file can be relative to slot @code{web-site-directory}.
1686This can be a local file, use ange-ftp, EFS, or TRAMP. 1678This can be a local file, use ange-ftp, EFS, or TRAMP.
1687@refill
1688 1679
1689@item :ftp-site 1680@item :ftp-site
1690Type: @code{string} @* 1681Type: @code{string} @*
@@ -1692,7 +1683,6 @@ Type: @code{string} @*
1692FTP site where this project's distribution can be found. 1683FTP site where this project's distribution can be found.
1693This FTP site should be in Emacs form, as needed by @code{ange-ftp}, but can 1684This FTP site should be in Emacs form, as needed by @code{ange-ftp}, but can
1694also be of a form used by TRAMP for use with scp, or rcp. 1685also be of a form used by TRAMP for use with scp, or rcp.
1695@refill
1696 1686
1697@item :ftp-upload-site 1687@item :ftp-upload-site
1698Type: @code{string} @* 1688Type: @code{string} @*
@@ -1700,7 +1690,6 @@ Type: @code{string} @*
1700FTP Site to upload new distributions to. 1690FTP Site to upload new distributions to.
1701This FTP site should be in Emacs form as needed by @code{ange-ftp}. 1691This FTP site should be in Emacs form as needed by @code{ange-ftp}.
1702If this slot is @code{nil}, then use @code{ftp-site} instead. 1692If this slot is @code{nil}, then use @code{ftp-site} instead.
1703@refill
1704 1693
1705@item :configurations 1694@item :configurations
1706Type: @code{list} @* 1695Type: @code{list} @*
@@ -1709,19 +1698,16 @@ Default Value: @code{("debug" "release")}
1709List of available configuration types. 1698List of available configuration types.
1710Individual target/project types can form associations between a configuration, 1699Individual target/project types can form associations between a configuration,
1711and target specific elements such as build variables. 1700and target specific elements such as build variables.
1712@refill
1713 1701
1714@item :configuration-default @* 1702@item :configuration-default @*
1715Default Value: @code{"debug"} 1703Default Value: @code{"debug"}
1716 1704
1717The default configuration. 1705The default configuration.
1718@refill
1719 1706
1720@item :local-variables @* 1707@item :local-variables @*
1721Default Value: @code{nil} 1708Default Value: @code{nil}
1722 1709
1723Project local variables 1710Project local variables
1724@refill
1725 1711
1726@end table 1712@end table
1727 1713
@@ -1966,7 +1952,6 @@ buffer's @code{default-directory} (not starting with a /). Directories
1966that are relative to the project's root should start with a /, such 1952that are relative to the project's root should start with a /, such
1967as "/include", meaning the directory @code{include} off the project root 1953as "/include", meaning the directory @code{include} off the project root
1968directory. 1954directory.
1969@refill
1970 1955
1971@item :system-include-path 1956@item :system-include-path
1972Type: @code{list} @* 1957Type: @code{list} @*
@@ -1976,7 +1961,6 @@ The system include path for files in this project.
1976C files initialized in an ede-cpp-root-project have their semantic 1961C files initialized in an ede-cpp-root-project have their semantic
1977system include path set to this value. If this is @code{nil}, then the 1962system include path set to this value. If this is @code{nil}, then the
1978semantic path is not modified. 1963semantic path is not modified.
1979@refill
1980 1964
1981@item :spp-table 1965@item :spp-table
1982Type: @code{list} @* 1966Type: @code{list} @*
@@ -1988,7 +1972,6 @@ These macros might be passed in through the command line compiler, or
1988are critical symbols derived from header files. Providing header files 1972are critical symbols derived from header files. Providing header files
1989macro values through this slot improves accuracy and performance. 1973macro values through this slot improves accuracy and performance.
1990Use `:spp-files' to use these files directly. 1974Use `:spp-files' to use these files directly.
1991@refill
1992 1975
1993@item :spp-files 1976@item :spp-files
1994Type: @code{list} @* 1977Type: @code{list} @*
@@ -1998,14 +1981,12 @@ C header file with Preprocessor macros for your files.
1998The PreProcessor symbols appearing in these files will be used while 1981The PreProcessor symbols appearing in these files will be used while
1999parsing files in this project. 1982parsing files in this project.
2000See @code{semantic-lex-c-preprocessor-symbol-map} for more on how this works. 1983See @code{semantic-lex-c-preprocessor-symbol-map} for more on how this works.
2001@refill
2002 1984
2003@item :header-match-regexp 1985@item :header-match-regexp
2004Type: @code{string} @* 1986Type: @code{string} @*
2005Default Value: @code{"\\.\\(h\\(h\\|xx\\|pp\\|\\+\\+\\)?\\|H\\)$\\|\\<\\w+$"} 1987Default Value: @code{"\\.\\(h\\(h\\|xx\\|pp\\|\\+\\+\\)?\\|H\\)$\\|\\<\\w+$"}
2006 1988
2007Regexp used to identify C/C++ header files. 1989Regexp used to identify C/C++ header files.
2008@refill
2009 1990
2010@item :locate-fcn 1991@item :locate-fcn
2011Type: @code{(or null function)} @* 1992Type: @code{(or null function)} @*
@@ -2020,7 +2001,6 @@ The function symbol must take two arguments:
2020 2001
2021It should return the fully qualified file name passed in from NAME@. If that file does not 2002It should return the fully qualified file name passed in from NAME@. If that file does not
2022exist, it should return nil. 2003exist, it should return nil.
2023@refill
2024 2004
2025@end table 2005@end table
2026 2006
@@ -2144,14 +2124,12 @@ The type of Makefile to generate.
2144Can be one of @code{'Makefile}, 'Makefile.in, or 'Makefile.am. 2124Can be one of @code{'Makefile}, 'Makefile.in, or 'Makefile.am.
2145If this value is NOT @code{'Makefile}, then that overrides the @code{:makefile} slot 2125If this value is NOT @code{'Makefile}, then that overrides the @code{:makefile} slot
2146in targets. 2126in targets.
2147@refill
2148 2127
2149@item :variables 2128@item :variables
2150Type: @code{list} @* 2129Type: @code{list} @*
2151Default Value: @code{nil} 2130Default Value: @code{nil}
2152 2131
2153Variables to set in this Makefile. 2132Variables to set in this Makefile.
2154@refill
2155 2133
2156@item :configuration-variables 2134@item :configuration-variables
2157Type: @code{list} @* 2135Type: @code{list} @*
@@ -2159,27 +2137,23 @@ Default Value: @code{("debug" (("DEBUG" . "1")))}
2159 2137
2160Makefile variables to use in different configurations. 2138Makefile variables to use in different configurations.
2161These variables are used in the makefile when a configuration becomes active. 2139These variables are used in the makefile when a configuration becomes active.
2162@refill
2163 2140
2164@item :inference-rules @* 2141@item :inference-rules @*
2165Default Value: @code{nil} 2142Default Value: @code{nil}
2166 2143
2167Inference rules to add to the makefile. 2144Inference rules to add to the makefile.
2168@refill
2169 2145
2170@item :include-file @* 2146@item :include-file @*
2171Default Value: @code{nil} 2147Default Value: @code{nil}
2172 2148
2173Additional files to include. 2149Additional files to include.
2174These files can contain additional rules, variables, and customizations. 2150These files can contain additional rules, variables, and customizations.
2175@refill
2176 2151
2177@item :automatic-dependencies 2152@item :automatic-dependencies
2178Type: @code{boolean} @* 2153Type: @code{boolean} @*
2179Default Value: @code{t} 2154Default Value: @code{t}
2180 2155
2181Non-@code{nil} to do implement automatic dependencies in the Makefile. 2156Non-@code{nil} to do implement automatic dependencies in the Makefile.
2182@refill
2183 2157
2184@item :metasubproject 2158@item :metasubproject
2185Type: @code{boolean} @* 2159Type: @code{boolean} @*
@@ -2190,7 +2164,6 @@ Usually, a subproject is determined by a parent project. If multiple top level
2190projects are grouped into a large project not maintained by EDE, then you need 2164projects are grouped into a large project not maintained by EDE, then you need
2191to set this to non-nil. The only effect is that the @code{dist} rule will then avoid 2165to set this to non-nil. The only effect is that the @code{dist} rule will then avoid
2192making a tar file. 2166making a tar file.
2193@refill
2194 2167
2195@end table 2168@end table
2196 2169
@@ -2380,7 +2353,6 @@ Type: @code{list} @*
2380Default Value: @code{nil} 2353Default Value: @code{nil}
2381 2354
2382Variables to set in this Makefile, at top of file. 2355Variables to set in this Makefile, at top of file.
2383@refill
2384 2356
2385@item :additional-variables 2357@item :additional-variables
2386Type: @code{(or null list)} @* 2358Type: @code{(or null list)} @*
@@ -2388,7 +2360,6 @@ Default Value: @code{nil}
2388 2360
2389Arbitrary variables needed from this project. 2361Arbitrary variables needed from this project.
2390It is safe to leave this blank. 2362It is safe to leave this blank.
2391@refill
2392 2363
2393@item :additional-rules 2364@item :additional-rules
2394Type: @code{(or null list)} @* 2365Type: @code{(or null list)} @*
@@ -2396,7 +2367,6 @@ Default Value: @code{nil}
2396 2367
2397Arbitrary rules and dependencies needed to make this target. 2368Arbitrary rules and dependencies needed to make this target.
2398It is safe to leave this blank. 2369It is safe to leave this blank.
2399@refill
2400 2370
2401@item :installation-domain 2371@item :installation-domain
2402Type: @code{symbol} @* 2372Type: @code{symbol} @*
@@ -2404,7 +2374,6 @@ Default Value: @code{user}
2404 2374
2405Installation domain specification. 2375Installation domain specification.
2406The variable GNUSTEP_INSTALLATION_DOMAIN is set at this value. 2376The variable GNUSTEP_INSTALLATION_DOMAIN is set at this value.
2407@refill
2408 2377
2409@item :preamble 2378@item :preamble
2410Type: @code{(or null list)} @* 2379Type: @code{(or null list)} @*
@@ -2412,7 +2381,6 @@ Default Value: @code{(quote ("GNUmakefile.preamble"))}
2412 2381
2413The auxiliary makefile for additional variables. 2382The auxiliary makefile for additional variables.
2414Included just before the specific target files. 2383Included just before the specific target files.
2415@refill
2416 2384
2417@item :postamble 2385@item :postamble
2418Type: @code{(or null list)} @* 2386Type: @code{(or null list)} @*
@@ -2420,7 +2388,6 @@ Default Value: @code{(quote ("GNUmakefile.postamble"))}
2420 2388
2421The auxiliary makefile for additional rules. 2389The auxiliary makefile for additional rules.
2422Included just after the specific target files. 2390Included just after the specific target files.
2423@refill
2424 2391
2425@item :metasubproject 2392@item :metasubproject
2426Type: @code{boolean} @* 2393Type: @code{boolean} @*
@@ -2431,7 +2398,6 @@ Usually, a subproject is determined by a parent project. If multiple top level
2431projects are grouped into a large project not maintained by EDE, then you need 2398projects are grouped into a large project not maintained by EDE, then you need
2432to set this to non-nil. The only effect is that the @code{dist} rule will then avoid 2399to set this to non-nil. The only effect is that the @code{dist} rule will then avoid
2433making a tar file. 2400making a tar file.
2434@refill
2435 2401
2436@end table 2402@end table
2437 2403
@@ -2536,21 +2502,18 @@ Commit change to local variables in @var{PROJ}.
2536Type: @code{string} 2502Type: @code{string}
2537 2503
2538Name of this target. 2504Name of this target.
2539@refill
2540 2505
2541@item :path 2506@item :path
2542Type: @code{string} 2507Type: @code{string}
2543 2508
2544The path to the sources of this target. 2509The path to the sources of this target.
2545Relative to the path of the project it belongs to. 2510Relative to the path of the project it belongs to.
2546@refill
2547 2511
2548@item :source 2512@item :source
2549Type: @code{list} @* 2513Type: @code{list} @*
2550Default Value: @code{nil} 2514Default Value: @code{nil}
2551 2515
2552Source files in this target. 2516Source files in this target.
2553@refill
2554 2517
2555@item :versionsource 2518@item :versionsource
2556Type: @code{list} @* 2519Type: @code{list} @*
@@ -2560,7 +2523,6 @@ Source files with a version string in them.
2560These files are checked for a version string whenever the EDE version 2523These files are checked for a version string whenever the EDE version
2561of the master project is changed. When strings are found, the version 2524of the master project is changed. When strings are found, the version
2562previously there is updated. 2525previously there is updated.
2563@refill
2564 2526
2565@end table 2527@end table
2566 2528
@@ -2752,14 +2714,12 @@ Retrieves the slot @code{menu} from an object of class @code{ede-target}
2752Type: @code{string} 2714Type: @code{string}
2753 2715
2754Name of this target. 2716Name of this target.
2755@refill
2756 2717
2757@item :path 2718@item :path
2758Type: @code{string} 2719Type: @code{string}
2759 2720
2760The path to the sources of this target. 2721The path to the sources of this target.
2761Relative to the path of the project it belongs to. 2722Relative to the path of the project it belongs to.
2762@refill
2763 2723
2764@item :auxsource 2724@item :auxsource
2765Type: @code{list} @* 2725Type: @code{list} @*
@@ -2768,7 +2728,6 @@ Default Value: @code{nil}
2768Auxiliary source files included in this target. 2728Auxiliary source files included in this target.
2769Each of these is considered equivalent to a source file, but it is not 2729Each of these is considered equivalent to a source file, but it is not
2770distributed, and each should have a corresponding rule to build it. 2730distributed, and each should have a corresponding rule to build it.
2771@refill
2772 2731
2773@item :compiler 2732@item :compiler
2774Type: @code{(or null symbol)} @* 2733Type: @code{(or null symbol)} @*
@@ -2778,7 +2737,6 @@ The compiler to be used to compile this object.
2778This should be a symbol, which contains the object defining the compiler. 2737This should be a symbol, which contains the object defining the compiler.
2779This enables save/restore to do so by name, permitting the sharing 2738This enables save/restore to do so by name, permitting the sharing
2780of these compiler resources, and global customization thereof. 2739of these compiler resources, and global customization thereof.
2781@refill
2782 2740
2783@item :linker 2741@item :linker
2784Type: @code{(or null symbol)} @* 2742Type: @code{(or null symbol)} @*
@@ -2788,7 +2746,6 @@ The linker to be used to link compiled sources for this object.
2788This should be a symbol, which contains the object defining the linker. 2746This should be a symbol, which contains the object defining the linker.
2789This enables save/restore to do so by name, permitting the sharing 2747This enables save/restore to do so by name, permitting the sharing
2790of these linker resources, and global customization thereof. 2748of these linker resources, and global customization thereof.
2791@refill
2792 2749
2793@end table 2750@end table
2794 2751
@@ -2950,7 +2907,6 @@ Type: @code{string} @*
2950Default Value: @code{"Makefile"} 2907Default Value: @code{"Makefile"}
2951 2908
2952File name of generated Makefile. 2909File name of generated Makefile.
2953@refill
2954 2910
2955@item :partofall 2911@item :partofall
2956Type: @code{boolean} @* 2912Type: @code{boolean} @*
@@ -2959,7 +2915,6 @@ Default Value: @code{t}
2959Non @code{nil} means the rule created is part of the all target. 2915Non @code{nil} means the rule created is part of the all target.
2960Setting this to @code{nil} creates the rule to build this item, but does not 2916Setting this to @code{nil} creates the rule to build this item, but does not
2961include it in the ALL`all:' rule. 2917include it in the ALL`all:' rule.
2962@refill
2963 2918
2964@item :configuration-variables 2919@item :configuration-variables
2965Type: @code{list} @* 2920Type: @code{list} @*
@@ -2969,7 +2924,6 @@ Makefile variables appended to use in different configurations.
2969These variables are used in the makefile when a configuration becomes active. 2924These variables are used in the makefile when a configuration becomes active.
2970Target variables are always renamed such as foo_CFLAGS, then included into 2925Target variables are always renamed such as foo_CFLAGS, then included into
2971commands where the variable would usually appear. 2926commands where the variable would usually appear.
2972@refill
2973 2927
2974@item :rules 2928@item :rules
2975Type: @code{list} @* 2929Type: @code{list} @*
@@ -2977,7 +2931,6 @@ Default Value: @code{nil}
2977 2931
2978Arbitrary rules and dependencies needed to make this target. 2932Arbitrary rules and dependencies needed to make this target.
2979It is safe to leave this blank. 2933It is safe to leave this blank.
2980@refill
2981 2934
2982@end table 2935@end table
2983 2936
@@ -3221,7 +3174,6 @@ The linker flag "-l" is automatically prepended. Do not include a "lib"
3221prefix, or a ".so" suffix. 3174prefix, or a ".so" suffix.
3222 3175
3223Note: Currently only used for Automake projects. 3176Note: Currently only used for Automake projects.
3224@refill
3225 3177
3226@item :ldflags 3178@item :ldflags
3227Type: @code{list} @* 3179Type: @code{list} @*
@@ -3232,7 +3184,6 @@ Use ldlibs to add addition libraries. Use this to specify specific
3232options to the linker. 3184options to the linker.
3233 3185
3234Note: Not currently used. This bug needs to be fixed. 3186Note: Not currently used. This bug needs to be fixed.
3235@refill
3236 3187
3237@end table 3188@end table
3238 3189
@@ -3358,7 +3309,6 @@ Additional packages needed.
3358There should only be one toplevel package per auxiliary tool needed. 3309There should only be one toplevel package per auxiliary tool needed.
3359These packages location is found, and added to the compile time 3310These packages location is found, and added to the compile time
3360load path. 3311load path.
3361@refill
3362 3312
3363@end table 3313@end table
3364 3314
@@ -3439,7 +3389,6 @@ Default Value: @code{"loaddefs.el"}
3439The file that autoload definitions are placed in. 3389The file that autoload definitions are placed in.
3440There should be one load defs file for a given package. The load defs are created 3390There should be one load defs file for a given package. The load defs are created
3441for all Emacs Lisp sources that exist in the directory of the created target. 3391for all Emacs Lisp sources that exist in the directory of the created target.
3442@refill
3443 3392
3444@item :autoload-dirs 3393@item :autoload-dirs
3445Type: @code{list} @* 3394Type: @code{list} @*
@@ -3447,7 +3396,6 @@ Default Value: @code{nil}
3447 3396
3448The directories to scan for autoload definitions. 3397The directories to scan for autoload definitions.
3449If @code{nil} defaults to the current directory. 3398If @code{nil} defaults to the current directory.
3450@refill
3451 3399
3452@end table 3400@end table
3453 3401
@@ -3547,7 +3495,6 @@ Default Value: @code{""}
3547 3495
3548Miscellaneous sources which have a specialized makefile. 3496Miscellaneous sources which have a specialized makefile.
3549The sub-makefile is used to build this target. 3497The sub-makefile is used to build this target.
3550@refill
3551 3498
3552@end table 3499@end table
3553 3500
@@ -3604,7 +3551,6 @@ Default Value: @code{""}
3604 3551
3605The main menu resides in this file. 3552The main menu resides in this file.
3606All other sources should be included independently. 3553All other sources should be included independently.
3607@refill
3608 3554
3609@end table 3555@end table
3610 3556
@@ -3687,7 +3633,6 @@ Type: @code{string} @*
3687Default Value: @code{"guile"} 3633Default Value: @code{"guile"}
3688 3634
3689The preferred interpreter for this code. 3635The preferred interpreter for this code.
3690@refill
3691 3636
3692@end table 3637@end table
3693 3638
@@ -3817,7 +3762,6 @@ No children
3817Default Value: @code{nil} 3762Default Value: @code{nil}
3818 3763
3819Additional LD args. 3764Additional LD args.
3820@refill
3821@end table 3765@end table
3822@end table 3766@end table
3823 3767
@@ -3949,7 +3893,6 @@ No children
3949Default Value: @code{nil} 3893Default Value: @code{nil}
3950 3894
3951Additional texinfo included in this one. 3895Additional texinfo included in this one.
3952@refill
3953 3896
3954@end table 3897@end table
3955@end table 3898@end table
@@ -4036,21 +3979,18 @@ Type: @code{eieio-instance-inheritor-child}
4036The parent of this instance. 3979The parent of this instance.
4037If a slot of this class is reference, and is unbound, then the parent 3980If a slot of this class is reference, and is unbound, then the parent
4038is checked for a value. 3981is checked for a value.
4039@refill
4040 3982
4041@item :name 3983@item :name
4042Type: @code{string} 3984Type: @code{string}
4043 3985
4044The name of this type of source code. 3986The name of this type of source code.
4045Such as "C" or "Emacs Lisp" 3987Such as "C" or "Emacs Lisp"
4046@refill
4047 3988
4048@item :sourcepattern 3989@item :sourcepattern
4049Type: @code{string} @* 3990Type: @code{string} @*
4050Default Value: @code{".*"} 3991Default Value: @code{".*"}
4051 3992
4052Emacs regex matching sourcecode this target accepts. 3993Emacs regex matching sourcecode this target accepts.
4053@refill
4054 3994
4055@item :auxsourcepattern 3995@item :auxsourcepattern
4056Type: @code{(or null string)} @* 3996Type: @code{(or null string)} @*
@@ -4059,7 +3999,6 @@ Default Value: @code{nil}
4059Emacs regex matching auxiliary source code this target accepts. 3999Emacs regex matching auxiliary source code this target accepts.
4060Aux source are source code files needed for compilation, which are not compiled 4000Aux source are source code files needed for compilation, which are not compiled
4061themselves. 4001themselves.
4062@refill
4063 4002
4064@item :enable-subdirectories 4003@item :enable-subdirectories
4065Type: @code{boolean} @* 4004Type: @code{boolean} @*
@@ -4069,7 +4008,6 @@ Non @code{nil} if this sourcecode type uses subdirectores.
4069If sourcecode always lives near the target creating it, this should be nil. 4008If sourcecode always lives near the target creating it, this should be nil.
4070If sourcecode can, or typically lives in a subdirectory of the owning 4009If sourcecode can, or typically lives in a subdirectory of the owning
4071target, set this to t. 4010target, set this to t.
4072@refill
4073 4011
4074@item :garbagepattern 4012@item :garbagepattern
4075Type: @code{list} @* 4013Type: @code{list} @*
@@ -4078,7 +4016,6 @@ Default Value: @code{nil}
4078Shell file regex matching files considered as garbage. 4016Shell file regex matching files considered as garbage.
4079This is a list of items added to an @code{rm} command when executing a @code{clean} 4017This is a list of items added to an @code{rm} command when executing a @code{clean}
4080type directive. 4018type directive.
4081@refill
4082 4019
4083@end table 4020@end table
4084 4021
@@ -4158,13 +4095,11 @@ Type: @code{eieio-instance-inheritor-child}
4158The parent of this instance. 4095The parent of this instance.
4159If a slot of this class is reference, and is unbound, then the parent 4096If a slot of this class is reference, and is unbound, then the parent
4160is checked for a value. 4097is checked for a value.
4161@refill
4162 4098
4163@item :name 4099@item :name
4164Type: @code{string} 4100Type: @code{string}
4165 4101
4166Name of this type of compiler. 4102Name of this type of compiler.
4167@refill
4168 4103
4169@item :variables 4104@item :variables
4170Type: @code{list} 4105Type: @code{list}
@@ -4173,7 +4108,6 @@ Variables needed in the Makefile for this compiler.
4173An assoc list where each element is (VARNAME . VALUE) where VARNAME 4108An assoc list where each element is (VARNAME . VALUE) where VARNAME
4174is a string, and VALUE is either a string, or a list of strings. 4109is a string, and VALUE is either a string, or a list of strings.
4175For example, GCC would define CC=gcc, and emacs would define EMACS=emacs. 4110For example, GCC would define CC=gcc, and emacs would define EMACS=emacs.
4176@refill
4177 4111
4178@item :sourcetype 4112@item :sourcetype
4179Type: @code{list} 4113Type: @code{list}
@@ -4181,7 +4115,6 @@ Type: @code{list}
4181A list of @code{ede-sourcecode} @xref{ede-sourcecode}. objects this class will handle. 4115A list of @code{ede-sourcecode} @xref{ede-sourcecode}. objects this class will handle.
4182This is used to match target objects with the compilers and linkers 4116This is used to match target objects with the compilers and linkers
4183they can use, and which files this object is interested in. 4117they can use, and which files this object is interested in.
4184@refill
4185 4118
4186@item :rules 4119@item :rules
4187Type: @code{list} @* 4120Type: @code{list} @*
@@ -4189,7 +4122,6 @@ Default Value: @code{nil}
4189 4122
4190Auxiliary rules needed for this compiler to run. 4123Auxiliary rules needed for this compiler to run.
4191For example, yacc/lex files need additional chain rules, or inferences. 4124For example, yacc/lex files need additional chain rules, or inferences.
4192@refill
4193 4125
4194@item :commands 4126@item :commands
4195Type: @code{list} 4127Type: @code{list}
@@ -4197,7 +4129,6 @@ Type: @code{list}
4197The commands used to execute this compiler. 4129The commands used to execute this compiler.
4198The object which uses this compiler will place these commands after 4130The object which uses this compiler will place these commands after
4199it's rule definition. 4131it's rule definition.
4200@refill
4201 4132
4202@item :autoconf 4133@item :autoconf
4203Type: @code{list} @* 4134Type: @code{list} @*
@@ -4208,14 +4139,12 @@ When a project is in Automake mode, this defines the autoconf function to
4208call to initialize automake to use this compiler. 4139call to initialize automake to use this compiler.
4209For example, there may be multiple C compilers, but they all probably 4140For example, there may be multiple C compilers, but they all probably
4210use the same autoconf form. 4141use the same autoconf form.
4211@refill
4212 4142
4213@item :objectextention 4143@item :objectextention
4214Type: @code{string} 4144Type: @code{string}
4215 4145
4216A string which is the extension used for object files. 4146A string which is the extension used for object files.
4217For example, C code uses .o on unix, and Emacs Lisp uses .elc. 4147For example, C code uses .o on unix, and Emacs Lisp uses .elc.
4218@refill
4219 4148
4220@end table 4149@end table
4221 4150
@@ -4285,13 +4214,11 @@ Type: @code{eieio-instance-inheritor-child}
4285The parent of this instance. 4214The parent of this instance.
4286If a slot of this class is reference, and is unbound, then the parent 4215If a slot of this class is reference, and is unbound, then the parent
4287is checked for a value. 4216is checked for a value.
4288@refill
4289 4217
4290@item :name 4218@item :name
4291Type: @code{string} 4219Type: @code{string}
4292 4220
4293Name of this type of compiler. 4221Name of this type of compiler.
4294@refill
4295 4222
4296@item :variables 4223@item :variables
4297Type: @code{list} 4224Type: @code{list}
@@ -4300,7 +4227,6 @@ Variables needed in the Makefile for this compiler.
4300An assoc list where each element is (VARNAME . VALUE) where VARNAME 4227An assoc list where each element is (VARNAME . VALUE) where VARNAME
4301is a string, and VALUE is either a string, or a list of strings. 4228is a string, and VALUE is either a string, or a list of strings.
4302For example, GCC would define CC=gcc, and emacs would define EMACS=emacs. 4229For example, GCC would define CC=gcc, and emacs would define EMACS=emacs.
4303@refill
4304 4230
4305@item :sourcetype 4231@item :sourcetype
4306Type: @code{list} 4232Type: @code{list}
@@ -4308,7 +4234,6 @@ Type: @code{list}
4308A list of @code{ede-sourcecode} @xref{ede-sourcecode}. objects this class will handle. 4234A list of @code{ede-sourcecode} @xref{ede-sourcecode}. objects this class will handle.
4309This is used to match target objects with the compilers and linkers 4235This is used to match target objects with the compilers and linkers
4310they can use, and which files this object is interested in. 4236they can use, and which files this object is interested in.
4311@refill
4312 4237
4313@item :commands 4238@item :commands
4314Type: @code{list} 4239Type: @code{list}
@@ -4316,21 +4241,18 @@ Type: @code{list}
4316The commands used to execute this compiler. 4241The commands used to execute this compiler.
4317The object which uses this compiler will place these commands after 4242The object which uses this compiler will place these commands after
4318it's rule definition. 4243it's rule definition.
4319@refill
4320 4244
4321@item :objectextention 4245@item :objectextention
4322Type: @code{string} 4246Type: @code{string}
4323 4247
4324A string which is the extension used for object files. 4248A string which is the extension used for object files.
4325For example, C code uses .o on unix, and Emacs Lisp uses .elc. 4249For example, C code uses .o on unix, and Emacs Lisp uses .elc.
4326@refill
4327 4250
4328@item :makedepends 4251@item :makedepends
4329Type: @code{boolean} @* 4252Type: @code{boolean} @*
4330Default Value: @code{nil} 4253Default Value: @code{nil}
4331 4254
4332Non-@code{nil} if this compiler can make dependencies. 4255Non-@code{nil} if this compiler can make dependencies.
4333@refill
4334 4256
4335@item :uselinker 4257@item :uselinker
4336Type: @code{boolean} @* 4258Type: @code{boolean} @*
@@ -4339,7 +4261,6 @@ Default Value: @code{nil}
4339Non-@code{nil} if this compiler creates code that can be linked. 4261Non-@code{nil} if this compiler creates code that can be linked.
4340This requires that the containing target also define a list of available 4262This requires that the containing target also define a list of available
4341linkers that can be used. 4263linkers that can be used.
4342@refill
4343 4264
4344@end table 4265@end table
4345 4266
@@ -4399,7 +4320,6 @@ Default Value: @code{t}
4399Type: @code{list} 4320Type: @code{list}
4400 4321
4401A variable dedicated to dependency generation. 4322A variable dedicated to dependency generation.
4402@refill
4403@end table 4323@end table
4404@end table 4324@end table
4405 4325
@@ -4439,7 +4359,6 @@ No children
4439Type: @code{string} 4359Type: @code{string}
4440 4360
4441Name of this type of compiler. 4361Name of this type of compiler.
4442@refill
4443 4362
4444@item :variables 4363@item :variables
4445Type: @code{list} 4364Type: @code{list}
@@ -4448,7 +4367,6 @@ Variables needed in the Makefile for this compiler.
4448An assoc list where each element is (VARNAME . VALUE) where VARNAME 4367An assoc list where each element is (VARNAME . VALUE) where VARNAME
4449is a string, and VALUE is either a string, or a list of strings. 4368is a string, and VALUE is either a string, or a list of strings.
4450For example, GCC would define CC=gcc, and emacs would define EMACS=emacs. 4369For example, GCC would define CC=gcc, and emacs would define EMACS=emacs.
4451@refill
4452 4370
4453@item :sourcetype 4371@item :sourcetype
4454Type: @code{list} 4372Type: @code{list}
@@ -4456,7 +4374,6 @@ Type: @code{list}
4456A list of @code{ede-sourcecode} @xref{ede-sourcecode}. objects this class will handle. 4374A list of @code{ede-sourcecode} @xref{ede-sourcecode}. objects this class will handle.
4457This is used to match target objects with the compilers and linkers 4375This is used to match target objects with the compilers and linkers
4458they can use, and which files this object is interested in. 4376they can use, and which files this object is interested in.
4459@refill
4460 4377
4461@item :commands 4378@item :commands
4462Type: @code{list} 4379Type: @code{list}
@@ -4464,14 +4381,12 @@ Type: @code{list}
4464The commands used to execute this compiler. 4381The commands used to execute this compiler.
4465The object which uses this compiler will place these commands after 4382The object which uses this compiler will place these commands after
4466it's rule definition. 4383it's rule definition.
4467@refill
4468 4384
4469@item :objectextention 4385@item :objectextention
4470Type: @code{string} 4386Type: @code{string}
4471 4387
4472A string which is the extension used for object files. 4388A string which is the extension used for object files.
4473For example, C code uses .o on unix, and Emacs Lisp uses .elc. 4389For example, C code uses .o on unix, and Emacs Lisp uses .elc.
4474@refill
4475 4390
4476@end table 4391@end table
4477@end table 4392@end table
diff --git a/doc/misc/eieio.texi b/doc/misc/eieio.texi
index e199417aa9d..5b9f3a8e004 100644
--- a/doc/misc/eieio.texi
+++ b/doc/misc/eieio.texi
@@ -1625,7 +1625,6 @@ inherit from a special class stored in
1625with it, certain default methods or attributes can be added to all 1625with it, certain default methods or attributes can be added to all
1626objects. In CLOS, this would be named @code{STANDARD-CLASS}, and that 1626objects. In CLOS, this would be named @code{STANDARD-CLASS}, and that
1627symbol is an alias to @code{eieio-default-superclass}. 1627symbol is an alias to @code{eieio-default-superclass}.
1628@refill
1629 1628
1630Currently, the default superclass is defined as follows: 1629Currently, the default superclass is defined as follows:
1631 1630
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index bbe741a7a1d..e8fab42b899 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -158,25 +158,25 @@ The following persons have made contributions to Eshell.
158@item 158@item
159Eli Zaretskii made it possible for Eshell to run without requiring 159Eli Zaretskii made it possible for Eshell to run without requiring
160asynchronous subprocess support. This is important for MS-DOS, which 160asynchronous subprocess support. This is important for MS-DOS, which
161does not have such support.@refill 161does not have such support.
162 162
163@item 163@item
164Miles Bader contributed many fixes during the port to Emacs 21.@refill 164Miles Bader contributed many fixes during the port to Emacs 21.
165 165
166@item 166@item
167Stefan Monnier fixed the things which bothered him, which of course made 167Stefan Monnier fixed the things which bothered him, which of course made
168things better for all.@refill 168things better for all.
169 169
170@item 170@item
171Gerd Moellmann also helped to contribute bug fixes during the initial 171Gerd Moellmann also helped to contribute bug fixes during the initial
172integration with Emacs 21.@refill 172integration with Emacs 21.
173 173
174@item 174@item
175Alex Schroeder contributed code for interactively querying the user 175Alex Schroeder contributed code for interactively querying the user
176before overwriting files.@refill 176before overwriting files.
177 177
178@item 178@item
179Sudish Joseph helped with some XEmacs compatibility issues.@refill 179Sudish Joseph helped with some XEmacs compatibility issues.
180@end itemize 180@end itemize
181 181
182Apart from these, a lot of people have sent suggestions, ideas, 182Apart from these, a lot of people have sent suggestions, ideas,
diff --git a/doc/misc/pcl-cvs.texi b/doc/misc/pcl-cvs.texi
index 1276eb95aa8..11123f977a0 100644
--- a/doc/misc/pcl-cvs.texi
+++ b/doc/misc/pcl-cvs.texi
@@ -176,18 +176,18 @@ PCL-CVS as well as all the documentation.
176Inge Wallin wrote the skeleton of 176Inge Wallin wrote the skeleton of
177@file{pcl-cvs.texi}, and gave useful comments on it. He also wrote 177@file{pcl-cvs.texi}, and gave useful comments on it. He also wrote
178the files @file{elib-node.el} and @file{compile-all.el}. The file 178the files @file{elib-node.el} and @file{compile-all.el}. The file
179@file{cookie.el} was inspired by Inge.@refill 179@file{cookie.el} was inspired by Inge.
180 180
181@item 181@item
182@c linus@@lysator.liu.se 182@c linus@@lysator.liu.se
183Linus Tolke contributed useful comments 183Linus Tolke contributed useful comments
184on both the functionality and the documentation.@refill 184on both the functionality and the documentation.
185 185
186@item 186@item
187@c jwz@@jwz.com 187@c jwz@@jwz.com
188Jamie Zawinski contributed 188Jamie Zawinski contributed
189@file{pcl-cvs-lucid.el}, which was later renamed to 189@file{pcl-cvs-lucid.el}, which was later renamed to
190@file{pcl-cvs-xemacs.el}.@refill 190@file{pcl-cvs-xemacs.el}.
191 191
192@item 192@item
193Leif Lonnblad contributed RCVS support (since superseded by the new 193Leif Lonnblad contributed RCVS support (since superseded by the new
@@ -297,7 +297,7 @@ You can move the cursor up and down in the buffer with @kbd{C-n} and
297repository. @xref{Committing changes}. You can also press @kbd{O} to 297repository. @xref{Committing changes}. You can also press @kbd{O} to
298update any of the files that are marked @samp{Need-Update}. You can 298update any of the files that are marked @samp{Need-Update}. You can
299also run @kbd{M-x cvs-update @key{RET}} (bound to @kbd{M-u} in the 299also run @kbd{M-x cvs-update @key{RET}} (bound to @kbd{M-u} in the
300@samp{*cvs*} buffer) to update all the files.@refill 300@samp{*cvs*} buffer) to update all the files.
301 301
302You can then press @kbd{=} to easily get a @samp{diff} between your 302You can then press @kbd{=} to easily get a @samp{diff} between your
303modified file and the base version that you started from, or you can 303modified file and the base version that you started from, or you can
@@ -324,7 +324,7 @@ how we got to the current state, for example @samp{patched},
324 324
325@item 325@item
326An asterisk when the file is @dfn{marked} (@pxref{Selected 326An asterisk when the file is @dfn{marked} (@pxref{Selected
327files}).@refill 327files}).
328 328
329@item 329@item
330The actual status of the file wrt the repository. See below. 330The actual status of the file wrt the repository. See below.
@@ -350,7 +350,7 @@ the following substatus:
350@item merged 350@item merged
351The file was modified in your working directory, and there were 351The file was modified in your working directory, and there were
352modifications in the repository as well, but they were merged 352modifications in the repository as well, but they were merged
353successfully, without conflict, in your working directory.@refill 353successfully, without conflict, in your working directory.
354@end table 354@end table
355 355
356@item Conflict 356@item Conflict
@@ -360,7 +360,7 @@ working directory) is now the output of the @code{rcsmerge} command on
360the two versions; an unmodified copy of your file is also in your 360the two versions; an unmodified copy of your file is also in your
361working directory, with the name @file{.#@var{file}.@var{version}}, 361working directory, with the name @file{.#@var{file}.@var{version}},
362where @var{version} is the RCS revision that your modified file started 362where @var{version} is the RCS revision that your modified file started
363from. @xref{Viewing differences}, for more details.@refill 363from. @xref{Viewing differences}, for more details.
364 364
365A conflict can also come from a disagreement on the existence of the file 365A conflict can also come from a disagreement on the existence of the file
366rather than on its content. This case is indicated by the following 366rather than on its content. This case is indicated by the following
@@ -382,17 +382,17 @@ repository.
382 382
383@item Added 383@item Added
384The file has been added by you, but it still needs to be checked in to 384The file has been added by you, but it still needs to be checked in to
385the repository.@refill 385the repository.
386 386
387@item Removed 387@item Removed
388The file has been removed by you, but it still needs to be checked in to 388The file has been removed by you, but it still needs to be checked in to
389the repository. You can resurrect it by typing @kbd{a} (@pxref{Adding 389the repository. You can resurrect it by typing @kbd{a} (@pxref{Adding
390and removing files}).@refill 390and removing files}).
391 391
392@item Unknown 392@item Unknown
393A file that was detected in your directory, but that neither appears in 393A file that was detected in your directory, but that neither appears in
394the repository, nor is present on the list of files that CVS should 394the repository, nor is present on the list of files that CVS should
395ignore.@refill 395ignore.
396 396
397@item Up-to-date 397@item Up-to-date
398The file is up to date with respect to the version in the repository. 398The file is up to date with respect to the version in the repository.
@@ -400,29 +400,29 @@ This status can have a substatus of:
400 400
401@table @samp 401@table @samp
402@item added 402@item added
403You have just added the file to the repository.@refill 403You have just added the file to the repository.
404 404
405@item updated 405@item updated
406The file was brought up to date with respect to the repository. This is 406The file was brought up to date with respect to the repository. This is
407done for any file that exists in the repository but not in your source, 407done for any file that exists in the repository but not in your source,
408and for files that you haven't changed but are not the most recent 408and for files that you haven't changed but are not the most recent
409versions available in the repository.@refill 409versions available in the repository.
410 410
411@item patched 411@item patched
412The file was brought up to date with respect to the remote repository by 412The file was brought up to date with respect to the remote repository by
413way of fetching and applying a patch to the file in your source. This 413way of fetching and applying a patch to the file in your source. This
414is equivalent to @samp{updated} except that CVS decided to use a hopefully 414is equivalent to @samp{updated} except that CVS decided to use a hopefully
415more efficient method.@refill 415more efficient method.
416 416
417@item committed 417@item committed
418You just committed the file.@refill 418You just committed the file.
419@end table 419@end table
420 420
421@item Need-Update 421@item Need-Update
422Either a newer version than the one in your source is available in the 422Either a newer version than the one in your source is available in the
423repository and you have not modified your checked out version, or the 423repository and you have not modified your checked out version, or the
424file exists in the repository but not in your source. Use 424file exists in the repository but not in your source. Use
425@samp{cvs-mode-update} bound to @kbd{O} to update the file.@refill 425@samp{cvs-mode-update} bound to @kbd{O} to update the file.
426 426
427@item Need-Merge 427@item Need-Merge
428You have modified the checked out version of the file, and a newer 428You have modified the checked out version of the file, and a newer
@@ -610,11 +610,11 @@ explicitly. The special prefixes are:
610 610
611@table @kbd 611@table @kbd
612@item T 612@item T
613Toggles whether or not marks will be active in the next command.@refill 613Toggles whether or not marks will be active in the next command.
614 614
615@item b 615@item b
616Provide the next command with a branch (can be any version 616Provide the next command with a branch (can be any version
617specifier) to work on.@refill 617specifier) to work on.
618 618
619@item B 619@item B
620Secondary branch argument. Only meaningful if @kbd{b} is also used. 620Secondary branch argument. Only meaningful if @kbd{b} is also used.
@@ -640,13 +640,13 @@ to update the display:
640 640
641@table @kbd 641@table @kbd
642@item M-u 642@item M-u
643Runs the command @samp{cvs-update}.@refill 643Runs the command @samp{cvs-update}.
644 644
645@item M-e 645@item M-e
646Runs the command @samp{cvs-examine}.@refill 646Runs the command @samp{cvs-examine}.
647 647
648@item M-s 648@item M-s
649Runs the command @samp{cvs-status}.@refill 649Runs the command @samp{cvs-status}.
650@end table 650@end table
651 651
652In addition to the above commands which operate on the whole module, 652In addition to the above commands which operate on the whole module,
@@ -656,18 +656,18 @@ files/directories with these keys:
656@table @kbd 656@table @kbd
657@item O 657@item O
658Runs @code{cvs-mode-update} on the selected files. When run on the 658Runs @code{cvs-mode-update} on the selected files. When run on the
659top-level directory, this is equivalent to @kbd{M-u}.@refill 659top-level directory, this is equivalent to @kbd{M-u}.
660 660
661@item e 661@item e
662Runs @code{cvs-mode-examine} on the selected files. When run on the 662Runs @code{cvs-mode-examine} on the selected files. When run on the
663top-level directory, this is equivalent to @kbd{M-e}.@refill 663top-level directory, this is equivalent to @kbd{M-e}.
664 664
665@findex cvs-status-mode 665@findex cvs-status-mode
666@item s 666@item s
667Runs @code{cvs-mode-status} on the selected files. When run on the 667Runs @code{cvs-mode-status} on the selected files. When run on the
668top-level directory, this is equivalent to @kbd{M-s}, except that 668top-level directory, this is equivalent to @kbd{M-s}, except that
669CVS output will be shown in a @samp{*cvs-info*} buffer that will be 669CVS output will be shown in a @samp{*cvs-info*} buffer that will be
670put in @samp{cvs-status-mode}.@refill 670put in @samp{cvs-status-mode}.
671@end table 671@end table
672 672
673 673
@@ -689,7 +689,7 @@ the fact that the buffer is a PCL-CVS buffer:
689@item @key{SPC} 689@item @key{SPC}
690@itemx n 690@itemx n
691These keys move the cursor one file forward, towards the end of the 691These keys move the cursor one file forward, towards the end of the
692buffer (@code{cvs-mode-next-line}).@refill 692buffer (@code{cvs-mode-next-line}).
693 693
694@item p 694@item p
695This key moves one file backward, towards the beginning of the buffer 695This key moves one file backward, towards the beginning of the buffer
@@ -725,12 +725,12 @@ You can mark and unmark files with these commands:
725@item m 725@item m
726This marks the file that the cursor is positioned on. If the cursor is 726This marks the file that the cursor is positioned on. If the cursor is
727positioned on a directory all files in that directory are marked 727positioned on a directory all files in that directory are marked
728(@code{cvs-mode-mark}).@refill 728(@code{cvs-mode-mark}).
729 729
730@item u 730@item u
731Unmark the file that the cursor is positioned on. If the cursor is on a 731Unmark the file that the cursor is positioned on. If the cursor is on a
732directory, all files in that directory are unmarked 732directory, all files in that directory are unmarked
733(@code{cvs-mode-unmark}).@refill 733(@code{cvs-mode-unmark}).
734 734
735@item M 735@item M
736Mark @emph{all} files in the buffer (@code{cvs-mode-mark-all-files}). 736Mark @emph{all} files in the buffer (@code{cvs-mode-mark-all-files}).
@@ -774,7 +774,7 @@ Committing changes basically works as follows:
774@item 774@item
775After having selected the files you want to commit, you type either 775After having selected the files you want to commit, you type either
776@kbd{c} or @kbd{C} which brings up a special buffer 776@kbd{c} or @kbd{C} which brings up a special buffer
777@samp{*cvs-commit*}.@refill 777@samp{*cvs-commit*}.
778 778
779@item 779@item
780You type in the log message describing the changes you're about to 780You type in the log message describing the changes you're about to
@@ -782,7 +782,7 @@ commit (@pxref{Log Edit Mode}).
782 782
783@item 783@item
784When you're happy with it, you type @kbd{C-c C-c} to do the actual 784When you're happy with it, you type @kbd{C-c C-c} to do the actual
785commit.@refill 785commit.
786@end enumerate 786@end enumerate
787 787
788There's no hidden state, so you can abort the process or pick it up 788There's no hidden state, so you can abort the process or pick it up
@@ -841,13 +841,13 @@ the cursor points to a directory, run @code{dired} on that directory;
841 841
842@item o 842@item o
843Like @kbd{f}, but use another window 843Like @kbd{f}, but use another window
844(@code{cvs-mode-find-file-other-window}).@refill 844(@code{cvs-mode-find-file-other-window}).
845 845
846@item A 846@item A
847Invoke @samp{add-change-log-entry-other-window} to edit a 847Invoke @samp{add-change-log-entry-other-window} to edit a
848@file{ChangeLog} file. The @file{ChangeLog} file will be found in the 848@file{ChangeLog} file. The @file{ChangeLog} file will be found in the
849directory of the file the cursor points to, or in a parent of that 849directory of the file the cursor points to, or in a parent of that
850directory (@code{cvs-mode-add-change-log-entry-other-window}).@refill 850directory (@code{cvs-mode-add-change-log-entry-other-window}).
851@end table 851@end table
852 852
853 853
@@ -897,7 +897,7 @@ Add all selected files. This command can be used on @samp{Unknown}
897files (@pxref{Buffer contents}). The status of the file will change to 897files (@pxref{Buffer contents}). The status of the file will change to
898@samp{Added}, and you will have to use @kbd{c} (@samp{cvs-mode-commit} 898@samp{Added}, and you will have to use @kbd{c} (@samp{cvs-mode-commit}
899@pxref{Committing changes}), to really add the file to the 899@pxref{Committing changes}), to really add the file to the
900repository.@refill 900repository.
901 901
902This command can also be used on @samp{Removed} files (before you commit 902This command can also be used on @samp{Removed} files (before you commit
903them) to resurrect them. 903them) to resurrect them.
@@ -911,7 +911,7 @@ confirmation). The files are deleted from your directory and
911also be @samp{cvs remove}d. If the files' status was @samp{Unknown} 911also be @samp{cvs remove}d. If the files' status was @samp{Unknown}
912they will disappear from the buffer. Otherwise their status will change to 912they will disappear from the buffer. Otherwise their status will change to
913@samp{Removed}, and you must use @kbd{c} (@samp{cvs-mode-commit}, 913@samp{Removed}, and you must use @kbd{c} (@samp{cvs-mode-commit},
914@pxref{Committing changes}) to commit the removal.@refill 914@pxref{Committing changes}) to commit the removal.
915 915
916The command that is run is @code{cvs-mode-remove-file}. 916The command that is run is @code{cvs-mode-remove-file}.
917@end table 917@end table
@@ -957,7 +957,7 @@ get an overview of what needs to be done.
957@vindex cvs-mode-remove-handled@r{ (variable)} 957@vindex cvs-mode-remove-handled@r{ (variable)}
958@kbd{x} invokes @code{cvs-mode-remove-handled}. If 958@kbd{x} invokes @code{cvs-mode-remove-handled}. If
959@samp{cvs-auto-remove-handled} is set to non-@code{nil}, this will 959@samp{cvs-auto-remove-handled} is set to non-@code{nil}, this will
960automatically be performed after every commit.@refill 960automatically be performed after every commit.
961 961
962@item C-k 962@item C-k
963This command can be used for lines that @samp{cvs-mode-remove-handled} would 963This command can be used for lines that @samp{cvs-mode-remove-handled} would
@@ -1008,22 +1008,22 @@ This runs @code{cvs-mode-ignore}.
1008@item = 1008@item =
1009@itemx d = 1009@itemx d =
1010Display a @samp{cvs diff} between the selected files and the version 1010Display a @samp{cvs diff} between the selected files and the version
1011that they are based on (@code{cvs-mode-diff}).@refill 1011that they are based on (@code{cvs-mode-diff}).
1012 1012
1013@item d b 1013@item d b
1014If CVS finds a conflict while merging two versions of a file (during a 1014If CVS finds a conflict while merging two versions of a file (during a
1015@samp{cvs update}, @pxref{Updating the buffer}) it will save the 1015@samp{cvs update}, @pxref{Updating the buffer}) it will save the
1016original file in a file called @file{.#@var{file}.@var{version}} where 1016original file in a file called @file{.#@var{file}.@var{version}} where
1017@var{file} is the name of the file, and @var{version} is the revision 1017@var{file} is the name of the file, and @var{version} is the revision
1018number that @var{file} was based on.@refill 1018number that @var{file} was based on.
1019 1019
1020With the @kbd{d b} command you can run a @samp{diff} on the files 1020With the @kbd{d b} command you can run a @samp{diff} on the files
1021@file{.#@var{file}.@var{version}} and @file{@var{file}}.@refill 1021@file{.#@var{file}.@var{version}} and @file{@var{file}}.
1022 1022
1023@item d h 1023@item d h
1024Display a @samp{cvs diff} between the selected files and the head 1024Display a @samp{cvs diff} between the selected files and the head
1025revision (the most recent version on the current 1025revision (the most recent version on the current
1026branch) in the repository (@code{cvs-mode-diff-head}).@refill 1026branch) in the repository (@code{cvs-mode-diff-head}).
1027 1027
1028@item d r 1028@item d r
1029Display a @samp{cvs diff} between the base revision of the selected 1029Display a @samp{cvs diff} between the base revision of the selected
@@ -1035,12 +1035,12 @@ a checkout, update or commit operation
1035@item d v 1035@item d v
1036Display a @samp{cvs diff} between the selected files and the head 1036Display a @samp{cvs diff} between the selected files and the head
1037revision of the vendor branch in the repository 1037revision of the vendor branch in the repository
1038(@code{cvs-mode-diff-vendor}).@refill 1038(@code{cvs-mode-diff-vendor}).
1039 1039
1040@item d y 1040@item d y
1041Display a @samp{cvs diff} between the selected files and yesterday's 1041Display a @samp{cvs diff} between the selected files and yesterday's
1042head revision in the repository 1042head revision in the repository
1043(@code{cvs-mode-diff-yesterday}).@refill 1043(@code{cvs-mode-diff-yesterday}).
1044@end table 1044@end table
1045 1045
1046By default, @samp{diff} commands ignore the marks. This can be changed 1046By default, @samp{diff} commands ignore the marks. This can be changed
@@ -1075,7 +1075,7 @@ to do an interactive 3-way merge.
1075CVS has already performed a merge. The resulting file is not used in 1075CVS has already performed a merge. The resulting file is not used in
1076any way if you use this command. If you use the @kbd{q} command inside 1076any way if you use this command. If you use the @kbd{q} command inside
1077@samp{ediff} (to successfully terminate a merge) the file that CVS 1077@samp{ediff} (to successfully terminate a merge) the file that CVS
1078created will be overwritten.@refill 1078created will be overwritten.
1079@end table 1079@end table
1080 1080
1081@node Updating files 1081@node Updating files
@@ -1247,24 +1247,24 @@ argument, these commands move that many messages of files.
1247 1247
1248If you have an idea about any customization that would be handy but 1248If you have an idea about any customization that would be handy but
1249isn't present in this list, please tell us! 1249isn't present in this list, please tell us!
1250For info on how to reach us, see @ref{Bugs}.@refill 1250For info on how to reach us, see @ref{Bugs}.
1251 1251
1252@table @samp 1252@table @samp
1253@item cvs-auto-remove-handled 1253@item cvs-auto-remove-handled
1254If this variable is set to any non-@code{nil} value, 1254If this variable is set to any non-@code{nil} value,
1255@samp{cvs-mode-remove-handled} will be called every time you check in 1255@samp{cvs-mode-remove-handled} will be called every time you check in
1256files, after the check-in is ready. @xref{Removing handled 1256files, after the check-in is ready. @xref{Removing handled
1257entries}.@refill 1257entries}.
1258 1258
1259@item cvs-auto-remove-directories 1259@item cvs-auto-remove-directories
1260If this variable is set to any non-@code{nil} value, directories that do 1260If this variable is set to any non-@code{nil} value, directories that do
1261not contain any files to be checked in will not be listed in the 1261not contain any files to be checked in will not be listed in the
1262@samp{*cvs*} buffer.@refill 1262@samp{*cvs*} buffer.
1263 1263
1264@item cvs-auto-revert 1264@item cvs-auto-revert
1265If this variable is set to any non-@samp{nil} value any buffers you have 1265If this variable is set to any non-@samp{nil} value any buffers you have
1266that visit a file that is committed will be automatically reverted. 1266that visit a file that is committed will be automatically reverted.
1267This variable defaults to @samp{t}. @xref{Committing changes}.@refill 1267This variable defaults to @samp{t}. @xref{Committing changes}.
1268 1268
1269@item cvs-update-prog-output-skip-regexp 1269@item cvs-update-prog-output-skip-regexp
1270The @samp{-u} flag in the @file{modules} file can be used to run a command 1270The @samp{-u} flag in the @file{modules} file can be used to run a command
diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi
index aa0752c80cd..11dbf2eda5e 100644
--- a/doc/misc/sc.texi
+++ b/doc/misc/sc.texi
@@ -146,7 +146,7 @@ Supercite should provide them. For example, many people would like to
146be able to yank (and cite) only a portion of the original message. 146be able to yank (and cite) only a portion of the original message.
147Since Supercite only modifies the text it finds in the reply buffer as 147Since Supercite only modifies the text it finds in the reply buffer as
148set up by the MUA, it is the MUA's responsibility to do partial yanking. 148set up by the MUA, it is the MUA's responsibility to do partial yanking.
149@xref{Reply Buffer Initialization}.@refill 149@xref{Reply Buffer Initialization}.
150 150
151@vindex mail-header-separator 151@vindex mail-header-separator
152Another potentially useful thing would be for Supercite to set up the 152Another potentially useful thing would be for Supercite to set up the
@@ -156,7 +156,7 @@ But by previously agreed upon convention, any text above the
156bodies cannot be modified by Supercite. Supercite, in fact, doesn't 156bodies cannot be modified by Supercite. Supercite, in fact, doesn't
157know anything about the meaning of these headers, and never ventures 157know anything about the meaning of these headers, and never ventures
158outside the designated region. @xref{Hints to MUA Authors}, for more 158outside the designated region. @xref{Hints to MUA Authors}, for more
159details.@refill 159details.
160 160
161@node What Supercite Does 161@node What Supercite Does
162@section What Supercite Does 162@section What Supercite Does
@@ -168,14 +168,14 @@ by calling a hook variable to which Supercite's top-level function
168@code{sc-cite-original} has been added. When @code{sc-cite-original} is 168@code{sc-cite-original} has been added. When @code{sc-cite-original} is
169executed, the original message must be set up in a very specific way, 169executed, the original message must be set up in a very specific way,
170but this is handled automatically by the MUA@. @xref{Hints to MUA 170but this is handled automatically by the MUA@. @xref{Hints to MUA
171Authors}.@refill 171Authors}.
172 172
173@cindex info alist 173@cindex info alist
174The first thing Supercite does, via @code{sc-cite-original}, is to parse 174The first thing Supercite does, via @code{sc-cite-original}, is to parse
175through the original message's mail headers. It saves this data in an 175through the original message's mail headers. It saves this data in an
176@dfn{information association list}, or @dfn{info alist}. The information 176@dfn{information association list}, or @dfn{info alist}. The information
177in this list is used in a number of places throughout Supercite. 177in this list is used in a number of places throughout Supercite.
178@xref{Information Keys and the Info Alist}.@refill 178@xref{Information Keys and the Info Alist}.
179 179
180@cindex nuking mail headers 180@cindex nuking mail headers
181@cindex reference header 181@cindex reference header
@@ -207,7 +207,7 @@ Supercited text and will fill them appropriately. Emacs's built-in
207filling routines, e.g., @code{fill-paragraph}, do not recognize cited 207filling routines, e.g., @code{fill-paragraph}, do not recognize cited
208text and will not re-fill them properly because it cannot guess the 208text and will not re-fill them properly because it cannot guess the
209@code{fill-prefix} being used. 209@code{fill-prefix} being used.
210@xref{Post-yank Formatting Commands}, for details.@refill 210@xref{Post-yank Formatting Commands}, for details.
211 211
212As mentioned above, Supercite provides commands to recite or uncite 212As mentioned above, Supercite provides commands to recite or uncite
213regions of text in the reply buffer, and commands to perform other 213regions of text in the reply buffer, and commands to perform other
@@ -216,7 +216,7 @@ informative citations throughout. Supercite tries to be as configurable
216as possible to allow for a wide range of personalized citation styles, 216as possible to allow for a wide range of personalized citation styles,
217but it is also immediately useful with the default configuration, once 217but it is also immediately useful with the default configuration, once
218it has been properly connected to your MUA@. @xref{Getting Connected}, 218it has been properly connected to your MUA@. @xref{Getting Connected},
219for more details.@refill 219for more details.
220 220
221@node Citations 221@node Citations
222@chapter Citations 222@chapter Citations
@@ -304,7 +304,7 @@ string containing four spaces.
304The @dfn{attribution string}. This element is supplied automatically by 304The @dfn{attribution string}. This element is supplied automatically by
305Supercite, based on your preferences and the original message's mail 305Supercite, based on your preferences and the original message's mail
306headers, though you may be asked to confirm Supercite's choice. 306headers, though you may be asked to confirm Supercite's choice.
307@xref{Selecting an Attribution}, for more details.@refill 307@xref{Selecting an Attribution}, for more details.
308 308
309@cindex citation delimiter 309@cindex citation delimiter
310@vindex sc-citation-delimiter 310@vindex sc-citation-delimiter
@@ -330,7 +330,7 @@ In this case, the composed, non-nested citation string used might be
330something like 330something like
331@code{@asis{" Jane> "}}. 331@code{@asis{" Jane> "}}.
332This citation string will be inserted in front of 332This citation string will be inserted in front of
333every line in the original message that is not already cited.@refill 333every line in the original message that is not already cited.
334 334
335Nested citations, being simpler than non-nested citations, are composed 335Nested citations, being simpler than non-nested citations, are composed
336of the same elements, sans the attribution string. Supercite is smart 336of the same elements, sans the attribution string. Supercite is smart
@@ -379,7 +379,7 @@ non-nested citation. Thus the variable
379@code{sc-citation-nonnested-root-regexp} is used to describe only 379@code{sc-citation-nonnested-root-regexp} is used to describe only
380non-nested citation roots. It is important to remember that if you 380non-nested citation roots. It is important to remember that if you
381change @code{sc-citation-root-regexp} you should always also change 381change @code{sc-citation-root-regexp} you should always also change
382@code{sc-citation-nonnested-root-regexp}.@refill 382@code{sc-citation-nonnested-root-regexp}.
383 383
384@node Information Keys and the Info Alist 384@node Information Keys and the Info Alist
385@chapter Information Keys and the Info Alist 385@chapter Information Keys and the Info Alist
@@ -400,7 +400,7 @@ In the case of mail fields, the key is the name of the field, omitting
400the trailing colon. Info keys are always case insensitive (as are 400the trailing colon. Info keys are always case insensitive (as are
401mail headers), and the value for a corresponding key can be retrieved 401mail headers), and the value for a corresponding key can be retrieved
402from the alist with the @code{sc-mail-field} function. Thus, if the 402from the alist with the @code{sc-mail-field} function. Thus, if the
403following fields were present in the original article:@refill 403following fields were present in the original article:
404 404
405@example 405@example
406Date:@: 08 April 1991, 17:32:09 EST 406Date:@: 08 April 1991, 17:32:09 EST
@@ -489,7 +489,7 @@ the author's first middle name.
489 489
490If the author's name has more than one middle name, they will appear as 490If the author's name has more than one middle name, they will appear as
491info keys with the appropriate index (e.g., @code{"sc-middlename-2"}, 491info keys with the appropriate index (e.g., @code{"sc-middlename-2"},
492@dots{}). @xref{Selecting an Attribution}.@refill 492@dots{}). @xref{Selecting an Attribution}.
493 493
494@node Reference Headers 494@node Reference Headers
495@chapter Reference Headers 495@chapter Reference Headers
@@ -540,7 +540,7 @@ examples below as @var{infokey} indicates that the corresponding value
540of the info key from the info alist will be inserted there. 540of the info key from the info alist will be inserted there.
541(@pxref{Information Keys and the Info Alist}). For example, in @code{sc-header-on-said} 541(@pxref{Information Keys and the Info Alist}). For example, in @code{sc-header-on-said}
542below, @var{date} and @var{from} correspond to the values of the 542below, @var{date} and @var{from} correspond to the values of the
543@samp{Date:@:} and @samp{From:@:} mail headers respectively.@refill 543@samp{Date:@:} and @samp{From:@:} mail headers respectively.
544 544
545@vindex sc-reference-tag-string 545@vindex sc-reference-tag-string
546@vindex reference-tag-string (sc-) 546@vindex reference-tag-string (sc-)
@@ -650,7 +650,7 @@ The following commands are available while in electric reference mode
650Displays the next reference header in the electric reference buffer. If 650Displays the next reference header in the electric reference buffer. If
651the variable @code{sc-electric-circular-p} is non-@code{nil}, invoking 651the variable @code{sc-electric-circular-p} is non-@code{nil}, invoking
652@code{sc-eref-next} while viewing the last reference header in the list 652@code{sc-eref-next} while viewing the last reference header in the list
653will wrap around to the first header.@refill 653will wrap around to the first header.
654 654
655@item @code{sc-eref-prev} (@kbd{p}) 655@item @code{sc-eref-prev} (@kbd{p})
656@findex sc-eref-prev 656@findex sc-eref-prev
@@ -658,7 +658,7 @@ will wrap around to the first header.@refill
658@kindex p 658@kindex p
659Displays the previous reference header in the electric reference buffer. 659Displays the previous reference header in the electric reference buffer.
660If the variable @code{sc-electric-circular-p} is non-@code{nil}, 660If the variable @code{sc-electric-circular-p} is non-@code{nil},
661invoking @code{sc-eref-prev} will wrap around to the last header.@refill 661invoking @code{sc-eref-prev} will wrap around to the last header.
662 662
663@item @code{sc-eref-goto} (@kbd{g}) 663@item @code{sc-eref-goto} (@kbd{g})
664@findex sc-eref-goto 664@findex sc-eref-goto
@@ -667,7 +667,7 @@ invoking @code{sc-eref-prev} will wrap around to the last header.@refill
667Goes to a specified reference header. The index (into the 667Goes to a specified reference header. The index (into the
668@code{sc-rewrite-header-list}) can be specified as a numeric argument to 668@code{sc-rewrite-header-list}) can be specified as a numeric argument to
669the command. Otherwise, Supercite will query you for the index in the 669the command. Otherwise, Supercite will query you for the index in the
670minibuffer.@refill 670minibuffer.
671 671
672@item @code{sc-eref-jump} (@kbd{j}) 672@item @code{sc-eref-jump} (@kbd{j})
673@findex sc-eref-jump 673@findex sc-eref-jump
@@ -681,7 +681,7 @@ value of @code{sc-preferred-header-style}.
681@findex eref-setn (sc-) 681@findex eref-setn (sc-)
682@kindex s 682@kindex s
683Set the preferred reference header (i.e., 683Set the preferred reference header (i.e.,
684@code{sc-preferred-header-style}) to the currently displayed header.@refill 684@code{sc-preferred-header-style}) to the currently displayed header.
685 685
686@item @code{sc-eref-exit} (@kbd{C-j}, @key{RET}, and @key{ESC C-c}) 686@item @code{sc-eref-exit} (@kbd{C-j}, @key{RET}, and @key{ESC C-c})
687@kindex RET 687@kindex RET
@@ -690,7 +690,7 @@ Set the preferred reference header (i.e.,
690@findex sc-eref-exit 690@findex sc-eref-exit
691@findex eref-exit (sc-) 691@findex eref-exit (sc-)
692Exit from electric reference mode and insert the current header into the 692Exit from electric reference mode and insert the current header into the
693reply buffer.@refill 693reply buffer.
694 694
695@item @code{sc-eref-abort} (@kbd{q}, @kbd{x}) 695@item @code{sc-eref-abort} (@kbd{q}, @kbd{x})
696@findex sc-eref-abort 696@findex sc-eref-abort
@@ -729,7 +729,7 @@ hook variable has a @code{nil} value, which the MUA recognizes to mean,
729``use your default citation function.'' When you add Supercite's 729``use your default citation function.'' When you add Supercite's
730citation function to the hook, thereby giving the variable a 730citation function to the hook, thereby giving the variable a
731non-@code{nil} value, it tells the MUA to run the hook via 731non-@code{nil} value, it tells the MUA to run the hook via
732@code{run-hooks} instead of using the default citation.@refill 732@code{run-hooks} instead of using the default citation.
733 733
734Early in Supercite's development, the Supercite author, a few MUA 734Early in Supercite's development, the Supercite author, a few MUA
735authors, and some early Supercite users got together and agreed upon a 735authors, and some early Supercite users got together and agreed upon a
@@ -767,7 +767,7 @@ expects the original article's mail headers to be present within this
767region. Note that Supercite @emph{never} touches any text outside this 767region. Note that Supercite @emph{never} touches any text outside this
768region. Note further that the region need not be active 768region. Note further that the region need not be active
769for @code{sc-cite-original} to do its job. 769for @code{sc-cite-original} to do its job.
770@xref{Hints to MUA Authors}.@refill 770@xref{Hints to MUA Authors}.
771 771
772The other step in the getting connected process is to make sure your 772The other step in the getting connected process is to make sure your
773MUA calls @code{sc-cite-original} at the right time. As mentioned 773MUA calls @code{sc-cite-original} at the right time. As mentioned
@@ -784,7 +784,7 @@ this hook since it is only run once. This will not work, however, if
784your Emacs maintainer has put Supercite into your dumped Emacs image. 784your Emacs maintainer has put Supercite into your dumped Emacs image.
785In that case, you can use the @code{sc-pre-hook} variable, but this will 785In that case, you can use the @code{sc-pre-hook} variable, but this will
786get executed every time @code{sc-cite-original} is called. @xref{Reply 786get executed every time @code{sc-cite-original} is called. @xref{Reply
787Buffer Initialization}.@refill 787Buffer Initialization}.
788 788
789@node Replying and Yanking 789@node Replying and Yanking
790@chapter Replying and Yanking 790@chapter Replying and Yanking
@@ -814,7 +814,7 @@ This hook variable is run before @code{sc-cite-original} does any other
814work. You could conceivably use this hook to set certain Supercite 814work. You could conceivably use this hook to set certain Supercite
815variables based on the reply buffer's mode or name (i.e., to do 815variables based on the reply buffer's mode or name (i.e., to do
816something different based on whether you are replying or following up to 816something different based on whether you are replying or following up to
817an article).@refill 817an article).
818 818
819@item 819@item
820@emph{Inserts Supercite's keymap.} 820@emph{Inserts Supercite's keymap.}
@@ -942,7 +942,7 @@ there as people on the net, or just about! It would be impossible for
942Supercite to anticipate every style in existence, and you probably 942Supercite to anticipate every style in existence, and you probably
943wouldn't encounter them all anyway. But you can configure Supercite to 943wouldn't encounter them all anyway. But you can configure Supercite to
944recognize those styles you see often. 944recognize those styles you see often.
945@xref{Configuring the Citation Engine}, for details.@refill 945@xref{Configuring the Citation Engine}, for details.
946 946
947@item 947@item
948@emph{Runs @code{sc-post-hook}.} 948@emph{Runs @code{sc-post-hook}.}
@@ -951,7 +951,7 @@ recognize those styles you see often.
951This variable is very similar to @code{sc-pre-hook}, except that it runs 951This variable is very similar to @code{sc-pre-hook}, except that it runs
952after @code{sc-cite-original} is finished. This hook is provided mostly 952after @code{sc-cite-original} is finished. This hook is provided mostly
953for completeness and backward compatibility. Perhaps it could be used to 953for completeness and backward compatibility. Perhaps it could be used to
954reset certain variables set in @code{sc-pre-hook}.@refill 954reset certain variables set in @code{sc-pre-hook}.
955@end enumerate 955@end enumerate
956 956
957@node Filling Cited Text 957@node Filling Cited Text
@@ -987,7 +987,7 @@ setup.
987Also, Supercite will collapse leading whitespace between the citation 987Also, Supercite will collapse leading whitespace between the citation
988string and the text on a line when the variable 988string and the text on a line when the variable
989@code{sc-fixup-whitespace-p} is non-@code{nil}. The default value for 989@code{sc-fixup-whitespace-p} is non-@code{nil}. The default value for
990this variable is @code{nil}.@refill 990this variable is @code{nil}.
991 991
992@vindex fill-prefix 992@vindex fill-prefix
993Its important to understand that Supercite's automatic filling (during 993Its important to understand that Supercite's automatic filling (during
@@ -1005,7 +1005,7 @@ When Supercite's automatic filling breaks on a particular message, I
1005will use Emacs's undo feature to undo back before the citation was 1005will use Emacs's undo feature to undo back before the citation was
1006applied to the original message. Then I'll toggle the variables and 1006applied to the original message. Then I'll toggle the variables and
1007manually cite those paragraphs that I don't want to fill or collapse 1007manually cite those paragraphs that I don't want to fill or collapse
1008whitespace on. @xref{Variable Toggling Shortcuts}.@refill 1008whitespace on. @xref{Variable Toggling Shortcuts}.
1009 1009
1010@kindex C-c C-p C-p 1010@kindex C-c C-p C-p
1011If you find that Supercite's automatic filling is just too fragile for 1011If you find that Supercite's automatic filling is just too fragile for
@@ -1013,7 +1013,7 @@ your tastes, you might consider one of these alternate approaches.
1013Also, to make life easier, a shortcut function to toggle the state of 1013Also, to make life easier, a shortcut function to toggle the state of
1014both of these variables is provided on the key binding 1014both of these variables is provided on the key binding
1015@kbd{C-c C-p C-p} (with the default value of @code{sc-mode-map-prefix}; 1015@kbd{C-c C-p C-p} (with the default value of @code{sc-mode-map-prefix};
1016@pxref{Post-yank Formatting Commands}).@refill 1016@pxref{Post-yank Formatting Commands}).
1017 1017
1018You will noticed that the minor mode string will 1018You will noticed that the minor mode string will
1019show the state of these variables as qualifier characters. When both 1019show the state of these variables as qualifier characters. When both
@@ -1025,7 +1025,7 @@ string will display @samp{SC:f}, and when just
1025display @samp{SC:fw}. Note that the qualifiers chosen are mnemonics for 1025display @samp{SC:fw}. Note that the qualifiers chosen are mnemonics for
1026the default bindings of the toggling function for each respective 1026the default bindings of the toggling function for each respective
1027variable. 1027variable.
1028@xref{Variable Toggling Shortcuts}.@refill 1028@xref{Variable Toggling Shortcuts}.
1029 1029
1030Why are these variables not set to @code{nil} by default? It is because 1030Why are these variables not set to @code{nil} by default? It is because
1031many users won't manually fill paragraphs that are Supercited, and there 1031many users won't manually fill paragraphs that are Supercited, and there
@@ -1088,7 +1088,7 @@ the author's first middle name.
1088 1088
1089@item "sc-lastchoice" 1089@item "sc-lastchoice"
1090the last attribution string you have selected. This is useful when you 1090the last attribution string you have selected. This is useful when you
1091recite paragraphs in the reply.@refill 1091recite paragraphs in the reply.
1092 1092
1093@item "sc-consult" 1093@item "sc-consult"
1094@vindex sc-attrib-selection-list 1094@vindex sc-attrib-selection-list
@@ -1099,7 +1099,7 @@ key. See below for details.
1099 1099
1100@item "x-attribution" 1100@item "x-attribution"
1101the original author's suggestion for attribution string choice. See below 1101the original author's suggestion for attribution string choice. See below
1102for details.@refill 1102for details.
1103@end table 1103@end table
1104 1104
1105Middle name indexes can be any positive integer greater than zero, 1105Middle name indexes can be any positive integer greater than zero,
@@ -1184,7 +1184,7 @@ case. If the variable's value is non-@code{nil}, then
1184@code{sc-default-author-name} and @code{sc-default-attribution} are 1184@code{sc-default-author-name} and @code{sc-default-attribution} are
1185used, otherwise, the following steps are taken to find a valid 1185used, otherwise, the following steps are taken to find a valid
1186attribution string, and the first step to return a non-@code{nil}, 1186attribution string, and the first step to return a non-@code{nil},
1187non-empty string becomes the attribution:@refill 1187non-empty string becomes the attribution:
1188 1188
1189@enumerate 1189@enumerate
1190@item 1190@item
@@ -1244,7 +1244,7 @@ variables in your hook functions, you change the attribution and
1244citation strings used by Supercite. One possible use of this would be 1244citation strings used by Supercite. One possible use of this would be
1245to override any automatically derived attribution string when it is only 1245to override any automatically derived attribution string when it is only
1246one character long; e.g., you prefer to use @code{"initials"} but the 1246one character long; e.g., you prefer to use @code{"initials"} but the
1247author only has one name.@refill 1247author only has one name.
1248 1248
1249@node Author Names 1249@node Author Names
1250@section Author Names 1250@section Author Names
@@ -1376,7 +1376,7 @@ matched against the current line, from the beginning, using
1376@code{looking-at}. This match folds case if the optional 1376@code{looking-at}. This match folds case if the optional
1377@var{case-fold-search} is non-@code{nil}. If @var{pred} is not a 1377@var{case-fold-search} is non-@code{nil}. If @var{pred} is not a
1378string, or does not @code{eval}uate to a string, it is interpreted as a 1378string, or does not @code{eval}uate to a string, it is interpreted as a
1379binary value (@code{nil} or non-@code{nil}).@refill 1379binary value (@code{nil} or non-@code{nil}).
1380 1380
1381The four special symbol values for @var{pred} are recognized: 1381The four special symbol values for @var{pred} are recognized:
1382 1382
@@ -1405,7 +1405,7 @@ processing. By default, if your @var{func} returns @code{nil} (as it
1405should be careful to do explicitly), Regi will reset the frame to the 1405should be careful to do explicitly), Regi will reset the frame to the
1406first entry, and advance @samp{point} to the beginning of the next line. 1406first entry, and advance @samp{point} to the beginning of the next line.
1407If a list is returned from your function, it can contain any combination 1407If a list is returned from your function, it can contain any combination
1408of the following elements:@refill 1408of the following elements:
1409 1409
1410@table @asis 1410@table @asis
1411@item the symbol @code{continue} 1411@item the symbol @code{continue}
@@ -1422,16 +1422,16 @@ entry is still processed.
1422This tells Regi to substitute @var{newframe} as the frame it is 1422This tells Regi to substitute @var{newframe} as the frame it is
1423interpreting. In other words, your @var{func} can modify the Regi frame 1423interpreting. In other words, your @var{func} can modify the Regi frame
1424on the fly. @var{newframe} can be a variable containing a frame, or it 1424on the fly. @var{newframe} can be a variable containing a frame, or it
1425can be the frame in-lined.@refill 1425can be the frame in-lined.
1426 1426
1427@item the list @code{(step . @var{step})} 1427@item the list @code{(step . @var{step})}
1428Tells Regi to move @var{step} number of lines forward as it continues 1428Tells Regi to move @var{step} number of lines forward as it continues
1429processing. By default, Regi moves forward one line. @var{step} can be 1429processing. By default, Regi moves forward one line. @var{step} can be
1430zero or negative of course, but watch out for infinite loops.@refill 1430zero or negative of course, but watch out for infinite loops.
1431@end table 1431@end table
1432 1432
1433During execution of your @var{func}, the following variables will be 1433During execution of your @var{func}, the following variables will be
1434temporarily bound to some useful information:@refill 1434temporarily bound to some useful information:
1435 1435
1436@table @code 1436@table @code
1437@item curline 1437@item curline
@@ -1471,7 +1471,7 @@ preferred style.
1471In a similar vein, there are default frames for @dfn{unciting} and 1471In a similar vein, there are default frames for @dfn{unciting} and
1472@dfn{reciting}, contained in the variables 1472@dfn{reciting}, contained in the variables
1473@code{sc-default-uncite-frame} and @code{sc-default-recite-frame} 1473@code{sc-default-uncite-frame} and @code{sc-default-recite-frame}
1474respectively.@refill 1474respectively.
1475 1475
1476As mentioned earlier (@pxref{Recognizing Citations}), citations are 1476As mentioned earlier (@pxref{Recognizing Citations}), citations are
1477recognized through the values of the regular expressions 1477recognized through the values of the regular expressions
@@ -1500,7 +1500,7 @@ Where @var{infokey} is a key suitable for @code{sc-mail-field},
1500@var{regexp} is a regular expression which is @code{string-match}'d 1500@var{regexp} is a regular expression which is @code{string-match}'d
1501against the value of the @code{sc-mail-field} key, and @var{frame} is 1501against the value of the @code{sc-mail-field} key, and @var{frame} is
1502the frame to use if a match occurred. @var{frame} can be a variable 1502the frame to use if a match occurred. @var{frame} can be a variable
1503containing a frame or a frame in-lined.@refill 1503containing a frame or a frame in-lined.
1504 1504
1505When Supercite is about to cite, uncite, or recite a region, it consults 1505When Supercite is about to cite, uncite, or recite a region, it consults
1506the appropriate alist and attempts to find a frame to use. If one 1506the appropriate alist and attempts to find a frame to use. If one
@@ -1524,7 +1524,7 @@ variable @code{sc-mode-map-prefix}. By default, the
1524@code{sc-mode-map-prefix} is @kbd{C-c C-p}; granted, not a great choice, 1524@code{sc-mode-map-prefix} is @kbd{C-c C-p}; granted, not a great choice,
1525but unfortunately the best general solution so far. In the rest of this 1525but unfortunately the best general solution so far. In the rest of this
1526chapter, we'll assume you've installed Supercite's keymap on the default 1526chapter, we'll assume you've installed Supercite's keymap on the default
1527prefix.@refill 1527prefix.
1528 1528
1529@menu 1529@menu
1530* Citing Commands:: 1530* Citing Commands::
@@ -1546,7 +1546,7 @@ paragraph to use a nickname, or manually cite a message when setting
1546perform these functions on the region of text between @samp{point} and 1546perform these functions on the region of text between @samp{point} and
1547@samp{mark}. Each of them sets the @dfn{undo boundary} before modifying 1547@samp{mark}. Each of them sets the @dfn{undo boundary} before modifying
1548the region so that the command can be undone in the standard Emacs 1548the region so that the command can be undone in the standard Emacs
1549way.@refill 1549way.
1550 1550
1551Here is the list of Supercite citing commands: 1551Here is the list of Supercite citing commands:
1552 1552
@@ -1567,7 +1567,7 @@ frame @code{sc-default-cite-frame}. It runs the hook
1567universal argument (@kbd{C-u}), it temporarily sets 1567universal argument (@kbd{C-u}), it temporarily sets
1568@code{sc-confirm-always-p} to @code{t} so you can confirm the 1568@code{sc-confirm-always-p} to @code{t} so you can confirm the
1569attribution string for a single manual citing. 1569attribution string for a single manual citing.
1570@xref{Configuring the Citation Engine}.@refill 1570@xref{Configuring the Citation Engine}.
1571 1571
1572@findex sc-uncite-region 1572@findex sc-uncite-region
1573@findex uncite-region (sc-) 1573@findex uncite-region (sc-)
@@ -1578,7 +1578,7 @@ cited line in the region by interpreting the selected frame from
1578@code{sc-uncite-frame-alist}, or the default unciting frame 1578@code{sc-uncite-frame-alist}, or the default unciting frame
1579@code{sc-default-uncite-frame}. It runs the hook 1579@code{sc-default-uncite-frame}. It runs the hook
1580@code{sc-pre-uncite-hook} before interpreting the frame. 1580@code{sc-pre-uncite-hook} before interpreting the frame.
1581@xref{Configuring the Citation Engine}.@refill 1581@xref{Configuring the Citation Engine}.
1582 1582
1583@findex sc-recite-region 1583@findex sc-recite-region
1584@findex recite-region (sc-) 1584@findex recite-region (sc-)
@@ -1588,7 +1588,7 @@ This command recites each line the region by interpreting the selected
1588frame from @code{sc-recite-frame-alist}, or the default reciting frame 1588frame from @code{sc-recite-frame-alist}, or the default reciting frame
1589@code{sc-default-recite-frame}. It runs the hook 1589@code{sc-default-recite-frame}. It runs the hook
1590@code{sc-pre-recite-hook} before interpreting the frame. 1590@code{sc-pre-recite-hook} before interpreting the frame.
1591@xref{Configuring the Citation Engine}.@refill 1591@xref{Configuring the Citation Engine}.
1592 1592
1593@vindex sc-confirm-always-p 1593@vindex sc-confirm-always-p
1594@vindex confirm-always-p (sc-) 1594@vindex confirm-always-p (sc-)
@@ -1612,7 +1612,7 @@ Inserts a reference header into the reply buffer at @samp{point}. With
1612no arguments, the header indexed by @code{sc-preferred-header-style} is 1612no arguments, the header indexed by @code{sc-preferred-header-style} is
1613inserted. An optional numeric argument is the index into 1613inserted. An optional numeric argument is the index into
1614@code{sc-rewrite-header-list} indicating which reference header to 1614@code{sc-rewrite-header-list} indicating which reference header to
1615write.@refill 1615write.
1616 1616
1617With just the universal argument (@kbd{C-u}), electric reference mode is 1617With just the universal argument (@kbd{C-u}), electric reference mode is
1618entered, regardless of the value of @code{sc-electric-references-p}. 1618entered, regardless of the value of @code{sc-electric-references-p}.
@@ -1640,7 +1640,7 @@ this easy to do.
1640Like Supercite commands in general, the toggling commands are placed on 1640Like Supercite commands in general, the toggling commands are placed on
1641a keymap prefix within the greater Supercite keymap. For the default 1641a keymap prefix within the greater Supercite keymap. For the default
1642value of @code{sc-mode-map-prefix}, this will be 1642value of @code{sc-mode-map-prefix}, this will be
1643@kbd{C-c C-p C-t}.@refill 1643@kbd{C-c C-p C-t}.
1644 1644
1645The following commands toggle the value of certain Supercite variables 1645The following commands toggle the value of certain Supercite variables
1646which take only a binary value: 1646which take only a binary value:
@@ -1700,7 +1700,7 @@ One special command is provided to toggle both
1700@code{sc-auto-fill-region-p} and @code{sc-fixup-whitespace-p} together. 1700@code{sc-auto-fill-region-p} and @code{sc-fixup-whitespace-p} together.
1701This is because you typically want to run Supercite with either variable 1701This is because you typically want to run Supercite with either variable
1702as @code{nil} or non-@code{nil}. The command to toggle these variables 1702as @code{nil} or non-@code{nil}. The command to toggle these variables
1703together is bound on @kbd{C-c C-p C-p}.@refill 1703together is bound on @kbd{C-c C-p C-p}.
1704 1704
1705Finally, the command @kbd{C-c C-p C-t h} (also @kbd{C-c C-p C-t ?}) 1705Finally, the command @kbd{C-c C-p C-t h} (also @kbd{C-c C-p C-t ?})
1706brings up a Help message on the toggling keymap. 1706brings up a Help message on the toggling keymap.
@@ -1711,7 +1711,7 @@ brings up a Help message on the toggling keymap.
1711 1711
1712These commands allow you to view, modify, add, and delete various bits 1712These commands allow you to view, modify, add, and delete various bits
1713of information from the info alist. 1713of information from the info alist.
1714@xref{Information Keys and the Info Alist}.@refill 1714@xref{Information Keys and the Info Alist}.
1715 1715
1716@table @asis 1716@table @asis
1717@kindex C-c C-p f 1717@kindex C-c C-p f
@@ -1753,7 +1753,7 @@ This function is especially useful for replying to digest messages where
1753Supercite will initially set up its information for the digest 1753Supercite will initially set up its information for the digest
1754originator, but you want to cite each component article with the real 1754originator, but you want to cite each component article with the real
1755message author. Note that unless an error during processing occurs, any 1755message author. Note that unless an error during processing occurs, any
1756old information is lost.@refill 1756old information is lost.
1757@end table 1757@end table
1758 1758
1759@node Miscellaneous Commands 1759@node Miscellaneous Commands
@@ -1767,7 +1767,7 @@ old information is lost.@refill
1767@item @code{sc-open-line} (@kbd{C-c C-p o}) 1767@item @code{sc-open-line} (@kbd{C-c C-p o})
1768Similar to Emacs's standard @code{open-line} commands, but inserts the 1768Similar to Emacs's standard @code{open-line} commands, but inserts the
1769citation string in front of the new line. As with @code{open-line}, 1769citation string in front of the new line. As with @code{open-line},
1770an optional numeric argument inserts that many new lines.@refill 1770an optional numeric argument inserts that many new lines.
1771@end table 1771@end table
1772 1772
1773@node Hints to MUA Authors 1773@node Hints to MUA Authors
@@ -1810,7 +1810,7 @@ the release of Emacs 19. Instead of the variable
1810@code{mail-yank-hooks}, the hook variable that the MUA should provide is 1810@code{mail-yank-hooks}, the hook variable that the MUA should provide is
1811@code{mail-citation-hook}. Richard Stallman suggests that the MUAs 1811@code{mail-citation-hook}. Richard Stallman suggests that the MUAs
1812should @code{defvar} @code{mail-citation-hook} to @code{nil} and perform 1812should @code{defvar} @code{mail-citation-hook} to @code{nil} and perform
1813some default citing when that is the case.@refill 1813some default citing when that is the case.
1814 1814
1815If you are writing a new MUA package, or maintaining an existing MUA 1815If you are writing a new MUA package, or maintaining an existing MUA
1816package, you should make it conform to this interface so that your users 1816package, you should make it conform to this interface so that your users
@@ -1826,7 +1826,7 @@ buffer. At this point you should not modify the raw text in any way
1826you should place all the original headers into the body of the reply. 1826you should place all the original headers into the body of the reply.
1827This means that many of the mail headers will be duplicated, one copy 1827This means that many of the mail headers will be duplicated, one copy
1828above the @code{mail-header-separator} line and one copy below, however 1828above the @code{mail-header-separator} line and one copy below, however
1829there will probably be more headers below this line.@refill 1829there will probably be more headers below this line.
1830 1830
1831@item 1831@item
1832Set @samp{point} to the beginning of the line containing the first mail 1832Set @samp{point} to the beginning of the line containing the first mail
@@ -1835,7 +1835,7 @@ message text. It is very important that the region be set around the
1835text Supercite is to modify and that the mail headers are within this 1835text Supercite is to modify and that the mail headers are within this
1836region. Supercite will not venture outside the region for any reason, 1836region. Supercite will not venture outside the region for any reason,
1837and anything within the region is fair game, so don't put anything that 1837and anything within the region is fair game, so don't put anything that
1838@strong{must} remain unchanged inside the region.@refill 1838@strong{must} remain unchanged inside the region.
1839 1839
1840@item 1840@item
1841Run the hook @code{mail-citation-hook}. You will probably want to 1841Run the hook @code{mail-citation-hook}. You will probably want to
@@ -1846,7 +1846,7 @@ yanking function, check its value. If it finds
1846@code{mail-citation-hook} to be @code{nil}, it should perform some 1846@code{mail-citation-hook} to be @code{nil}, it should perform some
1847default citing behavior. User who want to connect to Supercite then 1847default citing behavior. User who want to connect to Supercite then
1848need only add @code{sc-cite-original} to this list of hooks using 1848need only add @code{sc-cite-original} to this list of hooks using
1849@code{add-hook}.@refill 1849@code{add-hook}.
1850@end enumerate 1850@end enumerate
1851 1851
1852If you do all this your MUA will join the ranks of those that conform to 1852If you do all this your MUA will join the ranks of those that conform to
diff --git a/doc/misc/srecode.texi b/doc/misc/srecode.texi
index d76f9e09184..2a3cfdf0993 100644
--- a/doc/misc/srecode.texi
+++ b/doc/misc/srecode.texi
@@ -247,7 +247,6 @@ features of the current file name, user name, time, etc.
247 247
248Some arguments are major-mode specific, such as the @code{:el} or 248Some arguments are major-mode specific, such as the @code{:el} or
249@code{:cpp} arguments. 249@code{:cpp} arguments.
250@refill
251 250
252@section Template Insertion Context 251@section Template Insertion Context
253A context can be provided for templates in a file. This helps 252A context can be provided for templates in a file. This helps
@@ -257,7 +256,6 @@ contexts to have the same name. Some standard contexts are
257 256
258A context can be automatically derived as well based on the parsing 257A context can be automatically derived as well based on the parsing
259state from @i{Semantic}. @inforef{Top, Semantic Manual, semantic}. 258state from @i{Semantic}. @inforef{Top, Semantic Manual, semantic}.
260@refill
261 259
262@section Applications 260@section Applications
263Commands that do a particular user task which involves also writing 261Commands that do a particular user task which involves also writing
@@ -781,7 +779,6 @@ All the text and macros within a section are either not shown at all
781(if that section is not 'visible') or the section is shown one time 779(if that section is not 'visible') or the section is shown one time
782for each dictionary added to that symbol. 780for each dictionary added to that symbol.
783@xref{Developing Template Functions}. 781@xref{Developing Template Functions}.
784@refill
785 782
786Macros prefixed with ``>'' will include another template. Include 783Macros prefixed with ``>'' will include another template. Include
787macros would look like this: 784macros would look like this:
diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi
index 7c998b37010..28e78f5d381 100644
--- a/doc/misc/vip.texi
+++ b/doc/misc/vip.texi
@@ -56,7 +56,7 @@ you start using VIP@. Other nodes may be visited as needed.
56 56
57Comments and bug reports are welcome. Please send messages to 57Comments and bug reports are welcome. Please send messages to
58@code{ms@@Sail.Stanford.Edu} if you are outside of Japan and to 58@code{ms@@Sail.Stanford.Edu} if you are outside of Japan and to
59@code{masahiko@@sato.riec.tohoku.junet} if you are in Japan.@refill 59@code{masahiko@@sato.riec.tohoku.junet} if you are in Japan.
60 60
61@insertcopying 61@insertcopying
62 62
@@ -128,14 +128,13 @@ the character; otherwise we say that point is @dfn{at the end of buffer}.
128@key{PNT} and @key{MRK} are used 128@key{PNT} and @key{MRK} are used
129to indicate positions in a buffer and they are not part of the text of the 129to indicate positions in a buffer and they are not part of the text of the
130buffer. If a buffer contains a @key{MRK} then the text between @key{MRK} 130buffer. If a buffer contains a @key{MRK} then the text between @key{MRK}
131and @key{PNT} is called the @dfn{region} of the buffer.@refill 131and @key{PNT} is called the @dfn{region} of the buffer.
132 132
133@cindex window 133@cindex window
134 134
135Emacs provides (multiple) @dfn{windows} on the screen, and you can see the 135Emacs provides (multiple) @dfn{windows} on the screen, and you can see the
136content of a buffer through the window associated with the buffer. The 136content of a buffer through the window associated with the buffer. The
137cursor of the screen is always positioned on the character after @key{PNT}. 137cursor of the screen is always positioned on the character after @key{PNT}.
138@refill
139 138
140@cindex mode 139@cindex mode
141@cindex keymap 140@cindex keymap
@@ -149,7 +148,7 @@ buffers. Each buffer has its @dfn{local keymap} that determines the
149a function is bound to some key in the local keymap then that function will 148a function is bound to some key in the local keymap then that function will
150be executed when you type the key. If no function is bound to a key in the 149be executed when you type the key. If no function is bound to a key in the
151local map, however, the function bound to the key in the global map becomes 150local map, however, the function bound to the key in the global map becomes
152in effect.@refill 151in effect.
153 152
154@node Loading VIP 153@node Loading VIP
155@section Loading VIP 154@section Loading VIP
@@ -187,7 +186,7 @@ Loading VIP has the effect of globally binding @kbd{C-z} (@kbd{Control-z})
187to the function @code{vip-change-mode-to-vi}. The default binding of @kbd{C-z} 186to the function @code{vip-change-mode-to-vi}. The default binding of @kbd{C-z}
188in GNU Emacs is @code{suspend-emacs}, but, you can also call 187in GNU Emacs is @code{suspend-emacs}, but, you can also call
189@code{suspend-emacs} by typing @kbd{C-x C-z}. Other than this, all the 188@code{suspend-emacs} by typing @kbd{C-x C-z}. Other than this, all the
190key bindings of Emacs remain the same after loading VIP.@refill 189key bindings of Emacs remain the same after loading VIP.
191 190
192@cindex vi mode 191@cindex vi mode
193 192
@@ -198,12 +197,12 @@ called and you will be in @dfn{vi mode}. (Some major modes may locally bind
198invoked by @kbd{M-x}. Here @kbd{M-x} means @kbd{Meta-x}, and if your 197invoked by @kbd{M-x}. Here @kbd{M-x} means @kbd{Meta-x}, and if your
199terminal does not have a @key{META} key you can enter it by typing 198terminal does not have a @key{META} key you can enter it by typing
200@kbd{@key{ESC} x}. The same effect can also be achieve by typing 199@kbd{@key{ESC} x}. The same effect can also be achieve by typing
201@kbd{M-x vip-mode}.)@refill 200@kbd{M-x vip-mode}.)
202 201
203@cindex mode line 202@cindex mode line
204 203
205You can observe the change of mode by looking at the @dfn{mode line}. For 204You can observe the change of mode by looking at the @dfn{mode line}. For
206instance, if the mode line is:@refill 205instance, if the mode line is:
207@example 206@example
208-----Emacs: *scratch* (Lisp Interaction)----All------------ 207-----Emacs: *scratch* (Lisp Interaction)----All------------
209@end example 208@end example
@@ -219,7 +218,7 @@ Thus the word @samp{Emacs} in the mode line will change to @samp{Vi}.
219@cindex emacs mode 218@cindex emacs mode
220 219
221You can go back to the original @dfn{emacs mode} by typing @kbd{C-z} in 220You can go back to the original @dfn{emacs mode} by typing @kbd{C-z} in
222vi mode. Thus @kbd{C-z} toggles between these two modes.@refill 221vi mode. Thus @kbd{C-z} toggles between these two modes.
223 222
224Note that modes in VIP exist orthogonally to modes in Emacs. This means 223Note that modes in VIP exist orthogonally to modes in Emacs. This means
225that you can be in vi mode and at the same time, say, shell mode. 224that you can be in vi mode and at the same time, say, shell mode.
@@ -265,7 +264,7 @@ emacs mode vi mode insert mode
265You will be in this mode just after you loaded VIP@. You can do all 264You will be in this mode just after you loaded VIP@. You can do all
266normal Emacs editing in this mode. Note that the key @kbd{C-z} is globally 265normal Emacs editing in this mode. Note that the key @kbd{C-z} is globally
267bound to @code{vip-change-mode-to-vi}. So, if you type @kbd{C-z} in this mode 266bound to @code{vip-change-mode-to-vi}. So, if you type @kbd{C-z} in this mode
268then you will be in vi mode.@refill 267then you will be in vi mode.
269 268
270@node Vi Mode 269@node Vi Mode
271@subsection Vi Mode 270@subsection Vi Mode
@@ -332,7 +331,7 @@ The major differences from Vi are explained below.
332You can repeat undoing by the @kbd{.} key. So, @kbd{u} will undo 331You can repeat undoing by the @kbd{.} key. So, @kbd{u} will undo
333a single change, while @kbd{u .@: .@: .@:}, for instance, will undo 4 previous 332a single change, while @kbd{u .@: .@: .@:}, for instance, will undo 4 previous
334changes. Undo is undoable as in Vi. So the content of the buffer will 333changes. Undo is undoable as in Vi. So the content of the buffer will
335be the same before and after @kbd{u u}.@refill 334be the same before and after @kbd{u u}.
336 335
337@node Changing 336@node Changing
338@subsection Changing 337@subsection Changing
@@ -345,7 +344,7 @@ then VIP will prompt you for a new word in the minibuffer by the prompt
345@key{ESC} to complete the command. Before you enter @key{RET} or 344@key{ESC} to complete the command. Before you enter @key{RET} or
346@key{ESC} you can abort the command by typing @kbd{C-g}. In general, 345@key{ESC} you can abort the command by typing @kbd{C-g}. In general,
347@kindex 007 @kbd{C-g} (@code{vip-keyboard-quit}) 346@kindex 007 @kbd{C-g} (@code{vip-keyboard-quit})
348you can abort a partially formed command by typing @kbd{C-g}.@refill 347you can abort a partially formed command by typing @kbd{C-g}.
349 348
350@node Searching 349@node Searching
351@subsection Searching 350@subsection Searching
@@ -361,7 +360,7 @@ A search for empty string will toggle the search mode between vanilla
361search and regular expression search. You cannot give an offset to the 360search and regular expression search. You cannot give an offset to the
362search string. (It is a limitation.) By default, search will wrap around 361search string. (It is a limitation.) By default, search will wrap around
363the buffer as in Vi. You can change this by rebinding the variable 362the buffer as in Vi. You can change this by rebinding the variable
364@code{vip-search-wrap-around}. @xref{Customization}, for how to do this.@refill 363@code{vip-search-wrap-around}. @xref{Customization}, for how to do this.
365 364
366@node z Command 365@node z Command
367@subsection z Command 366@subsection z Command
@@ -376,7 +375,7 @@ the buffer as in Vi. You can change this by rebinding the variable
376For those of you who cannot remember which of @kbd{z} followed by @key{RET}, 375For those of you who cannot remember which of @kbd{z} followed by @key{RET},
377@kbd{.}@: and @kbd{-} do what. You can also use @kbd{z} followed by @kbd{H}, 376@kbd{.}@: and @kbd{-} do what. You can also use @kbd{z} followed by @kbd{H},
378@kbd{M} and @kbd{L} to place the current line in the Home (Middle, and 377@kbd{M} and @kbd{L} to place the current line in the Home (Middle, and
379Last) line of the window.@refill 378Last) line of the window.
380 379
381@node Counts 380@node Counts
382@subsection Counts 381@subsection Counts
@@ -436,7 +435,7 @@ delimited by point and mark.) The key @kbd{r} is used for this purpose.
436Thus @kbd{d r} will delete the current region. If @kbd{R} is used instead 435Thus @kbd{d r} will delete the current region. If @kbd{R} is used instead
437of @kbd{r} the region will first be enlarged so that it will become the 436of @kbd{r} the region will first be enlarged so that it will become the
438smallest region containing the original region and consisting of whole 437smallest region containing the original region and consisting of whole
439lines. Thus @kbd{m .@: d R} will have the same effect as @kbd{d d}.@refill 438lines. Thus @kbd{m .@: d R} will have the same effect as @kbd{d d}.
440 439
441@node New Commands 440@node New Commands
442@subsection Some New Commands 441@subsection Some New Commands
@@ -478,7 +477,7 @@ can execute a single Emacs command. After executing the Emacs command you
478will be in vi mode again. You can give a count before typing @kbd{\}. 477will be in vi mode again. You can give a count before typing @kbd{\}.
479Thus @kbd{5 \ *}, as well as @kbd{\ C-u 5 *}, will insert @samp{*****} 478Thus @kbd{5 \ *}, as well as @kbd{\ C-u 5 *}, will insert @samp{*****}
480before point. Similarly @kbd{1 0 \ C-p} will move the point 10 lines above 479before point. Similarly @kbd{1 0 \ C-p} will move the point 10 lines above
481the current line.@refill 480the current line.
482@item K 481@item K
483@kindex 113 @kbd{K} (@code{vip-kill-buffer}) 482@kindex 113 @kbd{K} (@code{vip-kill-buffer})
484Kill current buffer if it is not modified. Useful when you selected a 483Kill current buffer if it is not modified. Useful when you selected a
@@ -504,7 +503,7 @@ similar, but will use window different from the current window.
504If followed by a certain character @var{ch}, it becomes an operator whose 503If followed by a certain character @var{ch}, it becomes an operator whose
505argument is the region determined by the motion command that follows. 504argument is the region determined by the motion command that follows.
506Currently, @var{ch} can be one of @kbd{c}, @kbd{C}, @kbd{g}, @kbd{q} and 505Currently, @var{ch} can be one of @kbd{c}, @kbd{C}, @kbd{g}, @kbd{q} and
507@kbd{s}.@refill 506@kbd{s}.
508@item # c 507@item # c
509@kindex 0432 @kbd{# c} (@code{downcase-region}) 508@kindex 0432 @kbd{# c} (@code{downcase-region})
510Change upper-case characters in the region to lower case 509Change upper-case characters in the region to lower case
@@ -517,7 +516,7 @@ Change lower-case characters in the region to upper case. For instance,
517@item # g 516@item # g
518@kindex 0432 @kbd{# g} (@code{vip-global-execute}) 517@kindex 0432 @kbd{# g} (@code{vip-global-execute})
519Execute last keyboard macro for each line in the region 518Execute last keyboard macro for each line in the region
520(@code{vip-global-execute}).@refill 519(@code{vip-global-execute}).
521@item # q 520@item # q
522@kindex 0432 @kbd{# q} (@code{vip-quote-region}) 521@kindex 0432 @kbd{# q} (@code{vip-quote-region})
523Insert specified string at the beginning of each line in the region 522Insert specified string at the beginning of each line in the region
@@ -577,7 +576,7 @@ mode. You get the same effect by typing @kbd{C-x C-s} in vi mode, but
577the idea here is that you can execute useful Emacs commands without typing 576the idea here is that you can execute useful Emacs commands without typing
578control characters. For example, if you hit @kbd{X} (or @kbd{C-x}) followed 577control characters. For example, if you hit @kbd{X} (or @kbd{C-x}) followed
579by @kbd{2}, then the current window will be split into 2 and you will be in 578by @kbd{2}, then the current window will be split into 2 and you will be in
580vi mode again.@refill 579vi mode again.
581@end table 580@end table
582 581
583In addition to these, @code{ctl-x-map} is slightly modified: 582In addition to these, @code{ctl-x-map} is slightly modified:
@@ -723,7 +722,7 @@ Most Vi commands accept a @dfn{numeric argument} which can be supplied as
723a prefix to the commands. A numeric argument is also called a @dfn{count}. 722a prefix to the commands. A numeric argument is also called a @dfn{count}.
724In many cases, if a count is given, the command is executed that many times. 723In many cases, if a count is given, the command is executed that many times.
725For instance, @kbd{5 d d} deletes 5 lines while simple @kbd{d d} deletes a 724For instance, @kbd{5 d d} deletes 5 lines while simple @kbd{d d} deletes a
726line. In this manual the metavariable @var{n} will denote a count.@refill 725line. In this manual the metavariable @var{n} will denote a count.
727 726
728@node Important Keys 727@node Important Keys
729@section Important Keys 728@section Important Keys
@@ -742,7 +741,7 @@ Clear the screen and reprint everything (@code{recenter}).
742 741
743In Emacs many commands are bound to the key strokes that start with 742In Emacs many commands are bound to the key strokes that start with
744@kbd{C-x}, @kbd{C-c} and @key{ESC}. These commands can be 743@kbd{C-x}, @kbd{C-c} and @key{ESC}. These commands can be
745accessed from vi mode as easily as from emacs mode.@refill 744accessed from vi mode as easily as from emacs mode.
746 745
747@table @kbd 746@table @kbd
748@item C-x 747@item C-x
@@ -772,7 +771,7 @@ Escape to emacs mode. Hitting the @kbd{\} key will take you to emacs mode,
772and you can execute a single Emacs command. After executing the 771and you can execute a single Emacs command. After executing the
773Emacs command you will be in vi mode again. You can give a count before 772Emacs command you will be in vi mode again. You can give a count before
774typing @kbd{\}. Thus @kbd{5 \ +}, as well as @kbd{\ C-u 5 +}, will insert 773typing @kbd{\}. Thus @kbd{5 \ +}, as well as @kbd{\ C-u 5 +}, will insert
775@samp{+++++} before point.@refill 774@samp{+++++} before point.
776@end table 775@end table
777 776
778@node Buffers and Windows 777@node Buffers and Windows
@@ -784,7 +783,7 @@ typing @kbd{\}. Thus @kbd{5 \ +}, as well as @kbd{\ C-u 5 +}, will insert
784 783
785In Emacs the text you edit is stored in a @dfn{buffer}. 784In Emacs the text you edit is stored in a @dfn{buffer}.
786See GNU Emacs Manual, for details. There is always one @dfn{current} 785See GNU Emacs Manual, for details. There is always one @dfn{current}
787buffer, also called the @dfn{selected buffer}.@refill 786buffer, also called the @dfn{selected buffer}.
788 787
789@cindex window 788@cindex window
790@cindex modified (buffer) 789@cindex modified (buffer)
@@ -883,7 +882,7 @@ file in the current window, you can just type @kbd{v}. Emacs maintains the
883@dfn{default directory} which is specific to each buffer. Suppose, for 882@dfn{default directory} which is specific to each buffer. Suppose, for
884instance, that the default directory of the current buffer is 883instance, that the default directory of the current buffer is
885@file{/usr/masahiko/lisp/}. Then you will get the following prompt in the 884@file{/usr/masahiko/lisp/}. Then you will get the following prompt in the
886minibuffer.@refill 885minibuffer.
887@example 886@example
888visit file: /usr/masahiko/lisp/ 887visit file: /usr/masahiko/lisp/
889@end example 888@end example
@@ -911,7 +910,7 @@ window.
911 910
912You can verify which file you are editing by typing @kbd{g}. (You can also 911You can verify which file you are editing by typing @kbd{g}. (You can also
913type @kbd{X B} to get information on other buffers too.) If you type 912type @kbd{X B} to get information on other buffers too.) If you type
914@kbd{g} you will get an information like below in the echo area:@refill 913@kbd{g} you will get an information like below in the echo area:
915@example 914@example
916"/usr/masahiko/man/vip.texinfo" line 921 of 1949 915"/usr/masahiko/man/vip.texinfo" line 921 of 1949
917@end example 916@end example
@@ -921,7 +920,7 @@ you may wish to save it in a file. If you wish to save it in the file
921associated with the buffer (@file{/usr/masahiko/man/vip.texinfo}, in this 920associated with the buffer (@file{/usr/masahiko/man/vip.texinfo}, in this
922case), you can just say @kbd{X S}. If you wish to save it in another file, 921case), you can just say @kbd{X S}. If you wish to save it in another file,
923you can type @kbd{X W}. You will then get a similar prompt as you get for 922you can type @kbd{X W}. You will then get a similar prompt as you get for
924@kbd{v}, to which you can enter the file name.@refill 923@kbd{v}, to which you can enter the file name.
925 924
926@node Viewing the Buffer 925@node Viewing the Buffer
927@section Viewing the Buffer 926@section Viewing the Buffer
@@ -1453,7 +1452,7 @@ For example, if point is at the beginning of a word @samp{foo} and you
1453wish to change it to @samp{bar}, you can type @kbd{c w}. Then, as @kbd{w} 1452wish to change it to @samp{bar}, you can type @kbd{c w}. Then, as @kbd{w}
1454is a point command, you will get the prompt @samp{foo =>} in the 1453is a point command, you will get the prompt @samp{foo =>} in the
1455minibuffer, for which you can type @kbd{b a r @key{RET}} to complete the change 1454minibuffer, for which you can type @kbd{b a r @key{RET}} to complete the change
1456command.@refill 1455command.
1457 1456
1458@table @kbd 1457@table @kbd
1459@item c c 1458@item c c
diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi
index 8b4c9e93f7c..db5a5736888 100644
--- a/doc/misc/viper.texi
+++ b/doc/misc/viper.texi
@@ -88,7 +88,7 @@ be visited as needed.
88 88
89Comments and bug reports are welcome. 89Comments and bug reports are welcome.
90@code{kifer@@cs.stonybrook.edu} is the current address for Viper bug reports. 90@code{kifer@@cs.stonybrook.edu} is the current address for Viper bug reports.
91Please use the Ex command @kbd{:submitReport} for this purpose.@refill 91Please use the Ex command @kbd{:submitReport} for this purpose.
92 92
93@insertcopying 93@insertcopying
94@end ifnottex 94@end ifnottex
@@ -147,7 +147,7 @@ comes with Emacs. This manual can be read as an Info file. Try the command
147 147
148Comments and bug reports are welcome. 148Comments and bug reports are welcome.
149@code{kifer@@cs.stonybrook.edu} is the current address for Viper bug reports. 149@code{kifer@@cs.stonybrook.edu} is the current address for Viper bug reports.
150Please use the Ex command @kbd{:submitReport} for this purpose.@refill 150Please use the Ex command @kbd{:submitReport} for this purpose.
151 151
152@end iftex 152@end iftex
153 153
@@ -197,21 +197,21 @@ Emacs can edit several files at once. A file in Emacs is placed in a
197@dfn{buffer} that usually has the same name as the file. Buffers are also used 197@dfn{buffer} that usually has the same name as the file. Buffers are also used
198for other purposes, such as shell interfaces, directory editing, etc. 198for other purposes, such as shell interfaces, directory editing, etc.
199@xref{Dired,,Directory Editor,emacs,The 199@xref{Dired,,Directory Editor,emacs,The
200GNU Emacs Manual}, for an example.@refill 200GNU Emacs Manual}, for an example.
201 201
202A buffer has a distinguished position called the @dfn{point}. 202A buffer has a distinguished position called the @dfn{point}.
203A @dfn{point} is always between 2 characters, and is @dfn{looking at} 203A @dfn{point} is always between 2 characters, and is @dfn{looking at}
204the right hand character. The cursor is positioned on the right hand 204the right hand character. The cursor is positioned on the right hand
205character. Thus, when the @dfn{point} is looking at the end-of-line, 205character. Thus, when the @dfn{point} is looking at the end-of-line,
206the cursor is on the end-of-line character, i.e., beyond the last 206the cursor is on the end-of-line character, i.e., beyond the last
207character on the line. This is the default Emacs behavior.@refill 207character on the line. This is the default Emacs behavior.
208 208
209The default settings of Viper try to mimic the behavior of Vi, preventing 209The default settings of Viper try to mimic the behavior of Vi, preventing
210the cursor from going beyond the last character on the line. By using 210the cursor from going beyond the last character on the line. By using
211Emacs commands directly (such as those bound to arrow keys), it is possible 211Emacs commands directly (such as those bound to arrow keys), it is possible
212to get the cursor beyond the end-of-line. However, this won't (or 212to get the cursor beyond the end-of-line. However, this won't (or
213shouldn't) happen if you restrict yourself to standard Vi keys, unless you 213shouldn't) happen if you restrict yourself to standard Vi keys, unless you
214modify the default editing style. @xref{Customization}.@refill 214modify the default editing style. @xref{Customization}.
215 215
216In addition to the @dfn{point}, there is another distinguished buffer 216In addition to the @dfn{point}, there is another distinguished buffer
217position called the @dfn{mark}. @xref{Mark,,Mark,emacs,The GNU Emacs 217position called the @dfn{mark}. @xref{Mark,,Mark,emacs,The GNU Emacs
@@ -232,7 +232,7 @@ assuming that the current region starts at line 123 and ends at line
232135. There is no need to type the line numbers, since Viper inserts them 232135. There is no need to type the line numbers, since Viper inserts them
233automatically in front of the Ex command. 233automatically in front of the Ex command.
234 234
235@xref{Basics}, for more info.@refill 235@xref{Basics}, for more info.
236 236
237@cindex window 237@cindex window
238@cindex mode line 238@cindex mode line
@@ -255,7 +255,7 @@ show the buffer name and current major and minor modes (see below).
255A special buffer called @dfn{Minibuffer} is displayed as the last line 255A special buffer called @dfn{Minibuffer} is displayed as the last line
256in a minibuffer window. The minibuffer window is used for command input 256in a minibuffer window. The minibuffer window is used for command input
257output. Viper uses minibuffer window for @kbd{/} and @kbd{:} 257output. Viper uses minibuffer window for @kbd{/} and @kbd{:}
258commands.@refill 258commands.
259 259
260@cindex mode 260@cindex mode
261@cindex keymap 261@cindex keymap
@@ -275,7 +275,7 @@ keymap then that function will be executed when you type the key.
275If no function is bound to a key in the 275If no function is bound to a key in the
276local map, however, the function bound to the key in the global map 276local map, however, the function bound to the key in the global map
277will be executed. @xref{Major Modes,Major Modes,Major Modes,emacs,The 277will be executed. @xref{Major Modes,Major Modes,Major Modes,emacs,The
278GNU Emacs Manual}, for more information.@refill 278GNU Emacs Manual}, for more information.
279 279
280A buffer can also have a @dfn{minor mode}. Minor modes are options that 280A buffer can also have a @dfn{minor mode}. Minor modes are options that
281you can use or not. A buffer in @code{text-mode} can have 281you can use or not. A buffer in @code{text-mode} can have
@@ -283,7 +283,7 @@ you can use or not. A buffer in @code{text-mode} can have
283any time. In Emacs, a minor mode may have it own keymap, 283any time. In Emacs, a minor mode may have it own keymap,
284which overrides the local keymap when the minor mode is turned on. For 284which overrides the local keymap when the minor mode is turned on. For
285more information, @pxref{Minor Modes,Minor Modes,Minor Modes,emacs,The 285more information, @pxref{Minor Modes,Minor Modes,Minor Modes,emacs,The
286GNU Emacs Manual} @refill 286GNU Emacs Manual}.
287 287
288@cindex Viper as minor mode 288@cindex Viper as minor mode
289@cindex Control keys 289@cindex Control keys
@@ -293,7 +293,7 @@ Viper is implemented as a collection of minor modes. Different minor modes
293are involved when Viper emulates Vi command mode, Vi insert mode, etc. 293are involved when Viper emulates Vi command mode, Vi insert mode, etc.
294You can also turn Viper on and off at any time while in Vi command mode. 294You can also turn Viper on and off at any time while in Vi command mode.
295@xref{States in Viper}, for 295@xref{States in Viper}, for
296more information.@refill 296more information.
297 297
298Emacs uses Control and Meta modifiers. These are denoted as C and M, 298Emacs uses Control and Meta modifiers. These are denoted as C and M,
299e.g., @kbd{^Z} as @kbd{C-z} and @kbd{Meta-x} as @kbd{M-x}. The Meta key is 299e.g., @kbd{^Z} as @kbd{C-z} and @kbd{Meta-x} as @kbd{M-x}. The Meta key is
@@ -303,7 +303,7 @@ holding the Meta key down. For keyboards that do not have a Meta key,
303@key{ESC} is used as Meta. Thus @kbd{M-x} is typed as @kbd{@key{ESC} 303@key{ESC} is used as Meta. Thus @kbd{M-x} is typed as @kbd{@key{ESC}
304x}. Viper uses @key{ESC} to switch from Insert state to Vi state. Therefore 304x}. Viper uses @key{ESC} to switch from Insert state to Vi state. Therefore
305Viper defines @kbd{C-\} as its Meta key in Vi state. @xref{Vi State}, for 305Viper defines @kbd{C-\} as its Meta key in Vi state. @xref{Vi State}, for
306more info.@refill 306more info.
307 307
308Emacs is structured as a Lisp interpreter around a C core. Emacs keys 308Emacs is structured as a Lisp interpreter around a C core. Emacs keys
309cause Lisp functions to be called. It is possible to call these 309cause Lisp functions to be called. It is possible to call these
@@ -357,7 +357,7 @@ command line, it will show the @samp{*scratch*} buffer, in the
357editing files by using @kbd{:e}, @kbd{:vi}, or @kbd{v} commands. 357editing files by using @kbd{:e}, @kbd{:vi}, or @kbd{v} commands.
358(@xref{File and Buffer Handling}, for more information on @kbd{v} and other 358(@xref{File and Buffer Handling}, for more information on @kbd{v} and other
359new commands that, in many cases, are more convenient than @kbd{:e}, 359new commands that, in many cases, are more convenient than @kbd{:e},
360@kbd{:vi}, and similar old-style Vi commands.)@refill 360@kbd{:vi}, and similar old-style Vi commands.)
361 361
362Finally, if at some point you would want to de-Viperize your running 362Finally, if at some point you would want to de-Viperize your running
363copy of Emacs after Viper has been loaded, the command @kbd{M-x 363copy of Emacs after Viper has been loaded, the command @kbd{M-x
@@ -386,7 +386,7 @@ This is the state plain vanilla Emacs is normally in. After you have loaded
386Viper, @kbd{C-z} will normally take you to Vi command state. Another 386Viper, @kbd{C-z} will normally take you to Vi command state. Another
387@kbd{C-z} will take you back to Emacs state. This toggle key can be 387@kbd{C-z} will take you back to Emacs state. This toggle key can be
388changed, @pxref{Customization} You can also type @kbd{M-x viper-mode} to 388changed, @pxref{Customization} You can also type @kbd{M-x viper-mode} to
389change to Vi state.@refill 389change to Vi state.
390 390
391 391
392For users who chose to set their user level to 1 at Viper setup time, 392For users who chose to set their user level to 1 at Viper setup time,
@@ -424,7 +424,7 @@ boundary of a replacement region (usually designated via a @samp{$} sign),
424it will automatically change to Insert state. You do not have to worry 424it will automatically change to Insert state. You do not have to worry
425about it. The key bindings remain practically the same as in Insert 425about it. The key bindings remain practically the same as in Insert
426state. If you type @key{ESC}, Viper will switch to Vi command mode, terminating the 426state. If you type @key{ESC}, Viper will switch to Vi command mode, terminating the
427replacement state.@refill 427replacement state.
428@end table 428@end table
429 429
430@cindex mode line 430@cindex mode line
@@ -488,7 +488,7 @@ for editing LaTeX documents, Dired for directory editing, etc. These are
488major modes, each with a different set of key-bindings. Viper states are 488major modes, each with a different set of key-bindings. Viper states are
489orthogonal to these Emacs major modes. The presence of these language 489orthogonal to these Emacs major modes. The presence of these language
490sensitive and other modes is a major win over Vi. @xref{Improvements over 490sensitive and other modes is a major win over Vi. @xref{Improvements over
491Vi}, for more.@refill 491Vi}, for more.
492 492
493The bindings for these modes can be made available in the Viper Insert state 493The bindings for these modes can be made available in the Viper Insert state
494as well as in Emacs state. Unless you specify your user level as 1 (a 494as well as in Emacs state. Unless you specify your user level as 1 (a
@@ -541,7 +541,6 @@ functionality and no key-binding. Recursive edits are indicated by
541Edit,Recursive Edit,emacs,The GNU Emacs Manual}. 541Edit,Recursive Edit,emacs,The GNU Emacs Manual}.
542At user level 1, @kbd{C-g} is bound to @code{viper-info-on-file} 542At user level 1, @kbd{C-g} is bound to @code{viper-info-on-file}
543function instead. 543function instead.
544@refill
545@item C-\ 544@item C-\
546@kindex @kbd{C-\} 545@kindex @kbd{C-\}
547@cindex Meta key 546@cindex Meta key
@@ -652,7 +651,6 @@ In contrast to @kbd{:w!@: foo}, if the command were @kbd{:r foo}, the entire
652command will appear in the history list. This is because having @kbd{:r} 651command will appear in the history list. This is because having @kbd{:r}
653alone as a default is meaningless, since this command requires a file 652alone as a default is meaningless, since this command requires a file
654argument. 653argument.
655@refill
656@end table 654@end table
657@noindent 655@noindent
658As in Vi, Viper's destructive commands can be re-executed by typing `@kbd{.}'. 656As in Vi, Viper's destructive commands can be re-executed by typing `@kbd{.}'.
@@ -673,7 +671,7 @@ Emacs major modes cannot be used in Insert state.
673It is strongly recommended that as soon as you are comfortable, make the 671It is strongly recommended that as soon as you are comfortable, make the
674Emacs state bindings visible (by changing your user level to 3 or higher). 672Emacs state bindings visible (by changing your user level to 3 or higher).
675@xref{Customization}, 673@xref{Customization},
676to see how to do this.@refill 674to see how to do this.
677 675
678Once this is done, it is possible to do quite a bit of editing in 676Once this is done, it is possible to do quite a bit of editing in
679Insert state. For instance, Emacs has a @dfn{yank} command, @kbd{C-y}, 677Insert state. For instance, Emacs has a @dfn{yank} command, @kbd{C-y},
@@ -823,13 +821,13 @@ If you set marker @samp{a} in
823file @file{foo}, start editing file @file{bar} and type @kbd{'a}, then 821file @file{foo}, start editing file @file{bar} and type @kbd{'a}, then
824@emph{YOU WILL SWITCH TO FILE @file{foo}}. You can see the contents of a 822@emph{YOU WILL SWITCH TO FILE @file{foo}}. You can see the contents of a
825textmarker using the Viper command @kbd{[<a-z>} where <a-z> are the 823textmarker using the Viper command @kbd{[<a-z>} where <a-z> are the
826textmarkers, e.g., @kbd{[a} to view marker @samp{a} .@refill 824textmarkers, e.g., @kbd{[a} to view marker @samp{a} .
827@item Repeated Commands 825@item Repeated Commands
828Command repetitions are common over files. Typing @kbd{!!} will repeat the 826Command repetitions are common over files. Typing @kbd{!!} will repeat the
829last @kbd{!} command whichever file it was issued from. 827last @kbd{!} command whichever file it was issued from.
830Typing @kbd{.} will repeat the last command from any file, and 828Typing @kbd{.} will repeat the last command from any file, and
831searches will repeat the last search. Ex commands can be repeated by typing 829searches will repeat the last search. Ex commands can be repeated by typing
832@kbd{: @key{RET}}.@refill 830@kbd{: @key{RET}}.
833Note: in some rare cases, that @kbd{: @key{RET}} may do something dangerous. 831Note: in some rare cases, that @kbd{: @key{RET}} may do something dangerous.
834However, usually its effect can be undone by typing @kbd{u}. 832However, usually its effect can be undone by typing @kbd{u}.
835@item Registers 833@item Registers
@@ -897,7 +895,7 @@ more powerful facilities for defining abbreviations.
897it is not implemented. 895it is not implemented.
898A useful alternative is @code{cat -t -e file}. Unfortunately, it cannot 896A useful alternative is @code{cat -t -e file}. Unfortunately, it cannot
899be used directly inside Emacs, since Emacs will obdurately change @samp{^I} 897be used directly inside Emacs, since Emacs will obdurately change @samp{^I}
900back to normal tabs.@refill 898back to normal tabs.
901@end itemize 899@end itemize
902 900
903@node Improvements over Vi 901@node Improvements over Vi
@@ -928,7 +926,7 @@ The Vi command set is based on the idea of combining motion commands
928with other commands. The motion command is used as a text region 926with other commands. The motion command is used as a text region
929specifier for other commands. 927specifier for other commands.
930We classify motion commands into @dfn{point commands} and 928We classify motion commands into @dfn{point commands} and
931@dfn{line commands}.@refill 929@dfn{line commands}.
932 930
933@cindex point commands 931@cindex point commands
934 932
@@ -1010,7 +1008,7 @@ direction.
1010Since the undo size is limited, Viper can create backup files and 1008Since the undo size is limited, Viper can create backup files and
1011auto-save files. It will normally do this automatically. It is possible 1009auto-save files. It will normally do this automatically. It is possible
1012to have numbered backups, etc. For details, @pxref{Backup,,Backup and 1010to have numbered backups, etc. For details, @pxref{Backup,,Backup and
1013Auto-Save,emacs,The GNU Emacs Manual} @refill 1011Auto-Save,emacs,The GNU Emacs Manual}.
1014 1012
1015@comment [ balance parens 1013@comment [ balance parens
1016@cindex viewing registers and markers 1014@cindex viewing registers and markers
@@ -1083,7 +1081,7 @@ where @samp{register} is any character from @samp{a} through @samp{z}. Then
1083you can execute this macro using @kbd{@@register}. It is, of course, 1081you can execute this macro using @kbd{@@register}. It is, of course,
1084possible to yank some text into a register and execute it using 1082possible to yank some text into a register and execute it using
1085@kbd{@@register}. Typing @kbd{@@@@}, @kbd{@@RET}, or @kbd{@@C-j} will 1083@kbd{@@register}. Typing @kbd{@@@@}, @kbd{@@RET}, or @kbd{@@C-j} will
1086execute the last macro that was executed using @kbd{@@register}.@refill 1084execute the last macro that was executed using @kbd{@@register}.
1087 1085
1088Viper will automatically lowercase the register, so that pressing the 1086Viper will automatically lowercase the register, so that pressing the
1089@kbd{SHIFT} key for @kbd{@@} will not create problems. This is for 1087@kbd{SHIFT} key for @kbd{@@} will not create problems. This is for
@@ -1105,7 +1103,7 @@ The last keyboard macro can also be executed using
1105This is useful for Emacs style keyboard macros defined using @kbd{C-x(} 1103This is useful for Emacs style keyboard macros defined using @kbd{C-x(}
1106and @kbd{C-x)}. Emacs keyboard macros have more capabilities. 1104and @kbd{C-x)}. Emacs keyboard macros have more capabilities.
1107@xref{Keyboard Macros,,Keyboard Macros,emacs, The GNU Emacs Manual}, for 1105@xref{Keyboard Macros,,Keyboard Macros,emacs, The GNU Emacs Manual}, for
1108details.@refill 1106details.
1109 1107
1110Keyboard Macros allow an interesting form of Query-Replace: 1108Keyboard Macros allow an interesting form of Query-Replace:
1111@kbd{/pattern} or @kbd{n} to go to the next pattern (the query), followed by a 1109@kbd{/pattern} or @kbd{n} to go to the next pattern (the query), followed by a
@@ -1161,7 +1159,7 @@ as you go along. Incremental Search is normally bound to @kbd{C-s} and
1161@kbd{C-r}. @xref{Customization}, to find out how to change the bindings 1159@kbd{C-r}. @xref{Customization}, to find out how to change the bindings
1162of @kbd{C-r or C-s}. 1160of @kbd{C-r or C-s}.
1163For details, @pxref{Incremental Search,,Incremental 1161For details, @pxref{Incremental Search,,Incremental
1164Search,emacs,The GNU Emacs Manual} @refill 1162Search,emacs,The GNU Emacs Manual}.
1165 1163
1166@cindex query replace 1164@cindex query replace
1167 1165
@@ -1308,7 +1306,7 @@ into 2. Except for novice users, @kbd{C-c} is also set to execute an Emacs
1308command from the current major mode. @key{ESC} will do the same, if you 1306command from the current major mode. @key{ESC} will do the same, if you
1309configure @key{ESC} as Meta by setting @code{viper-no-multiple-ESC} to @code{nil} 1307configure @key{ESC} as Meta by setting @code{viper-no-multiple-ESC} to @code{nil}
1310in @file{.viper}. @xref{Customization}. @kbd{C-\} in Insert, Replace, or Vi 1308in @file{.viper}. @xref{Customization}. @kbd{C-\} in Insert, Replace, or Vi
1311states will make Emacs think @kbd{Meta} has been hit.@refill 1309states will make Emacs think @kbd{Meta} has been hit.
1312@item \ 1310@item \
1313@kindex @kbd{\} 1311@kindex @kbd{\}
1314Escape to Emacs to execute a single Emacs command. For instance, 1312Escape to Emacs to execute a single Emacs command. For instance,
@@ -1339,7 +1337,7 @@ argument is the region determined by the motion command that follows
1339(indicated as <move>). 1337(indicated as <move>).
1340Currently, @var{ch} can be one of @kbd{c}, @kbd{C}, @kbd{g}, @kbd{q}, and 1338Currently, @var{ch} can be one of @kbd{c}, @kbd{C}, @kbd{g}, @kbd{q}, and
1341@kbd{s}. For instance, @kbd{#qr} will prompt you for a string and then 1339@kbd{s}. For instance, @kbd{#qr} will prompt you for a string and then
1342prepend this string to each line in the buffer.@refill 1340prepend this string to each line in the buffer.
1343@item # c 1341@item # c
1344@kindex @kbd{#c<move>} 1342@kindex @kbd{#c<move>}
1345@cindex changing case 1343@cindex changing case
@@ -1355,7 +1353,7 @@ Emacs command @kbd{M-u} does the same for words.
1355@item # g 1353@item # g
1356@kindex @kbd{#g<move>} 1354@kindex @kbd{#g<move>}
1357Execute last keyboard macro for each line in the region 1355Execute last keyboard macro for each line in the region
1358(@code{viper-global-execute}).@refill 1356(@code{viper-global-execute}).
1359@item # q 1357@item # q
1360@kindex @kbd{#q<move>} 1358@kindex @kbd{#q<move>}
1361Insert specified string at the beginning of each line in the region 1359Insert specified string at the beginning of each line in the region
@@ -1401,7 +1399,7 @@ Go to end of heading.
1401@item g <@emph{movement command}> 1399@item g <@emph{movement command}>
1402Search buffer for text delimited by movement command. The canonical 1400Search buffer for text delimited by movement command. The canonical
1403example is @kbd{gw} to search for the word under the cursor. 1401example is @kbd{gw} to search for the word under the cursor.
1404@xref{Improved Search}, for details.@refill 1402@xref{Improved Search}, for details.
1405@item C-g and C-] 1403@item C-g and C-]
1406@kindex @kbd{C-g} 1404@kindex @kbd{C-g}
1407@kindex @kbd{C-]} 1405@kindex @kbd{C-]}
@@ -1560,7 +1558,7 @@ patches.
1560@noindent 1558@noindent
1561Emacs Lisp archives exist on 1559Emacs Lisp archives exist on
1562@samp{archive.cis.ohio-state.edu} 1560@samp{archive.cis.ohio-state.edu}
1563and @samp{wuarchive.wustl.edu}@refill 1561and @samp{wuarchive.wustl.edu}
1564 1562
1565 1563
1566@node Customization 1564@node Customization
@@ -1583,7 +1581,7 @@ Elisp code in your @file{.emacs} file before and after the @code{(require
1583'viper)} line. This method is @emph{not} recommended, unless you know what 1581'viper)} line. This method is @emph{not} recommended, unless you know what
1584you are doing. Only two variables, @code{viper-mode} and 1582you are doing. Only two variables, @code{viper-mode} and
1585@code{viper-custom-file-name}, are supposed to be customized in @file{.emacs}, 1583@code{viper-custom-file-name}, are supposed to be customized in @file{.emacs},
1586prior to loading Viper (i.e., prior to @code{(require 'viper)} command.@refill 1584prior to loading Viper (i.e., prior to @code{(require 'viper)} command.
1587@item 1585@item
1588@cindex :customize 1586@cindex :customize
1589By executing the @kbd{:customize} Ex command. This takes you to the Emacs 1587By executing the @kbd{:customize} Ex command. This takes you to the Emacs
@@ -2780,7 +2778,7 @@ macros) lets the user define keyboard macros that ask for confirmation or
2780even prompt the user for input and then continue. To do this, one should 2778even prompt the user for input and then continue. To do this, one should
2781type @kbd{C-x q} (for confirmation) or @kbd{C-u C-x q} (for prompt). 2779type @kbd{C-x q} (for confirmation) or @kbd{C-u C-x q} (for prompt).
2782For details, @pxref{Keyboard Macro Query,,Customization,emacs,The GNU Emacs 2780For details, @pxref{Keyboard Macro Query,,Customization,emacs,The GNU Emacs
2783Manual} @refill 2781Manual}.
2784 2782
2785When the user finishes defining a macro (which is done by typing @kbd{C-x)}, 2783When the user finishes defining a macro (which is done by typing @kbd{C-x)},
2786a departure from Vi), you will be asked whether you want this 2784a departure from Vi), you will be asked whether you want this
@@ -2994,7 +2992,7 @@ currently defined. To see all macros along with their definitions, type
2994 2992
2995This section is a semi-automatically bowdlerized version of the Vi 2993This section is a semi-automatically bowdlerized version of the Vi
2996reference created by @* @samp{maart@@cs.vu.nl} and others. It can be 2994reference created by @* @samp{maart@@cs.vu.nl} and others. It can be
2997found on the Vi archives. This reference has been adapted for Viper.@refill 2995found on the Vi archives. This reference has been adapted for Viper.
2998 2996
2999@menu 2997@menu
3000* Groundwork:: Textual Conventions and Viper basics 2998* Groundwork:: Textual Conventions and Viper basics
@@ -3015,7 +3013,7 @@ The VI command set is based on the idea of combining motion commands
3015with other commands. The motion command is used as a text region 3013with other commands. The motion command is used as a text region
3016specifier for other commands. 3014specifier for other commands.
3017We classify motion commands into @dfn{point commands} and 3015We classify motion commands into @dfn{point commands} and
3018@dfn{line commands}.@refill 3016@dfn{line commands}.
3019 3017
3020@cindex point commands 3018@cindex point commands
3021 3019
@@ -4187,7 +4185,7 @@ the whole file.
4187@cindex @samp{#} (Previous file) 4185@cindex @samp{#} (Previous file)
4188Similarly, @samp{#} expands to the previous file. The previous file is the 4186Similarly, @samp{#} expands to the previous file. The previous file is the
4189first file in @kbd{:args} listing. This defaults to the previous file in 4187first file in @kbd{:args} listing. This defaults to the previous file in
4190the VI sense if you have one window.@refill 4188the VI sense if you have one window.
4191 4189
4192Symbols @samp{%} and @samp{#} are also used in the Ex commands @kbd{:e} and 4190Symbols @samp{%} and @samp{#} are also used in the Ex commands @kbd{:e} and
4193@kbd{:r <shell-cmd>}. The commands @kbd{:w} and the regular @kbd{:r 4191@kbd{:r <shell-cmd>}. The commands @kbd{:w} and the regular @kbd{:r
@@ -4425,7 +4423,7 @@ a region under the mouse pointer.
4425This command can take a prefix argument. Note: Viper sets this 4423This command can take a prefix argument. Note: Viper sets this
4426binding only if this mouse action is not 4424binding only if this mouse action is not
4427already bound to something else. 4425already bound to something else.
4428@xref{Viper Specials}, for more information.@refill 4426@xref{Viper Specials}, for more information.
4429 4427
4430@item S-Mouse-2 4428@item S-Mouse-2
4431Holding Shift and clicking button 2 of the mouse will 4429Holding Shift and clicking button 2 of the mouse will
@@ -4433,7 +4431,7 @@ insert a region surrounding the mouse pointer.
4433This command can also take a prefix argument. 4431This command can also take a prefix argument.
4434Note: Viper sets this binding only if this mouse action is not 4432Note: Viper sets this binding only if this mouse action is not
4435already bound to something else. 4433already bound to something else.
4436@xref{Viper Specials}, for more details.@refill 4434@xref{Viper Specials}, for more details.
4437@end table 4435@end table
4438@kindex @kbd{S-Mouse-1} 4436@kindex @kbd{S-Mouse-1}
4439@kindex @kbd{S-Mouse-2} 4437@kindex @kbd{S-Mouse-2}
diff --git a/doc/misc/widget.texi b/doc/misc/widget.texi
index f2c403a2c14..2fe247dd750 100644
--- a/doc/misc/widget.texi
+++ b/doc/misc/widget.texi
@@ -431,7 +431,6 @@ Set up a buffer to support widgets.
431 431
432This should be called after creating all the widgets and before allowing 432This should be called after creating all the widgets and before allowing
433the user to edit them. 433the user to edit them.
434@refill
435@end defun 434@end defun
436 435
437If you want to insert text outside the widgets in the form, the 436If you want to insert text outside the widgets in the form, the
@@ -450,7 +449,7 @@ There is a standard widget keymap which you might find useful.
450@key{TAB} and @kbd{C-@key{TAB}} are bound to @code{widget-forward} and 449@key{TAB} and @kbd{C-@key{TAB}} are bound to @code{widget-forward} and
451@code{widget-backward}, respectively. @key{RET} and @kbd{Mouse-2} 450@code{widget-backward}, respectively. @key{RET} and @kbd{Mouse-2}
452are bound to @code{widget-button-press} and 451are bound to @code{widget-button-press} and
453@code{widget-button-click}.@refill 452@code{widget-button-click}.
454@end defvr 453@end defvr
455 454
456@defvar widget-global-map 455@defvar widget-global-map
@@ -1718,7 +1717,7 @@ Keymap used in @code{widget-minor-mode}.
1718@defun widget-prompt-value widget prompt [ value unbound ] 1717@defun widget-prompt-value widget prompt [ value unbound ]
1719Prompt for a value matching @var{widget}, using @var{prompt}. 1718Prompt for a value matching @var{widget}, using @var{prompt}.
1720The current value is assumed to be @var{value}, unless @var{unbound} is 1719The current value is assumed to be @var{value}, unless @var{unbound} is
1721non-@code{nil}.@refill 1720non-@code{nil}.
1722@end defun 1721@end defun
1723 1722
1724@defun widget-get-sibling widget 1723@defun widget-get-sibling widget