diff options
| author | Nix | 2011-05-18 23:54:27 -0700 |
|---|---|---|
| committer | Glenn Morris | 2011-05-18 23:54:27 -0700 |
| commit | 35a30759f31addb80faef630001de380cd94a0cf (patch) | |
| tree | 144154c7861a4ccf94426d68fd16d10300df17f3 | |
| parent | d573f59acf8e4703ee27322280b9dfce2ef5a53f (diff) | |
| download | emacs-35a30759f31addb80faef630001de380cd94a0cf.tar.gz emacs-35a30759f31addb80faef630001de380cd94a0cf.zip | |
Misc small lispref fixes.
* windows.texi (Displaying Buffers): pop-to-buffer is not a command.
* text.texi (Parsing HTML): Update for function name changes.
* syntax.texi (Syntax Flags): Small fix.
* keymaps.texi (Active Keymaps): Typo fix.
(Changing Key Bindings): Grammar fix.
* frames.texi (Minibuffers and Frames): Grammar fix.
(Window System Selections): x-select-enable-clipboard now defaults to t.
* customize.texi (Common Keywords):
* display.texi (Abstract Display):
* modes.texi (Auto-Indentation):
* nonascii.texi (Converting Representations): Typo fixes.
* control.texi (Examples of Catch): Call it "goto" not "go to".
| -rw-r--r-- | doc/lispref/ChangeLog | 21 | ||||
| -rw-r--r-- | doc/lispref/control.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/customize.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/display.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/frames.texi | 6 | ||||
| -rw-r--r-- | doc/lispref/keymaps.texi | 4 | ||||
| -rw-r--r-- | doc/lispref/modes.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/nonascii.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/syntax.texi | 2 | ||||
| -rw-r--r-- | doc/lispref/text.texi | 28 | ||||
| -rw-r--r-- | doc/lispref/windows.texi | 6 |
11 files changed, 53 insertions, 24 deletions
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 593b54d088b..198eb1c8ed2 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,3 +1,24 @@ | |||
| 1 | 2011-05-19 Nix <nix@esperi.org.uk> | ||
| 2 | |||
| 3 | * windows.texi (Displaying Buffers): pop-to-buffer is not a command. | ||
| 4 | |||
| 5 | * text.texi (Parsing HTML): Update for function name changes. | ||
| 6 | |||
| 7 | * syntax.texi (Syntax Flags): Small fix. | ||
| 8 | |||
| 9 | * keymaps.texi (Active Keymaps): Typo fix. | ||
| 10 | (Changing Key Bindings): Grammar fix. | ||
| 11 | |||
| 12 | * frames.texi (Minibuffers and Frames): Grammar fix. | ||
| 13 | (Window System Selections): x-select-enable-clipboard now defaults to t. | ||
| 14 | |||
| 15 | * customize.texi (Common Keywords): | ||
| 16 | * display.texi (Abstract Display): | ||
| 17 | * modes.texi (Auto-Indentation): | ||
| 18 | * nonascii.texi (Converting Representations): Typo fixes. | ||
| 19 | |||
| 20 | * control.texi (Examples of Catch): Call it "goto" not "go to". | ||
| 21 | |||
| 1 | 2011-05-14 Eli Zaretskii <eliz@gnu.org> | 22 | 2011-05-14 Eli Zaretskii <eliz@gnu.org> |
| 2 | 23 | ||
| 3 | * nonascii.texi (Character Properties): Fix inconsistencies with | 24 | * nonascii.texi (Character Properties): Fix inconsistencies with |
diff --git a/doc/lispref/control.texi b/doc/lispref/control.texi index b6fdb9dbcbd..875c23658b9 100644 --- a/doc/lispref/control.texi +++ b/doc/lispref/control.texi | |||
| @@ -623,7 +623,7 @@ error is signaled with data @code{(@var{tag} @var{value})}. | |||
| 623 | @subsection Examples of @code{catch} and @code{throw} | 623 | @subsection Examples of @code{catch} and @code{throw} |
| 624 | 624 | ||
| 625 | One way to use @code{catch} and @code{throw} is to exit from a doubly | 625 | One way to use @code{catch} and @code{throw} is to exit from a doubly |
| 626 | nested loop. (In most languages, this would be done with a ``go to.'') | 626 | nested loop. (In most languages, this would be done with a ``goto.'') |
| 627 | Here we compute @code{(foo @var{i} @var{j})} for @var{i} and @var{j} | 627 | Here we compute @code{(foo @var{i} @var{j})} for @var{i} and @var{j} |
| 628 | varying from 0 to 9: | 628 | varying from 0 to 9: |
| 629 | 629 | ||
diff --git a/doc/lispref/customize.texi b/doc/lispref/customize.texi index 2f1ea055f82..e58c8c298c9 100644 --- a/doc/lispref/customize.texi +++ b/doc/lispref/customize.texi | |||
| @@ -174,7 +174,7 @@ For example, the MH-E package updates this alist with the following: | |||
| 174 | 174 | ||
| 175 | The value of @var{package} needs to be unique and it needs to match | 175 | The value of @var{package} needs to be unique and it needs to match |
| 176 | the @var{package} value appearing in the @code{:package-version} | 176 | the @var{package} value appearing in the @code{:package-version} |
| 177 | keyword. Since the user might see the value in a error message, a good | 177 | keyword. Since the user might see the value in an error message, a good |
| 178 | choice is the official name of the package, such as MH-E or Gnus. | 178 | choice is the official name of the package, such as MH-E or Gnus. |
| 179 | @end defvar | 179 | @end defvar |
| 180 | 180 | ||
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index 130f097a85f..338fd421994 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi | |||
| @@ -5201,7 +5201,7 @@ element value into the current buffer. | |||
| 5201 | Typically, you define an ewoc with @code{ewoc-create}, and then pass | 5201 | Typically, you define an ewoc with @code{ewoc-create}, and then pass |
| 5202 | the resulting ewoc structure to other functions in the Ewoc package to | 5202 | the resulting ewoc structure to other functions in the Ewoc package to |
| 5203 | build nodes within it, and display it in the buffer. Once it is | 5203 | build nodes within it, and display it in the buffer. Once it is |
| 5204 | displayed in the buffer, other functions determine the correspondance | 5204 | displayed in the buffer, other functions determine the correspondence |
| 5205 | between buffer positions and nodes, move point from one node's textual | 5205 | between buffer positions and nodes, move point from one node's textual |
| 5206 | representation to another, and so forth. @xref{Abstract Display | 5206 | representation to another, and so forth. @xref{Abstract Display |
| 5207 | Functions}. | 5207 | Functions}. |
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index 06c120cc09d..c5136456177 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi | |||
| @@ -1368,7 +1368,7 @@ minibuffer-window}). | |||
| 1368 | 1368 | ||
| 1369 | However, you can also create a frame with no minibuffer. Such a frame | 1369 | However, you can also create a frame with no minibuffer. Such a frame |
| 1370 | must use the minibuffer window of some other frame. When you create the | 1370 | must use the minibuffer window of some other frame. When you create the |
| 1371 | frame, you can specify explicitly the minibuffer window to use (in some | 1371 | frame, you can explicitly specify the minibuffer window to use (in some |
| 1372 | other frame). If you don't, then the minibuffer is found in the frame | 1372 | other frame). If you don't, then the minibuffer is found in the frame |
| 1373 | which is the value of the variable @code{default-minibuffer-frame}. Its | 1373 | which is the value of the variable @code{default-minibuffer-frame}. Its |
| 1374 | value should be a frame that does have a minibuffer. | 1374 | value should be a frame that does have a minibuffer. |
| @@ -2018,8 +2018,8 @@ clipboard as empty. | |||
| 2018 | If this is non-@code{nil}, the Emacs yank functions consult the | 2018 | If this is non-@code{nil}, the Emacs yank functions consult the |
| 2019 | clipboard before the primary selection, and the kill functions store in | 2019 | clipboard before the primary selection, and the kill functions store in |
| 2020 | the clipboard as well as the primary selection. Otherwise they do not | 2020 | the clipboard as well as the primary selection. Otherwise they do not |
| 2021 | access the clipboard at all. The default is @code{nil} on most systems, | 2021 | access the clipboard at all. The default is @code{t} on systems with |
| 2022 | but @code{t} on MS-Windows. | 2022 | clipboards. |
| 2023 | @end defopt | 2023 | @end defopt |
| 2024 | 2024 | ||
| 2025 | @node Drag and Drop | 2025 | @node Drag and Drop |
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi index 2648c22ca01..2ebce284fd3 100644 --- a/doc/lispref/keymaps.texi +++ b/doc/lispref/keymaps.texi | |||
| @@ -686,7 +686,7 @@ bindings, as in @code{lookup-key} (@pxref{Functions for Key Lookup}). | |||
| 686 | 686 | ||
| 687 | When commands are remapped (@pxref{Remapping Commands}), | 687 | When commands are remapped (@pxref{Remapping Commands}), |
| 688 | @code{key-binding} normally processes command remappings so as to | 688 | @code{key-binding} normally processes command remappings so as to |
| 689 | returns the remapped command that will actually be executed. However, | 689 | return the remapped command that will actually be executed. However, |
| 690 | if @var{no-remap} is non-@code{nil}, @code{key-binding} ignores | 690 | if @var{no-remap} is non-@code{nil}, @code{key-binding} ignores |
| 691 | remappings and returns the binding directly specified for @var{key}. | 691 | remappings and returns the binding directly specified for @var{key}. |
| 692 | 692 | ||
| @@ -1239,7 +1239,7 @@ local map, that usually affects all buffers using the same major mode. | |||
| 1239 | The @code{global-set-key} and @code{local-set-key} functions are | 1239 | The @code{global-set-key} and @code{local-set-key} functions are |
| 1240 | convenient interfaces for these operations (@pxref{Key Binding | 1240 | convenient interfaces for these operations (@pxref{Key Binding |
| 1241 | Commands}). You can also use @code{define-key}, a more general | 1241 | Commands}). You can also use @code{define-key}, a more general |
| 1242 | function; then you must specify explicitly the map to change. | 1242 | function; then you must explicitly specify the map to change. |
| 1243 | 1243 | ||
| 1244 | When choosing the key sequences for Lisp programs to rebind, please | 1244 | When choosing the key sequences for Lisp programs to rebind, please |
| 1245 | follow the Emacs conventions for use of various keys (@pxref{Key | 1245 | follow the Emacs conventions for use of various keys (@pxref{Key |
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi index 02f89f93207..609c713194a 100644 --- a/doc/lispref/modes.texi +++ b/doc/lispref/modes.texi | |||
| @@ -3256,7 +3256,7 @@ reasonably fast. | |||
| 3256 | @end defvar | 3256 | @end defvar |
| 3257 | 3257 | ||
| 3258 | @node Auto-Indentation | 3258 | @node Auto-Indentation |
| 3259 | @section Auto-indention of code | 3259 | @section Auto-indentation of code |
| 3260 | 3260 | ||
| 3261 | For programming languages, an important feature of a major mode is to | 3261 | For programming languages, an important feature of a major mode is to |
| 3262 | provide automatic indentation. This is controlled in Emacs by | 3262 | provide automatic indentation. This is controlled in Emacs by |
diff --git a/doc/lispref/nonascii.texi b/doc/lispref/nonascii.texi index a3f25af4719..0328dae9e7b 100644 --- a/doc/lispref/nonascii.texi +++ b/doc/lispref/nonascii.texi | |||
| @@ -201,7 +201,7 @@ characters. | |||
| 201 | @defun byte-to-string byte | 201 | @defun byte-to-string byte |
| 202 | @cindex byte to string | 202 | @cindex byte to string |
| 203 | This function returns a unibyte string containing a single byte of | 203 | This function returns a unibyte string containing a single byte of |
| 204 | character data, @var{character}. It signals a error if | 204 | character data, @var{character}. It signals an error if |
| 205 | @var{character} is not an integer between 0 and 255. | 205 | @var{character} is not an integer between 0 and 255. |
| 206 | @end defun | 206 | @end defun |
| 207 | 207 | ||
diff --git a/doc/lispref/syntax.texi b/doc/lispref/syntax.texi index 55ee2dec4a4..6582a8dfb0c 100644 --- a/doc/lispref/syntax.texi +++ b/doc/lispref/syntax.texi | |||
| @@ -374,7 +374,7 @@ character, @samp{/}, does not have the @samp{b} flag. | |||
| 374 | 374 | ||
| 375 | @item @samp{*/} | 375 | @item @samp{*/} |
| 376 | This is a comment-end sequence for ``b'' style because the first | 376 | This is a comment-end sequence for ``b'' style because the first |
| 377 | character, @samp{*}, does have the @samp{b} flag. | 377 | character, @samp{*}, has the @samp{b} flag. |
| 378 | 378 | ||
| 379 | @item newline | 379 | @item newline |
| 380 | This is a comment-end sequence for ``a'' style, because the newline | 380 | This is a comment-end sequence for ``a'' style, because the newline |
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi index 6cb271eec88..8205c5fa169 100644 --- a/doc/lispref/text.texi +++ b/doc/lispref/text.texi | |||
| @@ -4099,17 +4099,16 @@ coding instead. | |||
| 4099 | @node Parsing HTML | 4099 | @node Parsing HTML |
| 4100 | @section Parsing HTML | 4100 | @section Parsing HTML |
| 4101 | @cindex parsing html | 4101 | @cindex parsing html |
| 4102 | @cindex parsing xml | ||
| 4103 | 4102 | ||
| 4104 | Emacs provides an interface to the @code{libxml2} library via two | 4103 | @defun libxml-parse-html-region start end &optional base-url |
| 4105 | functions: @code{html-parse-buffer} and @code{xml-parse-buffer}. The | 4104 | This function provides HTML parsing via the @code{libxml2} library. |
| 4106 | HTML function will parse ``real world'' HTML and try to return a | 4105 | It parses ``real world'' HTML and tries to return a sensible parse tree |
| 4107 | sensible parse tree, while the XML function is somewhat stricter about | 4106 | regardless. |
| 4108 | syntax. | ||
| 4109 | 4107 | ||
| 4110 | They both take a two optional parameter. The first is a buffer, and | 4108 | In addition to @var{start} and @var{end} (specifying the start and end |
| 4111 | the second is a base URL to be used to expand relative URLs in the | 4109 | of the region to act on), it takes an optional parameter, |
| 4112 | document, if any. | 4110 | @var{base-url}, which is used to expand relative URLs in the document, |
| 4111 | if any. | ||
| 4113 | 4112 | ||
| 4114 | Here's an example demonstrating the structure of the parsed data you | 4113 | Here's an example demonstrating the structure of the parsed data you |
| 4115 | get out. Given this HTML document: | 4114 | get out. Given this HTML document: |
| @@ -4138,12 +4137,21 @@ values. | |||
| 4138 | 4137 | ||
| 4139 | Attributes are coded the same way as child nodes, but with @samp{:} as | 4138 | Attributes are coded the same way as child nodes, but with @samp{:} as |
| 4140 | the first character. | 4139 | the first character. |
| 4140 | @end defun | ||
| 4141 | |||
| 4142 | @cindex parsing xml | ||
| 4143 | @defun libxml-parse-xml-region start end &optional base-url | ||
| 4144 | |||
| 4145 | This is much the same as @code{libxml-parse-html-region} above, but | ||
| 4146 | operates on XML instead of HTML, and is correspondingly stricter about | ||
| 4147 | syntax. | ||
| 4148 | @end defun | ||
| 4141 | 4149 | ||
| 4142 | @node Atomic Changes | 4150 | @node Atomic Changes |
| 4143 | @section Atomic Change Groups | 4151 | @section Atomic Change Groups |
| 4144 | @cindex atomic changes | 4152 | @cindex atomic changes |
| 4145 | 4153 | ||
| 4146 | In data base terminology, an @dfn{atomic} change is an indivisible | 4154 | In database terminology, an @dfn{atomic} change is an indivisible |
| 4147 | change---it can succeed entirely or it can fail entirely, but it | 4155 | change---it can succeed entirely or it can fail entirely, but it |
| 4148 | cannot partly succeed. A Lisp program can make a series of changes to | 4156 | cannot partly succeed. A Lisp program can make a series of changes to |
| 4149 | one or several buffers as an @dfn{atomic change group}, meaning that | 4157 | one or several buffers as an @dfn{atomic change group}, meaning that |
diff --git a/doc/lispref/windows.texi b/doc/lispref/windows.texi index 9ce00de4abc..93f2035eca6 100644 --- a/doc/lispref/windows.texi +++ b/doc/lispref/windows.texi | |||
| @@ -826,8 +826,8 @@ This function updates the buffer list just like @code{switch-to-buffer} | |||
| 826 | unless @var{norecord} is non-@code{nil}. | 826 | unless @var{norecord} is non-@code{nil}. |
| 827 | @end deffn | 827 | @end deffn |
| 828 | 828 | ||
| 829 | @deffn Command pop-to-buffer buffer-or-name &optional other-window norecord | 829 | @defun pop-to-buffer buffer-or-name &optional other-window norecord |
| 830 | This command makes @var{buffer-or-name} the current buffer and switches | 830 | This function makes @var{buffer-or-name} the current buffer and switches |
| 831 | to it in some window, preferably not the window previously selected. | 831 | to it in some window, preferably not the window previously selected. |
| 832 | The ``popped-to'' window becomes the selected window. Its frame is | 832 | The ``popped-to'' window becomes the selected window. Its frame is |
| 833 | given the X server's focus, if possible; see @ref{Input Focus}. The | 833 | given the X server's focus, if possible; see @ref{Input Focus}. The |
| @@ -866,7 +866,7 @@ All the variables that affect @code{display-buffer} affect | |||
| 866 | 866 | ||
| 867 | This function updates the buffer list just like @code{switch-to-buffer} | 867 | This function updates the buffer list just like @code{switch-to-buffer} |
| 868 | unless @var{norecord} is non-@code{nil}. | 868 | unless @var{norecord} is non-@code{nil}. |
| 869 | @end deffn | 869 | @end defun |
| 870 | 870 | ||
| 871 | @deffn Command replace-buffer-in-windows &optional buffer-or-name | 871 | @deffn Command replace-buffer-in-windows &optional buffer-or-name |
| 872 | This function replaces @var{buffer-or-name} in all windows displaying | 872 | This function replaces @var{buffer-or-name} in all windows displaying |