aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2013-06-23 17:42:12 -0700
committerGlenn Morris2013-06-23 17:42:12 -0700
commit7eeeb7ddc9b6d5d04a36f6a279464b2a552dfeaf (patch)
treea402a82319de69560fed5c342213eac2a856de88
parente6b4a89e78d38315b199414da27d88437dc54a71 (diff)
downloademacs-7eeeb7ddc9b6d5d04a36f6a279464b2a552dfeaf.tar.gz
emacs-7eeeb7ddc9b6d5d04a36f6a279464b2a552dfeaf.zip
* doc/misc/eshell.texi: Fix cross-references to other manuals.
-rw-r--r--doc/misc/ChangeLog4
-rw-r--r--doc/misc/eshell.texi29
2 files changed, 23 insertions, 10 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 2a62dc852e9..b2624e7b05a 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,3 +1,7 @@
12013-06-24 Glenn Morris <rgm@gnu.org>
2
3 * eshell.texi: Fix cross-references to other manuals.
4
12013-03-11 Glenn Morris <rgm@gnu.org> 52013-03-11 Glenn Morris <rgm@gnu.org>
2 6
3 * Version 24.3 released. 7 * Version 24.3 released.
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi
index d24cdc216b5..688a547feeb 100644
--- a/doc/misc/eshell.texi
+++ b/doc/misc/eshell.texi
@@ -378,12 +378,13 @@ Similar to, but slightly different from, the GNU Coreutils
378 378
379@item define 379@item define
380@cmindex define 380@cmindex define
381Define a varalias. @xref{Variable Aliases, , , elisp}. 381Define a varalias.
382@xref{Variable Aliases, , , elisp, The Emacs Lisp Reference Manual}.
382 383
383@item diff 384@item diff
384@cmindex diff 385@cmindex diff
385Use Emacs's internal @code{diff} (not to be confused with 386Use Emacs's internal @code{diff} (not to be confused with
386@code{ediff}). @xref{Comparing Files, , , elisp}. 387@code{ediff}). @xref{Comparing Files, , , emacs, The GNU Emacs Manual}.
387 388
388@item grep 389@item grep
389@cmindex grep 390@cmindex grep
@@ -422,15 +423,18 @@ and @code{("foo" "bar")} both evaluate to @code{("foo" "bar")}.
422@item locate 423@item locate
423@cmindex locate 424@cmindex locate
424Alias to Emacs's @code{locate} function, which simply runs the external 425Alias to Emacs's @code{locate} function, which simply runs the external
425@command{locate} command and parses the results. @xref{Dired and `find', , , elisp}. 426@command{locate} command and parses the results.
427@xref{Dired and Find, , , emacs, The GNU Emacs Manual}.
426 428
427@item make 429@item make
428@cmindex make 430@cmindex make
429Run @command{make} through @code{compile}. @xref{Running Compilations under Emacs, , , elisp}. 431Run @command{make} through @code{compile}.
432@xref{Compilation, , , emacs, The GNU Emacs Manual}.
430 433
431@item occur 434@item occur
432@cmindex occur 435@cmindex occur
433Alias to Emacs's @code{occur}. @xref{Other Search-and-Loop Commands, , , elisp}. 436Alias to Emacs's @code{occur}.
437@xref{Other Repeating Search, , , emacs, The GNU Emacs Manual}.
434 438
435@item printnl 439@item printnl
436@cmindex printnl 440@cmindex printnl
@@ -647,7 +651,8 @@ variables in command invocations.
647 651
648@item $#var 652@item $#var
649Expands to the length of the value bound to @code{var}. Raises an error 653Expands to the length of the value bound to @code{var}. Raises an error
650if the value is not a sequence (@pxref{Sequences Arrays and Vectors, Sequences, , elisp}). 654if the value is not a sequence
655(@pxref{Sequences Arrays Vectors, Sequences, , elisp, The Emacs Lisp Reference Manual}).
651 656
652@item $(lisp) 657@item $(lisp)
653Expands to the result of evaluating the S-expression @code{(lisp)}. On 658Expands to the result of evaluating the S-expression @code{(lisp)}. On
@@ -679,7 +684,8 @@ any regular expression. So to split on numbers, use @samp{$var["[0-9]+" 10 20]}
679 684
680@item $var[hello] 685@item $var[hello]
681Calls @code{assoc} on @code{var} with @code{"hello"}, expecting it to be 686Calls @code{assoc} on @code{var} with @code{"hello"}, expecting it to be
682an alist (@pxref{Association List Type, Association Lists, , elisp}). 687an alist (@pxref{Association List Type, Association Lists, , elisp,
688The Emacs Lisp Reference Manual}).
683 689
684@item $#var[hello] 690@item $#var[hello]
685Returns the length of the cdr of the element of @code{var} who car is equal 691Returns the length of the cdr of the element of @code{var} who car is equal
@@ -692,9 +698,11 @@ to @code{"hello"}.
692Eshell's globbing syntax is very similar to that of Zsh. Users coming 698Eshell's globbing syntax is very similar to that of Zsh. Users coming
693from Bash can still use Bash-style globbing, as there are no 699from Bash can still use Bash-style globbing, as there are no
694incompatibilities. Most globbing is pattern-based expansion, but there 700incompatibilities. Most globbing is pattern-based expansion, but there
695is also predicate-based expansion. See @ref{Filename Generation, , , zsh} 701is also predicate-based expansion. See
702@ref{Filename Generation, , , zsh, The Z Shell Manual}
696for full syntax. To customize the syntax and behaviour of globbing in 703for full syntax. To customize the syntax and behaviour of globbing in
697Eshell see the Customize@footnote{@xref{Customization Settings, Customize, , elisp}.} 704Eshell see the Customize@footnote{@xref{Easy Customization, , , emacs,
705The GNU Emacs Manual}.}
698groups ``eshell-glob'' and ``eshell-pred''. 706groups ``eshell-glob'' and ``eshell-pred''.
699 707
700@node Input/Output 708@node Input/Output
@@ -738,7 +746,8 @@ can be disabled and enabled without having to unload and reload them,
738and to provide a common parent Customize group for the 746and to provide a common parent Customize group for the
739modules.@footnote{ERC provides a similar module facility.} An Eshell 747modules.@footnote{ERC provides a similar module facility.} An Eshell
740module is defined the same as any other library but one requirement: the 748module is defined the same as any other library but one requirement: the
741module must define a Customize@footnote{@xref{Customization Settings, Customize, , elisp}.} 749module must define a Customize@footnote{@xref{Customization, , ,
750elisp, The Emacs Lisp Reference Manual}.}
742group using @code{eshell-defgroup} (in place of @code{defgroup}) with 751group using @code{eshell-defgroup} (in place of @code{defgroup}) with
743@code{eshell-module} as the parent group.@footnote{If the module has 752@code{eshell-module} as the parent group.@footnote{If the module has
744no user-customizable options, then there is no need to define it as an 753no user-customizable options, then there is no need to define it as an