diff options
| author | Glenn Morris | 2012-02-28 00:17:21 -0800 |
|---|---|---|
| committer | Glenn Morris | 2012-02-28 00:17:21 -0800 |
| commit | 44e97401cda5b464505ac798ae7f71dce0d2a06e (patch) | |
| tree | 4d24550756a7e70b8bf593edd241ed0988d60c07 /doc | |
| parent | a34baa83cc0a770f9a5d845174281122dda91656 (diff) | |
| download | emacs-44e97401cda5b464505ac798ae7f71dce0d2a06e.tar.gz emacs-44e97401cda5b464505ac798ae7f71dce0d2a06e.zip | |
Standardize possessive apostrophe usage in manuals, docs, and comments
Ref: http://lists.gnu.org/archive/html/emacs-devel/2012-02/msg00649.html
Diffstat (limited to 'doc')
37 files changed, 100 insertions, 81 deletions
diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog index 2f4653540e2..f097bb5cd34 100644 --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2012-02-28 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * custom.texi, display.texi, emacs.texi, files.texi: | ||
| 4 | * msdog-xtra.texi, msdog.texi, vc-xtra.texi: | ||
| 5 | Standardize possessive apostrophe usage. | ||
| 6 | |||
| 1 | 2012-02-25 Jan Djärv <jan.h.d@swipnet.se> | 7 | 2012-02-25 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 8 | ||
| 3 | * macos.texi (Mac / GNUstep Customization): Remove text about | 9 | * macos.texi (Mac / GNUstep Customization): Remove text about |
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi index b2215c19e75..82a7a02a9ac 100644 --- a/doc/emacs/custom.texi +++ b/doc/emacs/custom.texi | |||
| @@ -567,7 +567,7 @@ directory specified by the variable @code{custom-theme-directory} | |||
| 567 | (which defaults to @file{~/.emacs.d/}), and a directory named | 567 | (which defaults to @file{~/.emacs.d/}), and a directory named |
| 568 | @file{etc/themes} in your Emacs installation (see the variable | 568 | @file{etc/themes} in your Emacs installation (see the variable |
| 569 | @code{data-directory}). The latter contains several Custom themes | 569 | @code{data-directory}). The latter contains several Custom themes |
| 570 | which are distributed with Emacs, which customize Emacs' faces to fit | 570 | which are distributed with Emacs, which customize Emacs's faces to fit |
| 571 | various color schemes. (Note, however, that Custom themes need not be | 571 | various color schemes. (Note, however, that Custom themes need not be |
| 572 | restricted to this purpose; they can be used to customize variables | 572 | restricted to this purpose; they can be used to customize variables |
| 573 | too). | 573 | too). |
diff --git a/doc/emacs/display.texi b/doc/emacs/display.texi index d86e0049fb5..54dbc0a78e1 100644 --- a/doc/emacs/display.texi +++ b/doc/emacs/display.texi | |||
| @@ -22,7 +22,7 @@ the text is displayed. | |||
| 22 | * Follow Mode:: Follow mode lets two windows scroll as one. | 22 | * Follow Mode:: Follow mode lets two windows scroll as one. |
| 23 | * Faces:: How to change the display style using faces. | 23 | * Faces:: How to change the display style using faces. |
| 24 | * Colors:: Specifying colors for faces. | 24 | * Colors:: Specifying colors for faces. |
| 25 | * Standard Faces:: Emacs' predefined faces. | 25 | * Standard Faces:: The main predefined faces. |
| 26 | * Text Scale:: Increasing or decreasing text size in a buffer. | 26 | * Text Scale:: Increasing or decreasing text size in a buffer. |
| 27 | * Font Lock:: Minor mode for syntactic highlighting using faces. | 27 | * Font Lock:: Minor mode for syntactic highlighting using faces. |
| 28 | * Highlight Interactively:: Tell Emacs what text to highlight. | 28 | * Highlight Interactively:: Tell Emacs what text to highlight. |
diff --git a/doc/emacs/emacs.texi b/doc/emacs/emacs.texi index ef438cd3067..be8137aae30 100644 --- a/doc/emacs/emacs.texi +++ b/doc/emacs/emacs.texi | |||
| @@ -163,7 +163,7 @@ Major Structures of Emacs | |||
| 163 | * International:: Using non-@acronym{ASCII} character sets. | 163 | * International:: Using non-@acronym{ASCII} character sets. |
| 164 | 164 | ||
| 165 | Advanced Features | 165 | Advanced Features |
| 166 | * Modes:: Major and minor modes alter Emacs' basic behavior. | 166 | * Modes:: Major and minor modes alter Emacs's basic behavior. |
| 167 | * Indentation:: Editing the white space at the beginnings of lines. | 167 | * Indentation:: Editing the white space at the beginnings of lines. |
| 168 | * Text:: Commands and modes for editing human languages. | 168 | * Text:: Commands and modes for editing human languages. |
| 169 | * Programs:: Commands and modes for editing programs. | 169 | * Programs:: Commands and modes for editing programs. |
| @@ -337,7 +337,7 @@ Controlling the Display | |||
| 337 | * Follow Mode:: Follow mode lets two windows scroll as one. | 337 | * Follow Mode:: Follow mode lets two windows scroll as one. |
| 338 | * Faces:: How to change the display style using faces. | 338 | * Faces:: How to change the display style using faces. |
| 339 | * Colors:: Specifying colors for faces. | 339 | * Colors:: Specifying colors for faces. |
| 340 | * Standard Faces:: Emacs' predefined faces. | 340 | * Standard Faces:: The main predefined faces. |
| 341 | * Text Scale:: Increasing or decreasing text size in a buffer. | 341 | * Text Scale:: Increasing or decreasing text size in a buffer. |
| 342 | * Font Lock:: Minor mode for syntactic highlighting using faces. | 342 | * Font Lock:: Minor mode for syntactic highlighting using faces. |
| 343 | * Highlight Interactively:: Tell Emacs what text to highlight. | 343 | * Highlight Interactively:: Tell Emacs what text to highlight. |
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi index 3adc735154b..0d38728f7cf 100644 --- a/doc/emacs/files.texi +++ b/doc/emacs/files.texi | |||
| @@ -288,7 +288,7 @@ see @ref{Drag and Drop}, and @ref{Misc Dired Features}. | |||
| 288 | 288 | ||
| 289 | Each time you visit a file, Emacs automatically scans its contents | 289 | Each time you visit a file, Emacs automatically scans its contents |
| 290 | to detect what character encoding and end-of-line convention it uses, | 290 | to detect what character encoding and end-of-line convention it uses, |
| 291 | and converts these to Emacs' internal encoding and end-of-line | 291 | and converts these to Emacs's internal encoding and end-of-line |
| 292 | convention within the buffer. When you save the buffer, Emacs | 292 | convention within the buffer. When you save the buffer, Emacs |
| 293 | performs the inverse conversion, writing the file to disk with its | 293 | performs the inverse conversion, writing the file to disk with its |
| 294 | original encoding and end-of-line convention. @xref{Coding Systems}. | 294 | original encoding and end-of-line convention. @xref{Coding Systems}. |
diff --git a/doc/emacs/msdog-xtra.texi b/doc/emacs/msdog-xtra.texi index 509b9de754d..2191d799a2b 100644 --- a/doc/emacs/msdog-xtra.texi +++ b/doc/emacs/msdog-xtra.texi | |||
| @@ -33,7 +33,7 @@ you use an Emacs that was built for MS-DOS. | |||
| 33 | @ifnottex | 33 | @ifnottex |
| 34 | @xref{Text and Binary}, for information | 34 | @xref{Text and Binary}, for information |
| 35 | @end ifnottex | 35 | @end ifnottex |
| 36 | about Emacs' special handling of text files under MS-DOS (and Windows). | 36 | about Emacs's special handling of text files under MS-DOS (and Windows). |
| 37 | 37 | ||
| 38 | @menu | 38 | @menu |
| 39 | * Keyboard: MS-DOS Keyboard. Keyboard conventions on MS-DOS. | 39 | * Keyboard: MS-DOS Keyboard. Keyboard conventions on MS-DOS. |
diff --git a/doc/emacs/msdog.texi b/doc/emacs/msdog.texi index 93bc5f0e4b1..2dcc1fa42f8 100644 --- a/doc/emacs/msdog.texi +++ b/doc/emacs/msdog.texi | |||
| @@ -574,7 +574,7 @@ then change their minds; if this has the effect of bringing up the | |||
| 574 | Windows menu, it alters the meaning of subsequent commands. Many | 574 | Windows menu, it alters the meaning of subsequent commands. Many |
| 575 | users find this frustrating. | 575 | users find this frustrating. |
| 576 | 576 | ||
| 577 | You can re-enable Windows' default handling of tapping the @key{ALT} | 577 | You can re-enable Windows's default handling of tapping the @key{ALT} |
| 578 | key by setting @code{w32-pass-alt-to-system} to a non-@code{nil} | 578 | key by setting @code{w32-pass-alt-to-system} to a non-@code{nil} |
| 579 | value. | 579 | value. |
| 580 | 580 | ||
diff --git a/doc/emacs/vc-xtra.texi b/doc/emacs/vc-xtra.texi index 51137a273d3..f04f939cced 100644 --- a/doc/emacs/vc-xtra.texi +++ b/doc/emacs/vc-xtra.texi | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | @c This is part of the Emacs manual. | 1 | @c This is part of the Emacs manual. |
| 2 | @c Copyright (C) 2004-2012 Free Software Foundation, Inc. | 2 | @c Copyright (C) 2004-2012 Free Software Foundation, Inc. |
| 3 | @c See file emacs.texi for copying conditions. | 3 | @c See file emacs.texi for copying conditions. |
| 4 | @c | 4 | @c |
| 5 | @c This file is included in emacs-xtra.texi when producing the printed | 5 | @c This file is included in emacs-xtra.texi when producing the printed |
| @@ -8,7 +8,7 @@ | |||
| 8 | @node Advanced VC Usage | 8 | @node Advanced VC Usage |
| 9 | @section Advanced VC Usage | 9 | @section Advanced VC Usage |
| 10 | 10 | ||
| 11 | Commonly used features of Emacs' version control (VC) support are | 11 | Commonly used features of Emacs's version control (VC) support are |
| 12 | described in the main Emacs manual (@pxref{Version Control,,,emacs, | 12 | described in the main Emacs manual (@pxref{Version Control,,,emacs, |
| 13 | the Emacs Manual}). This chapter describes more advanced VC usage. | 13 | the Emacs Manual}). This chapter describes more advanced VC usage. |
| 14 | 14 | ||
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog index f3a95ab85ff..adac111f5f9 100644 --- a/doc/lispintro/ChangeLog +++ b/doc/lispintro/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2012-02-28 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * emacs-lisp-intro.texi: Standardize possessive apostrophe usage. | ||
| 4 | |||
| 1 | 2012-02-17 Glenn Morris <rgm@gnu.org> | 5 | 2012-02-17 Glenn Morris <rgm@gnu.org> |
| 2 | 6 | ||
| 3 | * emacs-lisp-intro.texi (Design @value{COUNT-WORDS}, Syntax) | 7 | * emacs-lisp-intro.texi (Design @value{COUNT-WORDS}, Syntax) |
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi index ae1e2bf0b6d..6a9927b785f 100644 --- a/doc/lispintro/emacs-lisp-intro.texi +++ b/doc/lispintro/emacs-lisp-intro.texi | |||
| @@ -1015,7 +1015,7 @@ Emacs with the on-line tutorial. To use it, type @kbd{C-h t}. (This | |||
| 1015 | means you press and release the @key{CTRL} key and the @kbd{h} at the | 1015 | means you press and release the @key{CTRL} key and the @kbd{h} at the |
| 1016 | same time, and then press and release @kbd{t}.) | 1016 | same time, and then press and release @kbd{t}.) |
| 1017 | 1017 | ||
| 1018 | Also, I often refer to one of Emacs' standard commands by listing the | 1018 | Also, I often refer to one of Emacs's standard commands by listing the |
| 1019 | keys which you press to invoke the command and then giving the name of | 1019 | keys which you press to invoke the command and then giving the name of |
| 1020 | the command in parentheses, like this: @kbd{M-C-\} | 1020 | the command in parentheses, like this: @kbd{M-C-\} |
| 1021 | (@code{indent-region}). What this means is that the | 1021 | (@code{indent-region}). What this means is that the |
| @@ -1325,7 +1325,7 @@ jumps the cursor back to the matching opening parenthesis, so you can | |||
| 1325 | see which one it is. This is very useful, since every list you type | 1325 | see which one it is. This is very useful, since every list you type |
| 1326 | in Lisp must have its closing parenthesis match its opening | 1326 | in Lisp must have its closing parenthesis match its opening |
| 1327 | parenthesis. (@xref{Major Modes, , Major Modes, emacs, The GNU Emacs | 1327 | parenthesis. (@xref{Major Modes, , Major Modes, emacs, The GNU Emacs |
| 1328 | Manual}, for more information about Emacs' modes.) | 1328 | Manual}, for more information about Emacs's modes.) |
| 1329 | 1329 | ||
| 1330 | @node Run a Program, Making Errors, Lisp Lists, List Processing | 1330 | @node Run a Program, Making Errors, Lisp Lists, List Processing |
| 1331 | @comment node-name, next, previous, up | 1331 | @comment node-name, next, previous, up |
| @@ -2962,7 +2962,7 @@ have eyes. When a computer program works on a buffer, that buffer does | |||
| 2962 | not need to be visible on the screen. | 2962 | not need to be visible on the screen. |
| 2963 | 2963 | ||
| 2964 | @code{switch-to-buffer} is designed for humans and does two different | 2964 | @code{switch-to-buffer} is designed for humans and does two different |
| 2965 | things: it switches the buffer to which Emacs' attention is directed; and | 2965 | things: it switches the buffer to which Emacs's attention is directed; and |
| 2966 | it switches the buffer displayed in the window to the new buffer. | 2966 | it switches the buffer displayed in the window to the new buffer. |
| 2967 | @code{set-buffer}, on the other hand, does only one thing: it switches | 2967 | @code{set-buffer}, on the other hand, does only one thing: it switches |
| 2968 | the attention of the computer program to a different buffer. The buffer | 2968 | the attention of the computer program to a different buffer. The buffer |
| @@ -4642,7 +4642,7 @@ Select a buffer for Emacs to be active in and display it in the current | |||
| 4642 | window so users can look at it. Usually bound to @kbd{C-x b}. | 4642 | window so users can look at it. Usually bound to @kbd{C-x b}. |
| 4643 | 4643 | ||
| 4644 | @item set-buffer | 4644 | @item set-buffer |
| 4645 | Switch Emacs' attention to a buffer on which programs will run. Don't | 4645 | Switch Emacs's attention to a buffer on which programs will run. Don't |
| 4646 | alter what the window is showing. | 4646 | alter what the window is showing. |
| 4647 | 4647 | ||
| 4648 | @item buffer-size | 4648 | @item buffer-size |
| @@ -5501,7 +5501,7 @@ Written in skeletal form, the workings of the body look like this: | |||
| 5501 | 5501 | ||
| 5502 | In summary, @code{append-to-buffer} works as follows: it saves the | 5502 | In summary, @code{append-to-buffer} works as follows: it saves the |
| 5503 | value of the current buffer in the variable called @code{oldbuf}. It | 5503 | value of the current buffer in the variable called @code{oldbuf}. It |
| 5504 | gets the new buffer (creating one if need be) and switches Emacs' | 5504 | gets the new buffer (creating one if need be) and switches Emacs's |
| 5505 | attention to it. Using the value of @code{oldbuf}, it inserts the | 5505 | attention to it. Using the value of @code{oldbuf}, it inserts the |
| 5506 | region of text from the old buffer into the new buffer; and then using | 5506 | region of text from the old buffer into the new buffer; and then using |
| 5507 | @code{save-excursion}, it brings you back to your original buffer. | 5507 | @code{save-excursion}, it brings you back to your original buffer. |
| @@ -6009,7 +6009,7 @@ expression in detail. The expression looks like this: | |||
| 6009 | @end smallexample | 6009 | @end smallexample |
| 6010 | 6010 | ||
| 6011 | @noindent | 6011 | @noindent |
| 6012 | The expression @code{(set-buffer buffer)} changes Emacs' attention | 6012 | The expression @code{(set-buffer buffer)} changes Emacs's attention |
| 6013 | from the current buffer to the one from which the text will copied. | 6013 | from the current buffer to the one from which the text will copied. |
| 6014 | In that buffer, the variables @code{start} and @code{end} are set to | 6014 | In that buffer, the variables @code{start} and @code{end} are set to |
| 6015 | the beginning and end of the buffer, using the commands | 6015 | the beginning and end of the buffer, using the commands |
| @@ -15284,7 +15284,7 @@ specification. Since people worry that a computer is broken if they | |||
| 15284 | don't see anything going on, the first line of the body is a | 15284 | don't see anything going on, the first line of the body is a |
| 15285 | message. | 15285 | message. |
| 15286 | 15286 | ||
| 15287 | The next line contains a @code{save-excursion} that returns Emacs' | 15287 | The next line contains a @code{save-excursion} that returns Emacs's |
| 15288 | attention to the current buffer when the function completes. This is | 15288 | attention to the current buffer when the function completes. This is |
| 15289 | useful in case you embed this function in another function that | 15289 | useful in case you embed this function in another function that |
| 15290 | presumes point is restored to the original buffer. | 15290 | presumes point is restored to the original buffer. |
| @@ -16954,7 +16954,7 @@ Either of these two functions, @code{graph-body-print} or | |||
| 16954 | @section Need for Printed Axes | 16954 | @section Need for Printed Axes |
| 16955 | 16955 | ||
| 16956 | A graph needs printed axes, so you can orient yourself. For a do-once | 16956 | A graph needs printed axes, so you can orient yourself. For a do-once |
| 16957 | project, it may be reasonable to draw the axes by hand using Emacs' | 16957 | project, it may be reasonable to draw the axes by hand using Emacs's |
| 16958 | Picture mode; but a graph drawing function may be used more than once. | 16958 | Picture mode; but a graph drawing function may be used more than once. |
| 16959 | 16959 | ||
| 16960 | For this reason, I have written enhancements to the basic | 16960 | For this reason, I have written enhancements to the basic |
| @@ -17002,10 +17002,10 @@ expressions in Emacs Lisp you can change or extend Emacs. | |||
| 17002 | 17002 | ||
| 17003 | @node Default Configuration, Site-wide Init, Emacs Initialization, Emacs Initialization | 17003 | @node Default Configuration, Site-wide Init, Emacs Initialization, Emacs Initialization |
| 17004 | @ifnottex | 17004 | @ifnottex |
| 17005 | @unnumberedsec Emacs' Default Configuration | 17005 | @unnumberedsec Emacs's Default Configuration |
| 17006 | @end ifnottex | 17006 | @end ifnottex |
| 17007 | 17007 | ||
| 17008 | There are those who appreciate Emacs' default configuration. After | 17008 | There are those who appreciate Emacs's default configuration. After |
| 17009 | all, Emacs starts you in C mode when you edit a C file, starts you in | 17009 | all, Emacs starts you in C mode when you edit a C file, starts you in |
| 17010 | Fortran mode when you edit a Fortran file, and starts you in | 17010 | Fortran mode when you edit a Fortran file, and starts you in |
| 17011 | Fundamental mode when you edit an unadorned file. This all makes | 17011 | Fundamental mode when you edit an unadorned file. This all makes |
| @@ -17033,7 +17033,7 @@ you may. The new format is consistent with the Emacs Lisp file | |||
| 17033 | naming conventions; the old format saves typing.} | 17033 | naming conventions; the old format saves typing.} |
| 17034 | 17034 | ||
| 17035 | A @file{~/.emacs} file contains Emacs Lisp code. You can write this | 17035 | A @file{~/.emacs} file contains Emacs Lisp code. You can write this |
| 17036 | code yourself; or you can use Emacs' @code{customize} feature to write | 17036 | code yourself; or you can use Emacs's @code{customize} feature to write |
| 17037 | the code for you. You can combine your own expressions and | 17037 | the code for you. You can combine your own expressions and |
| 17038 | auto-written Customize expressions in your @file{.emacs} file. | 17038 | auto-written Customize expressions in your @file{.emacs} file. |
| 17039 | 17039 | ||
| @@ -17098,7 +17098,7 @@ initialization file. | |||
| 17098 | @findex defcustom | 17098 | @findex defcustom |
| 17099 | 17099 | ||
| 17100 | You can specify variables using @code{defcustom} so that you and | 17100 | You can specify variables using @code{defcustom} so that you and |
| 17101 | others can then use Emacs' @code{customize} feature to set their | 17101 | others can then use Emacs's @code{customize} feature to set their |
| 17102 | values. (You cannot use @code{customize} to write function | 17102 | values. (You cannot use @code{customize} to write function |
| 17103 | definitions; but you can write @code{defuns} in your @file{.emacs} | 17103 | definitions; but you can write @code{defuns} in your @file{.emacs} |
| 17104 | file. Indeed, you can write any Lisp expression in your @file{.emacs} | 17104 | file. Indeed, you can write any Lisp expression in your @file{.emacs} |
| @@ -17765,7 +17765,7 @@ the keys to @code{split-window-quietly}, like this: | |||
| 17765 | @vindex load-path | 17765 | @vindex load-path |
| 17766 | If you load many extensions, as I do, then instead of specifying the | 17766 | If you load many extensions, as I do, then instead of specifying the |
| 17767 | exact location of the extension file, as shown above, you can specify | 17767 | exact location of the extension file, as shown above, you can specify |
| 17768 | that directory as part of Emacs' @code{load-path}. Then, when Emacs | 17768 | that directory as part of Emacs's @code{load-path}. Then, when Emacs |
| 17769 | loads a file, it will search that directory as well as its default | 17769 | loads a file, it will search that directory as well as its default |
| 17770 | list of directories. (The default list is specified in @file{paths.h} | 17770 | list of directories. (The default list is specified in @file{paths.h} |
| 17771 | when Emacs is built.) | 17771 | when Emacs is built.) |
diff --git a/doc/lispref/ChangeLog b/doc/lispref/ChangeLog index 094420ddb1b..b27bcef9c12 100644 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2012-02-28 Glenn Morris <rgm@gnu.org> | 1 | 2012-02-28 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * advice.texi, anti.texi, display.texi, elisp.texi: | ||
| 4 | * processes.texi, variables.texi, vol1.texi, vol2.texi: | ||
| 5 | Standardize possessive apostrophe usage. | ||
| 6 | |||
| 3 | * locals.texi: Remove file. | 7 | * locals.texi: Remove file. |
| 4 | * elisp.texi, vol1.texi, vol2.texi: Don't include locals.texi. | 8 | * elisp.texi, vol1.texi, vol2.texi: Don't include locals.texi. |
| 5 | Remove menu entry. | 9 | Remove menu entry. |
diff --git a/doc/lispref/advice.texi b/doc/lispref/advice.texi index 78b4ac9aa2d..a2f59b2ddc9 100644 --- a/doc/lispref/advice.texi +++ b/doc/lispref/advice.texi | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | @c -*-texinfo-*- | 1 | @c -*-texinfo-*- |
| 2 | @c This is part of the GNU Emacs Lisp Reference Manual. | 2 | @c This is part of the GNU Emacs Lisp Reference Manual. |
| 3 | @c Copyright (C) 1998-1999, 2001-2012 Free Software Foundation, Inc. | 3 | @c Copyright (C) 1998-1999, 2001-2012 Free Software Foundation, Inc. |
| 4 | @c See the file elisp.texi for copying conditions. | 4 | @c See the file elisp.texi for copying conditions. |
| 5 | @setfilename ../../info/advising | 5 | @setfilename ../../info/advising |
| 6 | @node Advising Functions, Debugging, Byte Compilation, Top | 6 | @node Advising Functions, Debugging, Byte Compilation, Top |
| @@ -31,7 +31,7 @@ who debug calls to the original function may not notice that it has | |||
| 31 | been modified with advice. Therefore, if you have the possibility to | 31 | been modified with advice. Therefore, if you have the possibility to |
| 32 | change the code of that function to run a hook, please solve the | 32 | change the code of that function to run a hook, please solve the |
| 33 | problem that way. Advice should be reserved for the cases where you | 33 | problem that way. Advice should be reserved for the cases where you |
| 34 | cannot get the function changed. In particular, Emacs' own source | 34 | cannot get the function changed. In particular, Emacs's own source |
| 35 | files should not put advice on functions in Emacs. There are | 35 | files should not put advice on functions in Emacs. There are |
| 36 | currently a few exceptions to this convention, but we aim to correct | 36 | currently a few exceptions to this convention, but we aim to correct |
| 37 | them. | 37 | them. |
diff --git a/doc/lispref/anti.texi b/doc/lispref/anti.texi index 6b9473e99d4..dbd39de2f6d 100644 --- a/doc/lispref/anti.texi +++ b/doc/lispref/anti.texi | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | @c -*-texinfo-*- | 1 | @c -*-texinfo-*- |
| 2 | @c This is part of the GNU Emacs Lisp Reference Manual. | 2 | @c This is part of the GNU Emacs Lisp Reference Manual. |
| 3 | @c Copyright (C) 1999, 2002-2012 Free Software Foundation, Inc. | 3 | @c Copyright (C) 1999, 2002-2012 Free Software Foundation, Inc. |
| 4 | @c See the file elisp.texi for copying conditions. | 4 | @c See the file elisp.texi for copying conditions. |
| 5 | 5 | ||
| 6 | @c This node must have no pointers. | 6 | @c This node must have no pointers. |
| @@ -29,7 +29,7 @@ different scripts. | |||
| 29 | The @code{^} interactive spec code, the function | 29 | The @code{^} interactive spec code, the function |
| 30 | @code{handle-shift-selection}, and the variable | 30 | @code{handle-shift-selection}, and the variable |
| 31 | @code{this-command-keys-shift-translated} have all been removed. | 31 | @code{this-command-keys-shift-translated} have all been removed. |
| 32 | Shift-translated keys are no longer treated specially, making Emacs' | 32 | Shift-translated keys are no longer treated specially, making Emacs's |
| 33 | handling of keybindings much more consistent. | 33 | handling of keybindings much more consistent. |
| 34 | 34 | ||
| 35 | @item | 35 | @item |
diff --git a/doc/lispref/display.texi b/doc/lispref/display.texi index ae8a5fde29f..9c4720d9102 100644 --- a/doc/lispref/display.texi +++ b/doc/lispref/display.texi | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | @c -*-texinfo-*- | 1 | @c -*-texinfo-*- |
| 2 | @c This is part of the GNU Emacs Lisp Reference Manual. | 2 | @c This is part of the GNU Emacs Lisp Reference Manual. |
| 3 | @c Copyright (C) 1990-1995, 1998-2012 Free Software Foundation, Inc. | 3 | @c Copyright (C) 1990-1995, 1998-2012 Free Software Foundation, Inc. |
| 4 | @c See the file elisp.texi for copying conditions. | 4 | @c See the file elisp.texi for copying conditions. |
| 5 | @setfilename ../../info/display | 5 | @setfilename ../../info/display |
| 6 | @node Display, System Interface, Processes, Top | 6 | @node Display, System Interface, Processes, Top |
| @@ -28,7 +28,7 @@ that Emacs presents to the user. | |||
| 28 | * Display Property:: Enabling special display features. | 28 | * Display Property:: Enabling special display features. |
| 29 | * Images:: Displaying images in Emacs buffers. | 29 | * Images:: Displaying images in Emacs buffers. |
| 30 | * Buttons:: Adding clickable buttons to Emacs buffers. | 30 | * Buttons:: Adding clickable buttons to Emacs buffers. |
| 31 | * Abstract Display:: Emacs' Widget for Object Collections. | 31 | * Abstract Display:: Emacs's Widget for Object Collections. |
| 32 | * Blinking:: How Emacs shows the matching open parenthesis. | 32 | * Blinking:: How Emacs shows the matching open parenthesis. |
| 33 | * Usual Display:: The usual conventions for displaying nonprinting chars. | 33 | * Usual Display:: The usual conventions for displaying nonprinting chars. |
| 34 | * Display Tables:: How to specify other conventions. | 34 | * Display Tables:: How to specify other conventions. |
| @@ -4941,7 +4941,7 @@ using @code{equal}. If @var{frame} is @code{nil}, it defaults to the | |||
| 4941 | selected frame. If @var{frame} is @code{t}, the image is flushed on | 4941 | selected frame. If @var{frame} is @code{t}, the image is flushed on |
| 4942 | all existing frames. | 4942 | all existing frames. |
| 4943 | 4943 | ||
| 4944 | In Emacs' current implementation, each graphical terminal possesses an | 4944 | In Emacs's current implementation, each graphical terminal possesses an |
| 4945 | image cache, which is shared by all the frames on that terminal | 4945 | image cache, which is shared by all the frames on that terminal |
| 4946 | (@pxref{Multiple Terminals}). Thus, refreshing an image in one frame | 4946 | (@pxref{Multiple Terminals}). Thus, refreshing an image in one frame |
| 4947 | also refreshes it in all other frames on the same terminal. | 4947 | also refreshes it in all other frames on the same terminal. |
diff --git a/doc/lispref/elisp.texi b/doc/lispref/elisp.texi index 701fa2a61ee..9c1837ef56b 100644 --- a/doc/lispref/elisp.texi +++ b/doc/lispref/elisp.texi | |||
| @@ -1263,7 +1263,7 @@ Emacs Display | |||
| 1263 | * Display Property:: Enabling special display features. | 1263 | * Display Property:: Enabling special display features. |
| 1264 | * Images:: Displaying images in Emacs buffers. | 1264 | * Images:: Displaying images in Emacs buffers. |
| 1265 | * Buttons:: Adding clickable buttons to Emacs buffers. | 1265 | * Buttons:: Adding clickable buttons to Emacs buffers. |
| 1266 | * Abstract Display:: Emacs' Widget for Object Collections. | 1266 | * Abstract Display:: Emacs's Widget for Object Collections. |
| 1267 | * Blinking:: How Emacs shows the matching open parenthesis. | 1267 | * Blinking:: How Emacs shows the matching open parenthesis. |
| 1268 | * Usual Display:: The usual conventions for displaying | 1268 | * Usual Display:: The usual conventions for displaying |
| 1269 | nonprinting chars. | 1269 | nonprinting chars. |
diff --git a/doc/lispref/processes.texi b/doc/lispref/processes.texi index 8b25868cfe9..04aa50ebc84 100644 --- a/doc/lispref/processes.texi +++ b/doc/lispref/processes.texi | |||
| @@ -2712,7 +2712,7 @@ Unsigned integer in network byte order, with length 3. | |||
| 2712 | @itemx dword | 2712 | @itemx dword |
| 2713 | @itemx long | 2713 | @itemx long |
| 2714 | Unsigned integer in network byte order, with length 4. | 2714 | Unsigned integer in network byte order, with length 4. |
| 2715 | Note: These values may be limited by Emacs' integer implementation limits. | 2715 | Note: These values may be limited by Emacs's integer implementation limits. |
| 2716 | 2716 | ||
| 2717 | @item u16r | 2717 | @item u16r |
| 2718 | @itemx u24r | 2718 | @itemx u24r |
diff --git a/doc/lispref/variables.texi b/doc/lispref/variables.texi index 94e71c96d0a..548d2e99414 100644 --- a/doc/lispref/variables.texi +++ b/doc/lispref/variables.texi | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | @c -*-texinfo-*- | 1 | @c -*-texinfo-*- |
| 2 | @c This is part of the GNU Emacs Lisp Reference Manual. | 2 | @c This is part of the GNU Emacs Lisp Reference Manual. |
| 3 | @c Copyright (C) 1990-1995, 1998-2012 Free Software Foundation, Inc. | 3 | @c Copyright (C) 1990-1995, 1998-2012 Free Software Foundation, Inc. |
| 4 | @c See the file elisp.texi for copying conditions. | 4 | @c See the file elisp.texi for copying conditions. |
| 5 | @setfilename ../../info/variables | 5 | @setfilename ../../info/variables |
| 6 | @node Variables, Functions, Control Structures, Top | 6 | @node Variables, Functions, Control Structures, Top |
| @@ -479,7 +479,7 @@ not the buffer-local value. (But you should not be making | |||
| 479 | buffer-local bindings for a symbol that is defined with | 479 | buffer-local bindings for a symbol that is defined with |
| 480 | @code{defconst}.) | 480 | @code{defconst}.) |
| 481 | 481 | ||
| 482 | An example of the use of @code{defconst} is Emacs' definition of | 482 | An example of the use of @code{defconst} is Emacs's definition of |
| 483 | @code{float-pi}---the mathematical constant @math{pi}, which ought not | 483 | @code{float-pi}---the mathematical constant @math{pi}, which ought not |
| 484 | to be changed by anyone (attempts by the Indiana State Legislature | 484 | to be changed by anyone (attempts by the Indiana State Legislature |
| 485 | notwithstanding). As the second form illustrates, however, | 485 | notwithstanding). As the second form illustrates, however, |
diff --git a/doc/lispref/vol1.texi b/doc/lispref/vol1.texi index 3bee9401167..0b86ccb0ce0 100644 --- a/doc/lispref/vol1.texi +++ b/doc/lispref/vol1.texi | |||
| @@ -1285,7 +1285,7 @@ Emacs Display | |||
| 1285 | * Display Property:: Enabling special display features. | 1285 | * Display Property:: Enabling special display features. |
| 1286 | * Images:: Displaying images in Emacs buffers. | 1286 | * Images:: Displaying images in Emacs buffers. |
| 1287 | * Buttons:: Adding clickable buttons to Emacs buffers. | 1287 | * Buttons:: Adding clickable buttons to Emacs buffers. |
| 1288 | * Abstract Display:: Emacs' Widget for Object Collections. | 1288 | * Abstract Display:: Emacs's Widget for Object Collections. |
| 1289 | * Blinking:: How Emacs shows the matching open parenthesis. | 1289 | * Blinking:: How Emacs shows the matching open parenthesis. |
| 1290 | * Usual Display:: The usual conventions for displaying | 1290 | * Usual Display:: The usual conventions for displaying |
| 1291 | nonprinting chars. | 1291 | nonprinting chars. |
diff --git a/doc/lispref/vol2.texi b/doc/lispref/vol2.texi index 1a293635bf6..f552739d299 100644 --- a/doc/lispref/vol2.texi +++ b/doc/lispref/vol2.texi | |||
| @@ -1284,7 +1284,7 @@ Emacs Display | |||
| 1284 | * Display Property:: Enabling special display features. | 1284 | * Display Property:: Enabling special display features. |
| 1285 | * Images:: Displaying images in Emacs buffers. | 1285 | * Images:: Displaying images in Emacs buffers. |
| 1286 | * Buttons:: Adding clickable buttons to Emacs buffers. | 1286 | * Buttons:: Adding clickable buttons to Emacs buffers. |
| 1287 | * Abstract Display:: Emacs' Widget for Object Collections. | 1287 | * Abstract Display:: Emacs's Widget for Object Collections. |
| 1288 | * Blinking:: How Emacs shows the matching open parenthesis. | 1288 | * Blinking:: How Emacs shows the matching open parenthesis. |
| 1289 | * Usual Display:: The usual conventions for displaying | 1289 | * Usual Display:: The usual conventions for displaying |
| 1290 | nonprinting chars. | 1290 | nonprinting chars. |
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 8d8b4b4df8d..987fb895811 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -1,3 +1,11 @@ | |||
| 1 | 2012-02-28 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * calc.texi, cc-mode.texi, cl.texi, ebrowse.texi, ediff.texi: | ||
| 4 | * eshell.texi, gnus-faq.texi, gnus-news.texi, gnus.texi: | ||
| 5 | * idlwave.texi, info.texi, newsticker.texi, nxml-mode.texi: | ||
| 6 | * org.texi, sc.texi, vip.texi, viper.texi: | ||
| 7 | Standardize possessive apostrophe usage. | ||
| 8 | |||
| 1 | 2012-02-26 Chong Yidong <cyd@gnu.org> | 9 | 2012-02-26 Chong Yidong <cyd@gnu.org> |
| 2 | 10 | ||
| 3 | * ediff.texi (Quick Help Commands): Add a couple of index entries | 11 | * ediff.texi (Quick Help Commands): Add a couple of index entries |
diff --git a/doc/misc/calc.texi b/doc/misc/calc.texi index c42e8e6b9c0..48252ceb327 100644 --- a/doc/misc/calc.texi +++ b/doc/misc/calc.texi | |||
| @@ -9819,7 +9819,7 @@ stack but resets everything else to its default state. | |||
| 9819 | @kindex Z ? | 9819 | @kindex Z ? |
| 9820 | @pindex calc-help | 9820 | @pindex calc-help |
| 9821 | The @kbd{?} key (@code{calc-help}) displays a series of brief help messages. | 9821 | The @kbd{?} key (@code{calc-help}) displays a series of brief help messages. |
| 9822 | Some keys (such as @kbd{b} and @kbd{d}) are prefix keys, like Emacs' | 9822 | Some keys (such as @kbd{b} and @kbd{d}) are prefix keys, like Emacs's |
| 9823 | @key{ESC} and @kbd{C-x} prefixes. You can type | 9823 | @key{ESC} and @kbd{C-x} prefixes. You can type |
| 9824 | @kbd{?} after a prefix to see a list of commands beginning with that | 9824 | @kbd{?} after a prefix to see a list of commands beginning with that |
| 9825 | prefix. (If the message includes @samp{[MORE]}, press @kbd{?} again | 9825 | prefix. (If the message includes @samp{[MORE]}, press @kbd{?} again |
| @@ -18912,7 +18912,7 @@ Computer Programming}, Volume II, contains a thorough description | |||
| 18912 | of the theory of random number generators and their measurement and | 18912 | of the theory of random number generators and their measurement and |
| 18913 | characterization. | 18913 | characterization. |
| 18914 | 18914 | ||
| 18915 | If @code{RandSeed} has no stored value, Calc calls Emacs' built-in | 18915 | If @code{RandSeed} has no stored value, Calc calls Emacs's built-in |
| 18916 | @code{random} function to get a stream of random numbers, which it | 18916 | @code{random} function to get a stream of random numbers, which it |
| 18917 | then treats in various ways to avoid problems inherent in the simple | 18917 | then treats in various ways to avoid problems inherent in the simple |
| 18918 | random number generators that many systems use to implement @code{random}. | 18918 | random number generators that many systems use to implement @code{random}. |
| @@ -35252,7 +35252,7 @@ character of the prefix can simply be typed twice. | |||
| 35252 | 35252 | ||
| 35253 | Calc is controlled by many variables, most of which can be reset | 35253 | Calc is controlled by many variables, most of which can be reset |
| 35254 | from within Calc. Some variables are less involved with actual | 35254 | from within Calc. Some variables are less involved with actual |
| 35255 | calculation and can be set outside of Calc using Emacs's | 35255 | calculation and can be set outside of Calc using Emacs'ss |
| 35256 | customization facilities. These variables are listed below. | 35256 | customization facilities. These variables are listed below. |
| 35257 | Typing @kbd{M-x customize-variable RET @var{variable-name} RET} | 35257 | Typing @kbd{M-x customize-variable RET @var{variable-name} RET} |
| 35258 | will bring up a buffer in which the variable's value can be redefined. | 35258 | will bring up a buffer in which the variable's value can be redefined. |
diff --git a/doc/misc/cc-mode.texi b/doc/misc/cc-mode.texi index c33bdbde9e4..1a192123c3e 100644 --- a/doc/misc/cc-mode.texi +++ b/doc/misc/cc-mode.texi | |||
| @@ -156,7 +156,7 @@ CC Mode | |||
| 156 | @copying | 156 | @copying |
| 157 | This manual is for CC Mode in Emacs. | 157 | This manual is for CC Mode in Emacs. |
| 158 | 158 | ||
| 159 | Copyright @copyright{} 1995-2012 Free Software Foundation, Inc. | 159 | Copyright @copyright{} 1995-2012 Free Software Foundation, Inc. |
| 160 | 160 | ||
| 161 | @quotation | 161 | @quotation |
| 162 | Permission is granted to copy, distribute and/or modify this document | 162 | Permission is granted to copy, distribute and/or modify this document |
| @@ -6942,7 +6942,7 @@ circumstances, can locate the top-most opening brace much more quickly than | |||
| 6942 | styles where these braces are hung (e.g. most JDK-derived Java styles), | 6942 | styles where these braces are hung (e.g. most JDK-derived Java styles), |
| 6943 | this hack can improve performance of the core syntax parsing routines | 6943 | this hack can improve performance of the core syntax parsing routines |
| 6944 | from 3 to 60 times. However, for styles which @emph{do} conform to | 6944 | from 3 to 60 times. However, for styles which @emph{do} conform to |
| 6945 | Emacs' recommended style of putting top-level braces in column zero, | 6945 | Emacs's recommended style of putting top-level braces in column zero, |
| 6946 | this hack can degrade performance by about as much. Thus this variable | 6946 | this hack can degrade performance by about as much. Thus this variable |
| 6947 | is set to @code{nil} by default, since the Emacs-friendly styles should | 6947 | is set to @code{nil} by default, since the Emacs-friendly styles should |
| 6948 | be more common (and encouraged!). Note that this variable has no effect | 6948 | be more common (and encouraged!). Note that this variable has no effect |
| @@ -7053,7 +7053,7 @@ Set the variable @code{c-basic-offset}. @xref{Getting Started}. | |||
| 7053 | @kindex C-j | 7053 | @kindex C-j |
| 7054 | @emph{Why doesn't the @kbd{RET} key indent the new line?} | 7054 | @emph{Why doesn't the @kbd{RET} key indent the new line?} |
| 7055 | 7055 | ||
| 7056 | Emacs' convention is that @kbd{RET} just adds a newline, and that | 7056 | Emacs's convention is that @kbd{RET} just adds a newline, and that |
| 7057 | @kbd{C-j} adds a newline and indents it. You can make @kbd{RET} do this | 7057 | @kbd{C-j} adds a newline and indents it. You can make @kbd{RET} do this |
| 7058 | too by adding this to your @code{c-initialization-hook}: | 7058 | too by adding this to your @code{c-initialization-hook}: |
| 7059 | 7059 | ||
diff --git a/doc/misc/cl.texi b/doc/misc/cl.texi index 594253e2c0a..52aaae9e006 100644 --- a/doc/misc/cl.texi +++ b/doc/misc/cl.texi | |||
| @@ -5,7 +5,7 @@ | |||
| 5 | @copying | 5 | @copying |
| 6 | This file documents the GNU Emacs Common Lisp emulation package. | 6 | This file documents the GNU Emacs Common Lisp emulation package. |
| 7 | 7 | ||
| 8 | Copyright @copyright{} 1993, 2001-2012 Free Software Foundation, Inc. | 8 | Copyright @copyright{} 1993, 2001-2012 Free Software Foundation, Inc. |
| 9 | 9 | ||
| 10 | @quotation | 10 | @quotation |
| 11 | Permission is granted to copy, distribute and/or modify this document | 11 | Permission is granted to copy, distribute and/or modify this document |
| @@ -128,7 +128,7 @@ features. | |||
| 128 | 128 | ||
| 129 | @item | 129 | @item |
| 130 | Some features conflict with existing things in Emacs Lisp. For | 130 | Some features conflict with existing things in Emacs Lisp. For |
| 131 | example, Emacs' @code{assoc} function is incompatible with the | 131 | example, Emacs's @code{assoc} function is incompatible with the |
| 132 | Common Lisp @code{assoc}. In such cases, this package usually | 132 | Common Lisp @code{assoc}. In such cases, this package usually |
| 133 | adds the suffix @samp{*} to the function name of the Common | 133 | adds the suffix @samp{*} to the function name of the Common |
| 134 | Lisp version of the function (e.g., @code{assoc*}). | 134 | Lisp version of the function (e.g., @code{assoc*}). |
| @@ -2094,7 +2094,7 @@ of a list. @var{list} should evaluate to a list; the body @var{forms} | |||
| 2094 | are executed with @var{var} bound to each element of the list in | 2094 | are executed with @var{var} bound to each element of the list in |
| 2095 | turn. Finally, the @var{result} form (or @code{nil}) is evaluated | 2095 | turn. Finally, the @var{result} form (or @code{nil}) is evaluated |
| 2096 | with @var{var} bound to @code{nil} to produce the result returned by | 2096 | with @var{var} bound to @code{nil} to produce the result returned by |
| 2097 | the loop. Unlike with Emacs's built in @code{dolist}, the loop is | 2097 | the loop. Unlike with Emacs'ss built in @code{dolist}, the loop is |
| 2098 | surrounded by an implicit @code{nil} block. | 2098 | surrounded by an implicit @code{nil} block. |
| 2099 | @end defspec | 2099 | @end defspec |
| 2100 | 2100 | ||
| @@ -2104,7 +2104,7 @@ of times. The body is executed with @var{var} bound to the integers | |||
| 2104 | from zero (inclusive) to @var{count} (exclusive), in turn. Then | 2104 | from zero (inclusive) to @var{count} (exclusive), in turn. Then |
| 2105 | the @code{result} form is evaluated with @var{var} bound to the total | 2105 | the @code{result} form is evaluated with @var{var} bound to the total |
| 2106 | number of iterations that were done (i.e., @code{(max 0 @var{count})}) | 2106 | number of iterations that were done (i.e., @code{(max 0 @var{count})}) |
| 2107 | to get the return value for the loop form. Unlike with Emacs's built in | 2107 | to get the return value for the loop form. Unlike with Emacs'ss built in |
| 2108 | @code{dolist}, the loop is surrounded by an implicit @code{nil} block. | 2108 | @code{dolist}, the loop is surrounded by an implicit @code{nil} block. |
| 2109 | @end defspec | 2109 | @end defspec |
| 2110 | 2110 | ||
| @@ -2226,7 +2226,7 @@ returned by @code{buffer-list}. For each buffer @code{buf}, | |||
| 2226 | it calls @code{buffer-file-name} and collects the results into | 2226 | it calls @code{buffer-file-name} and collects the results into |
| 2227 | a list, which is then returned from the @code{loop} construct. | 2227 | a list, which is then returned from the @code{loop} construct. |
| 2228 | The result is a list of the file names of all the buffers in | 2228 | The result is a list of the file names of all the buffers in |
| 2229 | Emacs' memory. The words @code{for}, @code{in}, and @code{collect} | 2229 | Emacs's memory. The words @code{for}, @code{in}, and @code{collect} |
| 2230 | are reserved words in the @code{loop} language. | 2230 | are reserved words in the @code{loop} language. |
| 2231 | 2231 | ||
| 2232 | @example | 2232 | @example |
| @@ -3870,7 +3870,7 @@ with @var{sequence}. | |||
| 3870 | As an extension to Common Lisp, @var{start} and/or @var{end} | 3870 | As an extension to Common Lisp, @var{start} and/or @var{end} |
| 3871 | may be negative, in which case they represent a distance back | 3871 | may be negative, in which case they represent a distance back |
| 3872 | from the end of the sequence. This is for compatibility with | 3872 | from the end of the sequence. This is for compatibility with |
| 3873 | Emacs' @code{substring} function. Note that @code{subseq} is | 3873 | Emacs's @code{substring} function. Note that @code{subseq} is |
| 3874 | the @emph{only} sequence function that allows negative | 3874 | the @emph{only} sequence function that allows negative |
| 3875 | @var{start} and @var{end}. | 3875 | @var{start} and @var{end}. |
| 3876 | 3876 | ||
| @@ -4059,7 +4059,7 @@ is less than (not equal to) its second argument. For example, | |||
| 4059 | for sorting numbers and strings, respectively; @code{>} would sort | 4059 | for sorting numbers and strings, respectively; @code{>} would sort |
| 4060 | numbers into decreasing rather than increasing order. | 4060 | numbers into decreasing rather than increasing order. |
| 4061 | 4061 | ||
| 4062 | This function differs from Emacs' built-in @code{sort} in that it | 4062 | This function differs from Emacs's built-in @code{sort} in that it |
| 4063 | can operate on any type of sequence, not just lists. Also, it | 4063 | can operate on any type of sequence, not just lists. Also, it |
| 4064 | accepts a @code{:key} argument which is used to preprocess data | 4064 | accepts a @code{:key} argument which is used to preprocess data |
| 4065 | fed to the @var{predicate} function. For example, | 4065 | fed to the @var{predicate} function. For example, |
| @@ -5186,7 +5186,7 @@ variables no collision can occur.) | |||
| 5186 | 5186 | ||
| 5187 | @xref{Lexical Bindings}, for a description of the @code{lexical-let} | 5187 | @xref{Lexical Bindings}, for a description of the @code{lexical-let} |
| 5188 | form which establishes a Common Lisp-style lexical binding, and some | 5188 | form which establishes a Common Lisp-style lexical binding, and some |
| 5189 | examples of how it differs from Emacs' regular @code{let}. | 5189 | examples of how it differs from Emacs's regular @code{let}. |
| 5190 | 5190 | ||
| 5191 | @item | 5191 | @item |
| 5192 | Reader macros. Common Lisp includes a second type of macro that | 5192 | Reader macros. Common Lisp includes a second type of macro that |
diff --git a/doc/misc/ebrowse.texi b/doc/misc/ebrowse.texi index cf716f4e031..6db27a38808 100644 --- a/doc/misc/ebrowse.texi +++ b/doc/misc/ebrowse.texi | |||
| @@ -10,7 +10,7 @@ | |||
| 10 | @copying | 10 | @copying |
| 11 | This file documents Ebrowse, a C++ class browser for GNU Emacs. | 11 | This file documents Ebrowse, a C++ class browser for GNU Emacs. |
| 12 | 12 | ||
| 13 | Copyright @copyright{} 2000-2012 Free Software Foundation, Inc. | 13 | Copyright @copyright{} 2000-2012 Free Software Foundation, Inc. |
| 14 | 14 | ||
| 15 | @quotation | 15 | @quotation |
| 16 | Permission is granted to copy, distribute and/or modify this document | 16 | Permission is granted to copy, distribute and/or modify this document |
| @@ -149,7 +149,7 @@ importantly you can find or view member declarations and definitions | |||
| 149 | with a keystroke. @xref{Member Buffers}. | 149 | with a keystroke. @xref{Member Buffers}. |
| 150 | 150 | ||
| 151 | These two buffer types and the commands they provide support the | 151 | These two buffer types and the commands they provide support the |
| 152 | navigational use of the browser. The second form resembles Emacs' Tags | 152 | navigational use of the browser. The second form resembles Emacs's Tags |
| 153 | package for C and other procedural languages. Ebrowse's commands of | 153 | package for C and other procedural languages. Ebrowse's commands of |
| 154 | this type are not confined to special buffers; they are most often used | 154 | this type are not confined to special buffers; they are most often used |
| 155 | while you are editing your source code. | 155 | while you are editing your source code. |
diff --git a/doc/misc/ediff.texi b/doc/misc/ediff.texi index 4ccb6669b2e..01349e31468 100644 --- a/doc/misc/ediff.texi +++ b/doc/misc/ediff.texi | |||
| @@ -1733,7 +1733,7 @@ faces, you can modify them when Ediff is being loaded using | |||
| 1733 | @end smallexample | 1733 | @end smallexample |
| 1734 | 1734 | ||
| 1735 | @strong{Please note:} to set Ediff's faces, use only @code{copy-face} | 1735 | @strong{Please note:} to set Ediff's faces, use only @code{copy-face} |
| 1736 | or @code{set/make-face-@dots{}} as shown above. Emacs' low-level | 1736 | or @code{set/make-face-@dots{}} as shown above. Emacs's low-level |
| 1737 | face-manipulation functions should be avoided. | 1737 | face-manipulation functions should be avoided. |
| 1738 | 1738 | ||
| 1739 | @node Narrowing, Refinement of Difference Regions, Highlighting Difference Regions, Customization | 1739 | @node Narrowing, Refinement of Difference Regions, Highlighting Difference Regions, Customization |
diff --git a/doc/misc/eshell.texi b/doc/misc/eshell.texi index 99fbf1a4fcf..d322ca7c3e1 100644 --- a/doc/misc/eshell.texi +++ b/doc/misc/eshell.texi | |||
| @@ -94,7 +94,7 @@ handling the sort of tasks accomplished by those tools. | |||
| 94 | @cindex Eshell, what it is | 94 | @cindex Eshell, what it is |
| 95 | 95 | ||
| 96 | Eshell is a @dfn{command shell} written in Emacs Lisp. Everything it | 96 | Eshell is a @dfn{command shell} written in Emacs Lisp. Everything it |
| 97 | does, it uses Emacs' facilities to do. This means that Eshell is as | 97 | does, it uses Emacs's facilities to do. This means that Eshell is as |
| 98 | portable as Emacs itself. It also means that cooperation with Lisp code | 98 | portable as Emacs itself. It also means that cooperation with Lisp code |
| 99 | is natural and seamless. | 99 | is natural and seamless. |
| 100 | 100 | ||
diff --git a/doc/misc/gnus-faq.texi b/doc/misc/gnus-faq.texi index ae6373e9a6e..9d075a8efac 100644 --- a/doc/misc/gnus-faq.texi +++ b/doc/misc/gnus-faq.texi | |||
| @@ -161,7 +161,7 @@ Where and how to get Gnus? | |||
| 161 | @subsubheading Answer | 161 | @subsubheading Answer |
| 162 | 162 | ||
| 163 | Gnus is released independent from releases of Emacs and XEmacs. | 163 | Gnus is released independent from releases of Emacs and XEmacs. |
| 164 | Therefore, the version bundled with Emacs or the version in XEmacs' | 164 | Therefore, the version bundled with Emacs or the version in XEmacs's |
| 165 | package system might not be up to date (e.g. Gnus 5.9 bundled with Emacs | 165 | package system might not be up to date (e.g. Gnus 5.9 bundled with Emacs |
| 166 | 21 is outdated). | 166 | 21 is outdated). |
| 167 | You can get the latest released version of Gnus from | 167 | You can get the latest released version of Gnus from |
diff --git a/doc/misc/gnus-news.texi b/doc/misc/gnus-news.texi index 5421e64625a..19bbe01667c 100644 --- a/doc/misc/gnus-news.texi +++ b/doc/misc/gnus-news.texi | |||
| @@ -44,7 +44,7 @@ for more information about nntp marks. Note that downgrading isn't | |||
| 44 | safe in general. | 44 | safe in general. |
| 45 | 45 | ||
| 46 | @item Incompatibility when switching from Emacs 23 to Emacs 22 | 46 | @item Incompatibility when switching from Emacs 23 to Emacs 22 |
| 47 | In Emacs 23, Gnus uses Emacs' new internal coding system @code{utf-8-emacs} | 47 | In Emacs 23, Gnus uses Emacs's new internal coding system @code{utf-8-emacs} |
| 48 | for saving articles drafts and @file{~/.newsrc.eld}. These files may not | 48 | for saving articles drafts and @file{~/.newsrc.eld}. These files may not |
| 49 | be read correctly in Emacs 22 and below. If you want to use Gnus across | 49 | be read correctly in Emacs 22 and below. If you want to use Gnus across |
| 50 | different Emacs versions, you may set @code{mm-auto-save-coding-system} | 50 | different Emacs versions, you may set @code{mm-auto-save-coding-system} |
| @@ -333,7 +333,7 @@ in the group buffer, see the variable @code{gnus-group-update-tool-bar}. | |||
| 333 | Its default value depends on your Emacs version. | 333 | Its default value depends on your Emacs version. |
| 334 | @c FIXME: Document this in the manual | 334 | @c FIXME: Document this in the manual |
| 335 | 335 | ||
| 336 | @item You can change the location of XEmacs' toolbars in Gnus buffers. | 336 | @item You can change the location of XEmacs's toolbars in Gnus buffers. |
| 337 | See @code{gnus-use-toolbar} and @code{message-use-toolbar}. | 337 | See @code{gnus-use-toolbar} and @code{message-use-toolbar}. |
| 338 | 338 | ||
| 339 | @end itemize | 339 | @end itemize |
diff --git a/doc/misc/gnus.texi b/doc/misc/gnus.texi index ae2c5dbd092..c3b62f3b791 100644 --- a/doc/misc/gnus.texi +++ b/doc/misc/gnus.texi | |||
| @@ -16696,7 +16696,7 @@ was used for mail landing on the system, but Babyl had its own internal | |||
| 16696 | format to which mail was converted, primarily involving creating a | 16696 | format to which mail was converted, primarily involving creating a |
| 16697 | spool-file-like entity with a scheme for inserting Babyl-specific | 16697 | spool-file-like entity with a scheme for inserting Babyl-specific |
| 16698 | headers and status bits above the top of each message in the file. | 16698 | headers and status bits above the top of each message in the file. |
| 16699 | Rmail was Emacs' first mail reader, it was written by Richard Stallman, | 16699 | Rmail was Emacs's first mail reader, it was written by Richard Stallman, |
| 16700 | and Stallman came out of that TOPS/Babyl environment, so he wrote Rmail | 16700 | and Stallman came out of that TOPS/Babyl environment, so he wrote Rmail |
| 16701 | to understand the mail files folks already had in existence. Gnus (and | 16701 | to understand the mail files folks already had in existence. Gnus (and |
| 16702 | VM, for that matter) continue to support this format because it's | 16702 | VM, for that matter) continue to support this format because it's |
| @@ -21040,7 +21040,7 @@ and `gnus-score-decay-scale'." | |||
| 21040 | (* (abs score) | 21040 | (* (abs score) |
| 21041 | gnus-score-decay-scale))))))) | 21041 | gnus-score-decay-scale))))))) |
| 21042 | (if (and (featurep 'xemacs) | 21042 | (if (and (featurep 'xemacs) |
| 21043 | ;; XEmacs' floor can handle only the floating point | 21043 | ;; XEmacs's floor can handle only the floating point |
| 21044 | ;; number below the half of the maximum integer. | 21044 | ;; number below the half of the maximum integer. |
| 21045 | (> (abs n) (lsh -1 -2))) | 21045 | (> (abs n) (lsh -1 -2))) |
| 21046 | (string-to-number | 21046 | (string-to-number |
diff --git a/doc/misc/idlwave.texi b/doc/misc/idlwave.texi index 5423ff2e74f..736c6ce7f91 100644 --- a/doc/misc/idlwave.texi +++ b/doc/misc/idlwave.texi | |||
| @@ -4193,7 +4193,7 @@ installed. Many Emacsen come with an older bundled copy of IDLWAVE | |||
| 4193 | (e.g. v4.7 for Emacs 21.x), which is likely what's being used instead. | 4193 | (e.g. v4.7 for Emacs 21.x), which is likely what's being used instead. |
| 4194 | You need to make sure your Emacs @emph{load-path} contains the directory | 4194 | You need to make sure your Emacs @emph{load-path} contains the directory |
| 4195 | where IDLWAVE is installed (@file{/usr/local/share/emacs/site-lisp}, by | 4195 | where IDLWAVE is installed (@file{/usr/local/share/emacs/site-lisp}, by |
| 4196 | default), @emph{before} Emacs' default search directories. You can | 4196 | default), @emph{before} Emacs's default search directories. You can |
| 4197 | accomplish this by putting the following in your @file{.emacs}: | 4197 | accomplish this by putting the following in your @file{.emacs}: |
| 4198 | 4198 | ||
| 4199 | @lisp | 4199 | @lisp |
diff --git a/doc/misc/info.texi b/doc/misc/info.texi index 3316e9883d8..ed00e8da028 100644 --- a/doc/misc/info.texi +++ b/doc/misc/info.texi | |||
| @@ -14,8 +14,7 @@ | |||
| 14 | This file describes how to use Info, the on-line, menu-driven GNU | 14 | This file describes how to use Info, the on-line, menu-driven GNU |
| 15 | documentation system. | 15 | documentation system. |
| 16 | 16 | ||
| 17 | Copyright @copyright{} 1989, 1992, 1996-2012 | 17 | Copyright @copyright{} 1989, 1992, 1996-2012 Free Software Foundation, Inc. |
| 18 | Free Software Foundation, Inc. | ||
| 19 | 18 | ||
| 20 | @quotation | 19 | @quotation |
| 21 | Permission is granted to copy, distribute and/or modify this document | 20 | Permission is granted to copy, distribute and/or modify this document |
| @@ -1108,7 +1107,7 @@ In the stand-alone reader, @kbd{0} goes through the last menu item; | |||
| 1108 | this is so you need not count how many entries are there. | 1107 | this is so you need not count how many entries are there. |
| 1109 | 1108 | ||
| 1110 | If your display supports multiple fonts, colors or underlining, and | 1109 | If your display supports multiple fonts, colors or underlining, and |
| 1111 | you are using Emacs' Info mode to read Info files, the third, sixth | 1110 | you are using Emacs's Info mode to read Info files, the third, sixth |
| 1112 | and ninth menu items have a @samp{*} that stands out, either in color | 1111 | and ninth menu items have a @samp{*} that stands out, either in color |
| 1113 | or in some other attribute, such as underline; this makes it easy to | 1112 | or in some other attribute, such as underline; this makes it easy to |
| 1114 | see at a glance which number to use for an item. | 1113 | see at a glance which number to use for an item. |
diff --git a/doc/misc/newsticker.texi b/doc/misc/newsticker.texi index 9b61e8f6f3a..919ca21cc3e 100644 --- a/doc/misc/newsticker.texi +++ b/doc/misc/newsticker.texi | |||
| @@ -13,8 +13,7 @@ | |||
| 13 | This manual is for Newsticker (version @value{VERSION}, @value{UPDATED}). | 13 | This manual is for Newsticker (version @value{VERSION}, @value{UPDATED}). |
| 14 | 14 | ||
| 15 | @noindent | 15 | @noindent |
| 16 | Copyright @copyright{} 2004-2012 | 16 | Copyright @copyright{} 2004-2012 Free Software Foundation, Inc. |
| 17 | Free Software Foundation, Inc. | ||
| 18 | 17 | ||
| 19 | @quotation | 18 | @quotation |
| 20 | Permission is granted to copy, distribute and/or modify this document | 19 | Permission is granted to copy, distribute and/or modify this document |
| @@ -128,7 +127,7 @@ requires an XML-parser (@file{xml.el}) which is part of GNU Emacs. If | |||
| 128 | you are using XEmacs you want to get the @file{net-utils} package | 127 | you are using XEmacs you want to get the @file{net-utils} package |
| 129 | which contains @file{xml.el} for XEmacs. | 128 | which contains @file{xml.el} for XEmacs. |
| 130 | 129 | ||
| 131 | Newsticker retrieves headlines either via Emacs' built-in retrieval | 130 | Newsticker retrieves headlines either via Emacs's built-in retrieval |
| 132 | functions, by an arbitrary external program that retrieves files via | 131 | functions, by an arbitrary external program that retrieves files via |
| 133 | http and prints them to stdout (like | 132 | http and prints them to stdout (like |
| 134 | @uref{http://www.gnu.org/software/wget/wget.html, wget}, or -- on a | 133 | @uref{http://www.gnu.org/software/wget/wget.html, wget}, or -- on a |
| @@ -215,7 +214,7 @@ retrieved. | |||
| 215 | @item | 214 | @item |
| 216 | @vindex newsticker-retrieval-method | 215 | @vindex newsticker-retrieval-method |
| 217 | @code{newsticker-retrieval-method} defines how headlines are | 216 | @code{newsticker-retrieval-method} defines how headlines are |
| 218 | retrieved. This is either done using Emacs' built-in download | 217 | retrieved. This is either done using Emacs's built-in download |
| 219 | capabilities or using an external tool. | 218 | capabilities or using an external tool. |
| 220 | @item | 219 | @item |
| 221 | @vindex newsticker-retrieval-interval | 220 | @vindex newsticker-retrieval-interval |
diff --git a/doc/misc/nxml-mode.texi b/doc/misc/nxml-mode.texi index 5141ed0e93d..73af1ace245 100644 --- a/doc/misc/nxml-mode.texi +++ b/doc/misc/nxml-mode.texi | |||
| @@ -8,8 +8,7 @@ | |||
| 8 | This manual documents nxml-mode, an Emacs major mode for editing | 8 | This manual documents nxml-mode, an Emacs major mode for editing |
| 9 | XML with RELAX NG support. | 9 | XML with RELAX NG support. |
| 10 | 10 | ||
| 11 | Copyright @copyright{} 2007-2012 | 11 | Copyright @copyright{} 2007-2012 Free Software Foundation, Inc. |
| 12 | Free Software Foundation, Inc. | ||
| 13 | 12 | ||
| 14 | @quotation | 13 | @quotation |
| 15 | Permission is granted to copy, distribute and/or modify this document | 14 | Permission is granted to copy, distribute and/or modify this document |
| @@ -355,7 +354,7 @@ Otherwise, it is a paragraph boundary. | |||
| 355 | @chapter Outlining | 354 | @chapter Outlining |
| 356 | 355 | ||
| 357 | nXML mode allows you to display all or part of a buffer as an | 356 | nXML mode allows you to display all or part of a buffer as an |
| 358 | outline, in a similar way to Emacs' outline mode. An outline in nXML | 357 | outline, in a similar way to Emacs's outline mode. An outline in nXML |
| 359 | mode is based on recognizing two kinds of element: sections and | 358 | mode is based on recognizing two kinds of element: sections and |
| 360 | headings. There is one heading for every section and one section for | 359 | headings. There is one heading for every section and one section for |
| 361 | every heading. A section contains its heading as or within its first | 360 | every heading. A section contains its heading as or within its first |
diff --git a/doc/misc/org.texi b/doc/misc/org.texi index 8da6cd96525..2a41d6b9301 100644 --- a/doc/misc/org.texi +++ b/doc/misc/org.texi | |||
| @@ -265,7 +265,7 @@ | |||
| 265 | @copying | 265 | @copying |
| 266 | This manual is for Org version @value{VERSION}. | 266 | This manual is for Org version @value{VERSION}. |
| 267 | 267 | ||
| 268 | Copyright @copyright{} 2004-2012 Free Software Foundation, Inc. | 268 | Copyright @copyright{} 2004-2012 Free Software Foundation, Inc. |
| 269 | 269 | ||
| 270 | @quotation | 270 | @quotation |
| 271 | Permission is granted to copy, distribute and/or modify this document | 271 | Permission is granted to copy, distribute and/or modify this document |
| @@ -6162,7 +6162,7 @@ applying it to another one. | |||
| 6162 | By customizing the variable @code{org-clock-idle-time} to some integer, such | 6162 | By customizing the variable @code{org-clock-idle-time} to some integer, such |
| 6163 | as 10 or 15, Emacs can alert you when you get back to your computer after | 6163 | as 10 or 15, Emacs can alert you when you get back to your computer after |
| 6164 | being idle for that many minutes@footnote{On computers using Mac OS X, | 6164 | being idle for that many minutes@footnote{On computers using Mac OS X, |
| 6165 | idleness is based on actual user idleness, not just Emacs' idle time. For | 6165 | idleness is based on actual user idleness, not just Emacs's idle time. For |
| 6166 | X11, you can install a utility program @file{x11idle.c}, available in the | 6166 | X11, you can install a utility program @file{x11idle.c}, available in the |
| 6167 | UTILITIES directory of the Org git distribution, to get the same general | 6167 | UTILITIES directory of the Org git distribution, to get the same general |
| 6168 | treatment of idleness. On other systems, idle time refers to Emacs idle time | 6168 | treatment of idleness. On other systems, idle time refers to Emacs idle time |
diff --git a/doc/misc/sc.texi b/doc/misc/sc.texi index 6874828d427..b921882af67 100644 --- a/doc/misc/sc.texi +++ b/doc/misc/sc.texi | |||
| @@ -204,7 +204,7 @@ When the original message is cited by @code{sc-cite-original}, it will | |||
| 204 | (optionally) be filled by Supercite. However, if you manually edit the | 204 | (optionally) be filled by Supercite. However, if you manually edit the |
| 205 | cited text and want to re-fill it, you must use an add-on package such | 205 | cited text and want to re-fill it, you must use an add-on package such |
| 206 | as @cite{filladapt} or @cite{gin-mode}. These packages can recognize | 206 | as @cite{filladapt} or @cite{gin-mode}. These packages can recognize |
| 207 | Supercited text and will fill them appropriately. Emacs' built-in | 207 | Supercited text and will fill them appropriately. Emacs's built-in |
| 208 | filling routines, e.g@. @code{fill-paragraph}, do not recognize cited | 208 | filling routines, e.g@. @code{fill-paragraph}, do not recognize cited |
| 209 | text and will not re-fill them properly because it cannot guess the | 209 | text and will not re-fill them properly because it cannot guess the |
| 210 | @code{fill-prefix} being used. | 210 | @code{fill-prefix} being used. |
| @@ -786,7 +786,7 @@ pertaining to the MUAs you are using. | |||
| 786 | One final note. After Supercite is loaded into your Emacs session, it | 786 | One final note. After Supercite is loaded into your Emacs session, it |
| 787 | runs the hook @code{sc-load-hook}. You can put any customizations into | 787 | runs the hook @code{sc-load-hook}. You can put any customizations into |
| 788 | this hook since it is only run once. This will not work, however, if | 788 | this hook since it is only run once. This will not work, however, if |
| 789 | your Emacs maintainer has put Supercite into your dumped Emacs' image. | 789 | your Emacs maintainer has put Supercite into your dumped Emacs image. |
| 790 | In that case, you can use the @code{sc-pre-hook} variable, but this will | 790 | In that case, you can use the @code{sc-pre-hook} variable, but this will |
| 791 | get executed every time @code{sc-cite-original} is called. @xref{Reply | 791 | get executed every time @code{sc-cite-original} is called. @xref{Reply |
| 792 | Buffer Initialization}.@refill | 792 | Buffer Initialization}.@refill |
| @@ -1008,7 +1008,7 @@ fill each cited paragraph in the reply buffer. | |||
| 1008 | 1008 | ||
| 1009 | I usually run with both these variables containing their default values. | 1009 | I usually run with both these variables containing their default values. |
| 1010 | When Supercite's automatic filling breaks on a particular message, I | 1010 | When Supercite's automatic filling breaks on a particular message, I |
| 1011 | will use Emacs' undo feature to undo back before the citation was | 1011 | will use Emacs's undo feature to undo back before the citation was |
| 1012 | applied to the original message. Then I'll toggle the variables and | 1012 | applied to the original message. Then I'll toggle the variables and |
| 1013 | manually cite those paragraphs that I don't want to fill or collapse | 1013 | manually cite those paragraphs that I don't want to fill or collapse |
| 1014 | whitespace on. @xref{Variable Toggling Shortcuts}.@refill | 1014 | whitespace on. @xref{Variable Toggling Shortcuts}.@refill |
| @@ -1688,7 +1688,7 @@ Toggles the variable @code{sc-fixup-whitespace-p}. | |||
| 1688 | 1688 | ||
| 1689 | @findex set-variable | 1689 | @findex set-variable |
| 1690 | The following commands let you set the value of multi-value variables, | 1690 | The following commands let you set the value of multi-value variables, |
| 1691 | in the same way that Emacs' @code{set-variable} does: | 1691 | in the same way that Emacs's @code{set-variable} does: |
| 1692 | 1692 | ||
| 1693 | @table @kbd | 1693 | @table @kbd |
| 1694 | @item C-c C-p C-t a | 1694 | @item C-c C-p C-t a |
| @@ -1777,7 +1777,7 @@ old information is lost.@refill | |||
| 1777 | @findex open-line | 1777 | @findex open-line |
| 1778 | @kindex C-c C-p o | 1778 | @kindex C-c C-p o |
| 1779 | @item @code{sc-open-line} (@kbd{C-c C-p o}) | 1779 | @item @code{sc-open-line} (@kbd{C-c C-p o}) |
| 1780 | Similar to Emacs' standard @code{open-line} commands, but inserts the | 1780 | Similar to Emacs's standard @code{open-line} commands, but inserts the |
| 1781 | citation string in front of the new line. As with @code{open-line}, | 1781 | citation string in front of the new line. As with @code{open-line}, |
| 1782 | an optional numeric argument inserts that many new lines.@refill | 1782 | an optional numeric argument inserts that many new lines.@refill |
| 1783 | @end table | 1783 | @end table |
diff --git a/doc/misc/vip.texi b/doc/misc/vip.texi index 4b4bbfe5091..0d9bb286330 100644 --- a/doc/misc/vip.texi +++ b/doc/misc/vip.texi | |||
| @@ -1705,7 +1705,7 @@ expressions}. For example, a typical forward search would be invoked by | |||
| 1705 | @var{pat} you must preceded it by @samp{\}. VIP strips off these @kbd{\}'s | 1705 | @var{pat} you must preceded it by @samp{\}. VIP strips off these @kbd{\}'s |
| 1706 | before @kbd{/} and the resulting @var{pat} becomes the actual search | 1706 | before @kbd{/} and the resulting @var{pat} becomes the actual search |
| 1707 | pattern. Emacs provides a different and richer class or regular | 1707 | pattern. Emacs provides a different and richer class or regular |
| 1708 | expressions than Vi/Ex, and VIP uses Emacs' regular expressions. See GNU | 1708 | expressions than Vi/Ex, and VIP uses Emacs's regular expressions. See GNU |
| 1709 | Emacs Manual for details of regular expressions. | 1709 | Emacs Manual for details of regular expressions. |
| 1710 | 1710 | ||
| 1711 | Several Ex commands can be entered in a line by separating them by a pipe | 1711 | Several Ex commands can be entered in a line by separating them by a pipe |
diff --git a/doc/misc/viper.texi b/doc/misc/viper.texi index a660cfb6b9d..86455524b1f 100644 --- a/doc/misc/viper.texi +++ b/doc/misc/viper.texi | |||
| @@ -687,7 +687,7 @@ Insert state. For instance, Emacs has a @dfn{yank} command, @kbd{C-y}, | |||
| 687 | which is similar to Vi's @kbd{p}. However, unlike @kbd{p}, @kbd{C-y} can be | 687 | which is similar to Vi's @kbd{p}. However, unlike @kbd{p}, @kbd{C-y} can be |
| 688 | used in Insert state of Viper. Emacs also has a kill ring where it keeps | 688 | used in Insert state of Viper. Emacs also has a kill ring where it keeps |
| 689 | pieces of text you deleted while editing buffers. The command @kbd{M-y} is | 689 | pieces of text you deleted while editing buffers. The command @kbd{M-y} is |
| 690 | used to delete the text previously put back by Emacs' @kbd{C-y} or by Vi's | 690 | used to delete the text previously put back by Emacs's @kbd{C-y} or by Vi's |
| 691 | @kbd{p} command and reinsert text that was placed on the kill-ring earlier. | 691 | @kbd{p} command and reinsert text that was placed on the kill-ring earlier. |
| 692 | 692 | ||
| 693 | This works both in Vi and Insert states. | 693 | This works both in Vi and Insert states. |
| @@ -1289,7 +1289,7 @@ the following example: | |||
| 1289 | The above discussion of the meaning of Viper's words concerns only Viper's | 1289 | The above discussion of the meaning of Viper's words concerns only Viper's |
| 1290 | movement commands. In regular expressions, words remain the same as in | 1290 | movement commands. In regular expressions, words remain the same as in |
| 1291 | Emacs. That is, the expressions @code{\w}, @code{\>}, @code{\<}, etc., use | 1291 | Emacs. That is, the expressions @code{\w}, @code{\>}, @code{\<}, etc., use |
| 1292 | Emacs' idea of what is a word, and they don't look into the value of | 1292 | Emacs's idea of what is a word, and they don't look into the value of |
| 1293 | variable @code{viper-syntax-preference}. This is because Viper doesn't change | 1293 | variable @code{viper-syntax-preference}. This is because Viper doesn't change |
| 1294 | syntax tables in fear of upsetting the various major modes that set these | 1294 | syntax tables in fear of upsetting the various major modes that set these |
| 1295 | tables. | 1295 | tables. |
| @@ -2504,7 +2504,7 @@ major modes. | |||
| 2504 | @item viper-minibuffer-emacs-face 'viper-minibuffer-emacs-face | 2504 | @item viper-minibuffer-emacs-face 'viper-minibuffer-emacs-face |
| 2505 | These faces control the appearance of the minibuffer text in the | 2505 | These faces control the appearance of the minibuffer text in the |
| 2506 | corresponding Viper states. You can change the appearance of these faces | 2506 | corresponding Viper states. You can change the appearance of these faces |
| 2507 | through Emacs' customization widget, which is accessible through the | 2507 | through Emacs's customization widget, which is accessible through the |
| 2508 | menubar. | 2508 | menubar. |
| 2509 | 2509 | ||
| 2510 | Viper is located in this widget under the @emph{Emulations} customization | 2510 | Viper is located in this widget under the @emph{Emulations} customization |
| @@ -3205,7 +3205,7 @@ in the appropriate major mode hooks. | |||
| 3205 | 3205 | ||
| 3206 | The above discussion concerns only the movement commands. In regular | 3206 | The above discussion concerns only the movement commands. In regular |
| 3207 | expressions, words remain the same as in Emacs. That is, the expressions | 3207 | expressions, words remain the same as in Emacs. That is, the expressions |
| 3208 | @code{\w}, @code{\>}, @code{\<}, etc., use Emacs' idea of what is a word, | 3208 | @code{\w}, @code{\>}, @code{\<}, etc., use Emacs's idea of what is a word, |
| 3209 | and they don't look into the value of variable | 3209 | and they don't look into the value of variable |
| 3210 | @code{viper-syntax-preference}. This is because Viper avoids changing | 3210 | @code{viper-syntax-preference}. This is because Viper avoids changing |
| 3211 | syntax tables in order to not thwart the various major modes that set these | 3211 | syntax tables in order to not thwart the various major modes that set these |