diff options
| author | Eli Zaretskii | 2014-04-21 17:50:19 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-04-21 17:50:19 +0300 |
| commit | f982b37104acdd2b3aee4fe3bb08ae052990f869 (patch) | |
| tree | 5e9217e9d35d8a01124b1337bad19ab90932461e | |
| parent | 6e5d21a613f66db9c6cad7dcab856ef81ac9b5da (diff) | |
| download | emacs-f982b37104acdd2b3aee4fe3bb08ae052990f869.tar.gz emacs-f982b37104acdd2b3aee4fe3bb08ae052990f869.zip | |
Minor fixes to the docs.
doc/emacs/buffers.texi (Uniquify): Clarify the default uniquification.
doc/emacs/indent.texi (Tab Stops): Improve wording.
doc/emacs/cmdargs.texi (General Variables): Improve docs of
EMACSLOADPATH. Index all the environment variables.
(Misc Variables): Index all the environment variables.
doc/lispref/text.texi (Registers): Document register-read-with-preview.
doc/lispref/internals.texi (Building Emacs): Improve indexing.
| -rw-r--r-- | doc/emacs/ChangeLog | 10 | ||||
| -rw-r--r-- | doc/emacs/buffers.texi | 8 | ||||
| -rw-r--r-- | doc/emacs/cmdargs.texi | 12 | ||||
| -rw-r--r-- | doc/emacs/indent.texi | 10 | ||||
| -rw-r--r-- | doc/lispref/ChangeLog | 6 | ||||
| -rw-r--r-- | doc/lispref/internals.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/text.texi | 12 |
7 files changed, 48 insertions, 12 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index a589558236a..12037aae275 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,3 +1,13 @@ | |||
| 1 | 2014-04-21 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * buffers.texi (Uniquify): Clarify the default uniquification. | ||
| 4 | |||
| 5 | * indent.texi (Tab Stops): Improve wording. | ||
| 6 | |||
| 7 | * cmdargs.texi (General Variables): Improve docs of | ||
| 8 | EMACSLOADPATH. Index all the environment variables. | ||
| 9 | (Misc Variables): Index all the environment variables. | ||
| 10 | |||
| 1 | 2014-04-13 Eli Zaretskii <eliz@gnu.org> | 11 | 2014-04-13 Eli Zaretskii <eliz@gnu.org> |
| 2 | 12 | ||
| 3 | * display.texi (Cursor Display): Explain better how to customize | 13 | * display.texi (Cursor Display): Explain better how to customize |
diff --git a/doc/emacs/buffers.texi b/doc/emacs/buffers.texi index c96b657b481..3f55cf7076e 100644 --- a/doc/emacs/buffers.texi +++ b/doc/emacs/buffers.texi | |||
| @@ -611,8 +611,12 @@ convenient to switch between buffers. | |||
| 611 | the buffers distinct names. The default method | 611 | the buffers distinct names. The default method |
| 612 | (@code{uniquify-buffer-name-style} set to | 612 | (@code{uniquify-buffer-name-style} set to |
| 613 | @code{post-forward-angle-brackets}) for making buffer names unique | 613 | @code{post-forward-angle-brackets}) for making buffer names unique |
| 614 | adds @samp{<dir1>}, @samp{<dir2>}, etc. to the end of the buffer | 614 | adds @samp{<dir1>}, @samp{<dir2>}, etc.@: to the end of the buffer |
| 615 | names. | 615 | names, where @file{dir1} and @file{dir2} are the minimal parts of the |
| 616 | leading directories needed to make the buffer name unique. For | ||
| 617 | example, if you have files @file{/foo/bar/mumble/name} and | ||
| 618 | @file{/baz/quux/mumble/name} visited, their buffers will be named | ||
| 619 | @samp{name<bar/mumble>} and @samp{name<quux/mumble>} correspondingly. | ||
| 616 | 620 | ||
| 617 | @vindex uniquify-buffer-name-style | 621 | @vindex uniquify-buffer-name-style |
| 618 | There are several styles to make buffer names unique. To select | 622 | There are several styles to make buffer names unique. To select |
diff --git a/doc/emacs/cmdargs.texi b/doc/emacs/cmdargs.texi index 06e41a57681..ce7af79076e 100644 --- a/doc/emacs/cmdargs.texi +++ b/doc/emacs/cmdargs.texi | |||
| @@ -439,7 +439,7 @@ special meanings in Emacs. Most of these variables are also used by | |||
| 439 | some other programs. Emacs does not require any of these environment | 439 | some other programs. Emacs does not require any of these environment |
| 440 | variables to be set, but it uses their values if they are set. | 440 | variables to be set, but it uses their values if they are set. |
| 441 | 441 | ||
| 442 | @table @env | 442 | @vtable @env |
| 443 | @item CDPATH | 443 | @item CDPATH |
| 444 | Used by the @code{cd} command to search for the directory you specify, | 444 | Used by the @code{cd} command to search for the directory you specify, |
| 445 | when you specify a relative directory name. | 445 | when you specify a relative directory name. |
| @@ -464,7 +464,9 @@ Emacs Lisp files. If set, it modifies the usual initial value of the | |||
| 464 | @code{load-path} variable (@pxref{Lisp Libraries}). An empty element | 464 | @code{load-path} variable (@pxref{Lisp Libraries}). An empty element |
| 465 | stands for the default value of @code{load-path}; e.g., using | 465 | stands for the default value of @code{load-path}; e.g., using |
| 466 | @samp{EMACSLOADPATH="/tmp:"} adds @file{/tmp} to the front of | 466 | @samp{EMACSLOADPATH="/tmp:"} adds @file{/tmp} to the front of |
| 467 | the default @code{load-path}. | 467 | the default @code{load-path}. To specify an empty element in the |
| 468 | middle of the list, use 2 colons in a row, as in | ||
| 469 | @samp{EMACSLOADPATH="/tmp::/foo"}. | ||
| 468 | @item EMACSPATH | 470 | @item EMACSPATH |
| 469 | A colon-separated list of directories to search for executable files. | 471 | A colon-separated list of directories to search for executable files. |
| 470 | If set, Emacs uses this in addition to @env{PATH} (see below) when | 472 | If set, Emacs uses this in addition to @env{PATH} (see below) when |
| @@ -598,14 +600,14 @@ defaults to @samp{root}. | |||
| 598 | @item VERSION_CONTROL | 600 | @item VERSION_CONTROL |
| 599 | Used to initialize the @code{version-control} variable (@pxref{Backup | 601 | Used to initialize the @code{version-control} variable (@pxref{Backup |
| 600 | Names}). | 602 | Names}). |
| 601 | @end table | 603 | @end vtable |
| 602 | 604 | ||
| 603 | @node Misc Variables | 605 | @node Misc Variables |
| 604 | @appendixsubsec Miscellaneous Variables | 606 | @appendixsubsec Miscellaneous Variables |
| 605 | 607 | ||
| 606 | These variables are used only on particular configurations: | 608 | These variables are used only on particular configurations: |
| 607 | 609 | ||
| 608 | @table @env | 610 | @vtable @env |
| 609 | @item COMSPEC | 611 | @item COMSPEC |
| 610 | On MS-DOS and MS-Windows, the name of the command interpreter to use | 612 | On MS-DOS and MS-Windows, the name of the command interpreter to use |
| 611 | when invoking batch files and commands internal to the shell. On MS-DOS | 613 | when invoking batch files and commands internal to the shell. On MS-DOS |
| @@ -657,7 +659,7 @@ rather than hard-coding an absolute path. This allows multiple | |||
| 657 | versions of Emacs to share the same environment variable settings, and | 659 | versions of Emacs to share the same environment variable settings, and |
| 658 | it allows you to move the Emacs installation directory, without | 660 | it allows you to move the Emacs installation directory, without |
| 659 | changing any environment or registry settings. | 661 | changing any environment or registry settings. |
| 660 | @end table | 662 | @end vtable |
| 661 | 663 | ||
| 662 | @node MS-Windows Registry | 664 | @node MS-Windows Registry |
| 663 | @appendixsubsec The MS-Windows System Registry | 665 | @appendixsubsec The MS-Windows System Registry |
diff --git a/doc/emacs/indent.texi b/doc/emacs/indent.texi index 4b44b9289b5..b254cfca43e 100644 --- a/doc/emacs/indent.texi +++ b/doc/emacs/indent.texi | |||
| @@ -153,11 +153,11 @@ C-u -999 C-x @key{TAB} | |||
| 153 | are used as stopping points by @key{TAB} when inserting whitespace in | 153 | are used as stopping points by @key{TAB} when inserting whitespace in |
| 154 | Text mode and related modes (@pxref{Indentation}), and by commands | 154 | Text mode and related modes (@pxref{Indentation}), and by commands |
| 155 | like @kbd{M-i} (@pxref{Indentation Commands}). The variable | 155 | like @kbd{M-i} (@pxref{Indentation Commands}). The variable |
| 156 | @code{tab-stop-list} controls these positions. The default value | 156 | @code{tab-stop-list} controls these positions. The default value is |
| 157 | is @code{nil}, which means a tab stop every 8 columns. The value | 157 | @code{nil}, which means a tab stop every 8 columns. The value can |
| 158 | can also be a list of column numbers (in increasing order) at which to | 158 | also be a list of zero-based column numbers (in increasing order) at |
| 159 | place tab stops. Emacs extends the list forever by repeating the | 159 | which to place tab stops. Emacs extends the list forever by repeating |
| 160 | difference between the last and next-to-last elements. | 160 | the difference between the last and next-to-last elements. |
| 161 | 161 | ||
| 162 | @findex edit-tab-stops | 162 | @findex edit-tab-stops |
| 163 | @kindex C-c C-c @r{(Edit Tab Stops)} | 163 | @kindex C-c C-c @r{(Edit Tab Stops)} |
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index b31398fffc4..de3b1ddb20c 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2014-04-21 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * text.texi (Registers): Document register-read-with-preview. | ||
| 4 | |||
| 5 | * internals.texi (Building Emacs): Improve indexing. | ||
| 6 | |||
| 1 | 2014-04-05 Glenn Morris <rgm@gnu.org> | 7 | 2014-04-05 Glenn Morris <rgm@gnu.org> |
| 2 | 8 | ||
| 3 | * os.texi (Recording Input): Dribble files may contain passwords. | 9 | * os.texi (Recording Input): Dribble files may contain passwords. |
diff --git a/doc/lispref/internals.texi b/doc/lispref/internals.texi index d91b0349810..f85701f5396 100644 --- a/doc/lispref/internals.texi +++ b/doc/lispref/internals.texi | |||
| @@ -111,6 +111,8 @@ drawback that the documentation strings take up space in Emacs all the | |||
| 111 | time.) | 111 | time.) |
| 112 | @end itemize | 112 | @end itemize |
| 113 | 113 | ||
| 114 | @cindex change @code{load-path} at configure time | ||
| 115 | @cindex @option{--enable-locallisppath} option to @command{configure} | ||
| 114 | It is not advisable to put anything in @file{site-load.el} or | 116 | It is not advisable to put anything in @file{site-load.el} or |
| 115 | @file{site-init.el} that would alter any of the features that users | 117 | @file{site-init.el} that would alter any of the features that users |
| 116 | expect in an ordinary unmodified Emacs. If you feel you must override | 118 | expect in an ordinary unmodified Emacs. If you feel you must override |
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index 7c5603fd645..3c70f5f96b0 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi | |||
| @@ -4117,6 +4117,18 @@ a rectangle (a list), currently useless things happen. This may be | |||
| 4117 | changed in the future. | 4117 | changed in the future. |
| 4118 | @end deffn | 4118 | @end deffn |
| 4119 | 4119 | ||
| 4120 | @defun register-read-with-preview prompt | ||
| 4121 | @cindex register preview | ||
| 4122 | This function reads and returns a register name, prompting with | ||
| 4123 | @var{prompt} and possibly showing a preview of the existing registers | ||
| 4124 | and their contents. The preview is shown in a temporary window, after | ||
| 4125 | the delay specified by the user option @code{register-preview-delay}, | ||
| 4126 | if its value and @code{register-alist} are both non-@code{nil}. The | ||
| 4127 | preview is also shown if the user requests help (e.g., by typing the | ||
| 4128 | help character). We recommend that all interactive commands which | ||
| 4129 | read register names use this function. | ||
| 4130 | @end defun | ||
| 4131 | |||
| 4120 | @node Transposition | 4132 | @node Transposition |
| 4121 | @section Transposition of Text | 4133 | @section Transposition of Text |
| 4122 | 4134 | ||