aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Berman2016-06-13 18:08:22 +0200
committerStephen Berman2016-06-13 18:08:22 +0200
commit20de6679b0b56b4e37fa7e145a3ed33010f3f6d4 (patch)
tree5e76aada3ad2d10b0a3bd27b1554cef565090b63
parenta67a4e598d57cd9d6fb6442e747ebabc8da2798a (diff)
downloademacs-20de6679b0b56b4e37fa7e145a3ed33010f3f6d4.tar.gz
emacs-20de6679b0b56b4e37fa7e145a3ed33010f3f6d4.zip
Doc fixes for grammar and typos (bug#23746)
* doc/emacs/files.texi (Customize Save): * doc/emacs/frames.texi (Window Dividers): * doc/emacs/misc.texi (Printing): * doc/lispref/compile.texi (Compiler Errors): * doc/lispref/keymaps.texi (Changing Key Bindings): * doc/lispref/loading.texi (Named Features): * doc/lispref/markers.texi (Marker Insertion Types): * doc/lispref/modes.texi (Mode Hooks): * doc/lispref/text.texi (Undo): * src/floatfns.c (Fldexp): * src/xfaces.c (syms_of_xfaces): Minor doc fixes for grammar and typos (bug#23746).
-rw-r--r--doc/emacs/files.texi2
-rw-r--r--doc/emacs/frames.texi2
-rw-r--r--doc/emacs/misc.texi2
-rw-r--r--doc/lispref/compile.texi2
-rw-r--r--doc/lispref/keymaps.texi2
-rw-r--r--doc/lispref/loading.texi4
-rw-r--r--doc/lispref/markers.texi8
-rw-r--r--doc/lispref/modes.texi4
-rw-r--r--doc/lispref/text.texi6
-rw-r--r--src/floatfns.c4
-rw-r--r--src/xfaces.c4
11 files changed, 20 insertions, 20 deletions
diff --git a/doc/emacs/files.texi b/doc/emacs/files.texi
index 3bbb3cddb38..fc46ef7879a 100644
--- a/doc/emacs/files.texi
+++ b/doc/emacs/files.texi
@@ -701,7 +701,7 @@ after it visits the file. (This marks the buffer as modified, and you
701can undo it.) If the value is @code{visit-save}, Emacs adds such 701can undo it.) If the value is @code{visit-save}, Emacs adds such
702newlines both on visiting and on saving. If the value is @code{nil}, 702newlines both on visiting and on saving. If the value is @code{nil},
703Emacs leaves the end of the file unchanged; any other non-@code{nil} 703Emacs leaves the end of the file unchanged; any other non-@code{nil}
704value means to asks you whether to add a newline. The default is 704value means Emacs asks you whether to add a newline. The default is
705@code{nil}. 705@code{nil}.
706 706
707@vindex mode-require-final-newline 707@vindex mode-require-final-newline
diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index a7e709f9221..7e6006262ce 100644
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -1011,7 +1011,7 @@ scroll bar height, change the @code{scroll-bar-height} frame parameter
1011 1011
1012 On graphical displays, you can use @dfn{window dividers} in order to 1012 On graphical displays, you can use @dfn{window dividers} in order to
1013separate windows visually. Window dividers are bars that can be dragged 1013separate windows visually. Window dividers are bars that can be dragged
1014with the mouse, thus allowing to easily resize adjacent windows. 1014with the mouse, thus allowing you to easily resize adjacent windows.
1015 1015
1016@findex window-divider-mode 1016@findex window-divider-mode
1017 To toggle the display of window dividers, use the command @kbd{M-x 1017 To toggle the display of window dividers, use the command @kbd{M-x
diff --git a/doc/emacs/misc.texi b/doc/emacs/misc.texi
index 497a4abd71b..853b9784920 100644
--- a/doc/emacs/misc.texi
+++ b/doc/emacs/misc.texi
@@ -1885,7 +1885,7 @@ Like @code{lpr-buffer} but print only the current region.
1885@findex lpr-region 1885@findex lpr-region
1886@vindex lpr-switches 1886@vindex lpr-switches
1887@vindex lpr-commands 1887@vindex lpr-commands
1888 On most operating system, the above hardcopy commands submit files 1888 On most operating systems, the above hardcopy commands submit files
1889for printing by calling the @command{lpr} program. To change the 1889for printing by calling the @command{lpr} program. To change the
1890printer program, customize the variable @code{lpr-command}. To 1890printer program, customize the variable @code{lpr-command}. To
1891specify extra switches to give the printer program, customize the list 1891specify extra switches to give the printer program, customize the list
diff --git a/doc/lispref/compile.texi b/doc/lispref/compile.texi
index c943a6a29c1..f6cd0229c4d 100644
--- a/doc/lispref/compile.texi
+++ b/doc/lispref/compile.texi
@@ -438,7 +438,7 @@ Emacs commands for operating on compiler output can be used on these
438messages. 438messages.
439 439
440 When an error is due to invalid syntax in the program, the byte 440 When an error is due to invalid syntax in the program, the byte
441compiler might get confused about the errors' exact location. One way 441compiler might get confused about the error's exact location. One way
442to investigate is to switch to the buffer @w{@file{ *Compiler 442to investigate is to switch to the buffer @w{@file{ *Compiler
443Input*}}. (This buffer name starts with a space, so it does not show 443Input*}}. (This buffer name starts with a space, so it does not show
444up in the Buffer Menu.) This buffer contains the program being 444up in the Buffer Menu.) This buffer contains the program being
diff --git a/doc/lispref/keymaps.texi b/doc/lispref/keymaps.texi
index 61ac80c589c..f5d3811faed 100644
--- a/doc/lispref/keymaps.texi
+++ b/doc/lispref/keymaps.texi
@@ -1368,7 +1368,7 @@ default global map.
1368 The function @code{substitute-key-definition} scans a keymap for 1368 The function @code{substitute-key-definition} scans a keymap for
1369keys that have a certain binding and rebinds them with a different 1369keys that have a certain binding and rebinds them with a different
1370binding. Another feature which is cleaner and can often produce the 1370binding. Another feature which is cleaner and can often produce the
1371same results to remap one command into another (@pxref{Remapping 1371same results is to remap one command into another (@pxref{Remapping
1372Commands}). 1372Commands}).
1373 1373
1374@defun substitute-key-definition olddef newdef keymap &optional oldmap 1374@defun substitute-key-definition olddef newdef keymap &optional oldmap
diff --git a/doc/lispref/loading.texi b/doc/lispref/loading.texi
index d2d38d7fb5e..81a1922d71c 100644
--- a/doc/lispref/loading.texi
+++ b/doc/lispref/loading.texi
@@ -848,8 +848,8 @@ loaded, into the current Emacs session. This means that the facilities
848associated with @var{feature} are or will be available for other Lisp 848associated with @var{feature} are or will be available for other Lisp
849programs. 849programs.
850 850
851The direct effect of calling @code{provide} is if not already in 851The direct effect of calling @code{provide} is to add @var{feature} to
852@var{features} then to add @var{feature} to the front of that list and 852the front of @code{features} if it is not already in that list and
853call any @code{eval-after-load} code waiting for it (@pxref{Hooks for 853call any @code{eval-after-load} code waiting for it (@pxref{Hooks for
854Loading}). The argument @var{feature} must be a symbol. 854Loading}). The argument @var{feature} must be a symbol.
855@code{provide} returns @var{feature}. 855@code{provide} returns @var{feature}.
diff --git a/doc/lispref/markers.texi b/doc/lispref/markers.texi
index 1c904666cb4..1b4d74fb257 100644
--- a/doc/lispref/markers.texi
+++ b/doc/lispref/markers.texi
@@ -340,10 +340,10 @@ text is inserted at its position. If @var{type} is @code{nil},
340This function reports the current insertion type of @var{marker}. 340This function reports the current insertion type of @var{marker}.
341@end defun 341@end defun
342 342
343Most functions that create markers, without an argument allowing to 343All functions that create markers without accepting an argument that
344specify the insertion type, create them with insertion type 344specifies the insertion type, create them with insertion type
345@code{nil}. Also, the mark has, by default, insertion type 345@code{nil} (@pxref{Creating Markers}). Also, the mark has, by
346@code{nil}. 346default, insertion type @code{nil}.
347 347
348@node Moving Markers 348@node Moving Markers
349@section Moving Marker Positions 349@section Moving Marker Positions
diff --git a/doc/lispref/modes.texi b/doc/lispref/modes.texi
index ae79128f84d..4c96e63bd7b 100644
--- a/doc/lispref/modes.texi
+++ b/doc/lispref/modes.texi
@@ -899,7 +899,7 @@ follow these conventions: they may run the parent's mode hook too early,
899or fail to run @code{after-change-major-mode-hook}. If you encounter 899or fail to run @code{after-change-major-mode-hook}. If you encounter
900such a major mode, please correct it to follow these conventions. 900such a major mode, please correct it to follow these conventions.
901 901
902 When you defined a major mode using @code{define-derived-mode}, it 902 When you define a major mode using @code{define-derived-mode}, it
903automatically makes sure these conventions are followed. If you 903automatically makes sure these conventions are followed. If you
904define a major mode ``by hand'', not using @code{define-derived-mode}, 904define a major mode ``by hand'', not using @code{define-derived-mode},
905use the following functions to handle these conventions automatically. 905use the following functions to handle these conventions automatically.
@@ -1048,7 +1048,7 @@ to invert the sort order.
1048@defun tabulated-list-init-header 1048@defun tabulated-list-init-header
1049This function computes and sets @code{header-line-format} for the 1049This function computes and sets @code{header-line-format} for the
1050Tabulated List buffer (@pxref{Header Lines}), and assigns a keymap to 1050Tabulated List buffer (@pxref{Header Lines}), and assigns a keymap to
1051the header line to allow sort entries by clicking on column headers. 1051the header line to allow sorting entries by clicking on column headers.
1052 1052
1053Modes derived from Tabulated List mode should call this after setting 1053Modes derived from Tabulated List mode should call this after setting
1054the above variables (in particular, only after setting 1054the above variables (in particular, only after setting
diff --git a/doc/lispref/text.texi b/doc/lispref/text.texi
index 96f109b7561..7791c261e3b 100644
--- a/doc/lispref/text.texi
+++ b/doc/lispref/text.texi
@@ -1376,10 +1376,10 @@ before executing each key sequence, so that each undo normally undoes
1376the effects of one command. A few exceptional commands are 1376the effects of one command. A few exceptional commands are
1377@dfn{amalgamating}: these commands generally cause small changes to 1377@dfn{amalgamating}: these commands generally cause small changes to
1378buffers, so with these a boundary is inserted only every 20th command, 1378buffers, so with these a boundary is inserted only every 20th command,
1379allowing to undo them as a group. By default, commands 1379allowing the changes to be undone as a group. By default, the commands
1380@code{self-insert-command}, which produces self-inserting input 1380@code{self-insert-command}, which produces self-inserting input
1381characters (@pxref{Commands for Insertion}), and @code{delete-char} 1381characters (@pxref{Commands for Insertion}), and @code{delete-char},
1382which deletes characters (@pxref{Deletion}) are amalgamating. 1382which deletes characters (@pxref{Deletion}), are amalgamating.
1383Where a command affects the contents of several buffers, as may happen, 1383Where a command affects the contents of several buffers, as may happen,
1384for example, when a function on the @code{post-command-hook} affects a 1384for example, when a function on the @code{post-command-hook} affects a
1385buffer other than the @code{current-buffer}, then @code{undo-boundary} 1385buffer other than the @code{current-buffer}, then @code{undo-boundary}
diff --git a/src/floatfns.c b/src/floatfns.c
index c1bd25877e3..f514fcbea8c 100644
--- a/src/floatfns.c
+++ b/src/floatfns.c
@@ -185,8 +185,8 @@ If X is zero, both parts (SGNFCAND and EXP) are zero. */)
185} 185}
186 186
187DEFUN ("ldexp", Fldexp, Sldexp, 2, 2, 0, 187DEFUN ("ldexp", Fldexp, Sldexp, 2, 2, 0,
188 doc: /* Return X * 2**EXP, as a floating point number. 188 doc: /* Return SGNFCAND * 2**EXPONENT, as a floating point number.
189EXP must be an integer. */) 189EXPONENT must be an integer. */)
190 (Lisp_Object sgnfcand, Lisp_Object exponent) 190 (Lisp_Object sgnfcand, Lisp_Object exponent)
191{ 191{
192 CHECK_NUMBER (exponent); 192 CHECK_NUMBER (exponent);
diff --git a/src/xfaces.c b/src/xfaces.c
index 88f5f3415b0..5077cb2d944 100644
--- a/src/xfaces.c
+++ b/src/xfaces.c
@@ -6503,8 +6503,8 @@ REPLACEMENT is a face specification, i.e. one of the following:
6503 (3) a list in which each element has the form of (1) or (2). 6503 (3) a list in which each element has the form of (1) or (2).
6504 6504
6505List values for REPLACEMENT are merged to form the final face 6505List values for REPLACEMENT are merged to form the final face
6506specification, with earlier entries taking precedence, in the same as 6506specification, with earlier entries taking precedence, in the same way
6507as in the `face' text property. 6507as with the `face' text property.
6508 6508
6509Face-name remapping cycles are suppressed; recursive references use 6509Face-name remapping cycles are suppressed; recursive references use
6510the underlying face instead of the remapped face. So a remapping of 6510the underlying face instead of the remapped face. So a remapping of