diff options
| author | Stephen Gildea | 2019-11-03 18:36:05 -0800 |
|---|---|---|
| committer | Stephen Gildea | 2019-11-03 18:36:45 -0800 |
| commit | 1d4862e8c18aff5e2a59b9fb37e643a389683047 (patch) | |
| tree | a8185f4df41d0c4b08f229905443d57305ac9f1a /src | |
| parent | 8ae7c8866d01d792127591a56221f382692d2571 (diff) | |
| download | emacs-1d4862e8c18aff5e2a59b9fb37e643a389683047.tar.gz emacs-1d4862e8c18aff5e2a59b9fb37e643a389683047.zip | |
Fix English grammar in some doc strings and comments
(files.el subr.el): Fix some grammar errors in doc strings and comments.
(frame.c fringe.c image.c xfns.c xterm.c): Fix some English grammar
errors in doc strings.
Diffstat (limited to 'src')
| -rw-r--r-- | src/frame.c | 2 | ||||
| -rw-r--r-- | src/fringe.c | 4 | ||||
| -rw-r--r-- | src/image.c | 4 | ||||
| -rw-r--r-- | src/xfns.c | 12 | ||||
| -rw-r--r-- | src/xterm.c | 2 |
5 files changed, 12 insertions, 12 deletions
diff --git a/src/frame.c b/src/frame.c index 8ca5106cb2a..486d025e6d6 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -6120,7 +6120,7 @@ which need to do mouse handling at the Lisp level. */); | |||
| 6120 | 6120 | ||
| 6121 | DEFVAR_LISP ("mouse-highlight", Vmouse_highlight, | 6121 | DEFVAR_LISP ("mouse-highlight", Vmouse_highlight, |
| 6122 | doc: /* If non-nil, clickable text is highlighted when mouse is over it. | 6122 | doc: /* If non-nil, clickable text is highlighted when mouse is over it. |
| 6123 | If the value is an integer, highlighting is only shown after moving the | 6123 | If the value is an integer, highlighting is shown only after moving the |
| 6124 | mouse, while keyboard input turns off the highlight even when the mouse | 6124 | mouse, while keyboard input turns off the highlight even when the mouse |
| 6125 | is over the clickable text. However, the mouse shape still indicates | 6125 | is over the clickable text. However, the mouse shape still indicates |
| 6126 | when the mouse is over clickable text. */); | 6126 | when the mouse is over clickable text. */); |
diff --git a/src/fringe.c b/src/fringe.c index 08bf271ed56..ded7c44e905 100644 --- a/src/fringe.c +++ b/src/fringe.c | |||
| @@ -1716,8 +1716,8 @@ syms_of_fringe (void) | |||
| 1716 | 1716 | ||
| 1717 | DEFVAR_LISP ("overflow-newline-into-fringe", Voverflow_newline_into_fringe, | 1717 | DEFVAR_LISP ("overflow-newline-into-fringe", Voverflow_newline_into_fringe, |
| 1718 | doc: /* Non-nil means that newline may flow into the right fringe. | 1718 | doc: /* Non-nil means that newline may flow into the right fringe. |
| 1719 | This means that display lines which are exactly as wide as the window | 1719 | This means that display lines that are exactly as wide as the window |
| 1720 | \(not counting the final newline) will only occupy one screen line, by | 1720 | \(not counting the final newline) will occupy only one screen line, by |
| 1721 | showing (or hiding) the final newline in the right fringe; when point | 1721 | showing (or hiding) the final newline in the right fringe; when point |
| 1722 | is at the final newline, the cursor is shown in the right fringe. | 1722 | is at the final newline, the cursor is shown in the right fringe. |
| 1723 | If nil, also continue lines which are exactly as wide as the window. */); | 1723 | If nil, also continue lines which are exactly as wide as the window. */); |
diff --git a/src/image.c b/src/image.c index 08e420837a0..870f008b14f 100644 --- a/src/image.c +++ b/src/image.c | |||
| @@ -1758,7 +1758,7 @@ DEFUN ("clear-image-cache", Fclear_image_cache, Sclear_image_cache, | |||
| 1758 | doc: /* Clear the image cache. | 1758 | doc: /* Clear the image cache. |
| 1759 | FILTER nil or a frame means clear all images in the selected frame. | 1759 | FILTER nil or a frame means clear all images in the selected frame. |
| 1760 | FILTER t means clear the image caches of all frames. | 1760 | FILTER t means clear the image caches of all frames. |
| 1761 | Anything else, means only clear those images which refer to FILTER, | 1761 | Anything else means clear only those images that refer to FILTER, |
| 1762 | which is then usually a filename. */) | 1762 | which is then usually a filename. */) |
| 1763 | (Lisp_Object filter) | 1763 | (Lisp_Object filter) |
| 1764 | { | 1764 | { |
| @@ -10055,7 +10055,7 @@ DEFUN ("init-image-library", Finit_image_library, Sinit_image_library, 1, 1, 0, | |||
| 10055 | doc: /* Initialize image library implementing image type TYPE. | 10055 | doc: /* Initialize image library implementing image type TYPE. |
| 10056 | Return t if TYPE is a supported image type. | 10056 | Return t if TYPE is a supported image type. |
| 10057 | 10057 | ||
| 10058 | If image libraries are loaded dynamically (currently only the case on | 10058 | If image libraries are loaded dynamically (currently the case only on |
| 10059 | MS-Windows), load the library for TYPE if it is not yet loaded, using | 10059 | MS-Windows), load the library for TYPE if it is not yet loaded, using |
| 10060 | the library file(s) specified by `dynamic-library-alist'. */) | 10060 | the library file(s) specified by `dynamic-library-alist'. */) |
| 10061 | (Lisp_Object type) | 10061 | (Lisp_Object type) |
diff --git a/src/xfns.c b/src/xfns.c index 20e63a26501..b1b40702c24 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -1,4 +1,4 @@ | |||
| 1 | /* Functions for the X window system. | 1 | /* Functions for the X Window System. |
| 2 | 2 | ||
| 3 | Copyright (C) 1989, 1992-2019 Free Software Foundation, Inc. | 3 | Copyright (C) 1989, 1992-2019 Free Software Foundation, Inc. |
| 4 | 4 | ||
| @@ -5351,8 +5351,8 @@ and width values are in pixels. | |||
| 5351 | FRAME. | 5351 | FRAME. |
| 5352 | 5352 | ||
| 5353 | `outer-border-width' is the width of the X border of FRAME. The X | 5353 | `outer-border-width' is the width of the X border of FRAME. The X |
| 5354 | border is usually only shown for frames without window manager | 5354 | border is usually shown only for frames without window manager |
| 5355 | decorations like child and tooltip frames. */) | 5355 | decorations, such as child and tooltip frames. */) |
| 5356 | (Lisp_Object frame) | 5356 | (Lisp_Object frame) |
| 5357 | { | 5357 | { |
| 5358 | return frame_geometry (frame, Qnil); | 5358 | return frame_geometry (frame, Qnil); |
| @@ -5787,7 +5787,7 @@ DEFUN ("x-display-list", Fx_display_list, Sx_display_list, 0, 0, 0, | |||
| 5787 | 5787 | ||
| 5788 | DEFUN ("x-synchronize", Fx_synchronize, Sx_synchronize, 1, 2, 0, | 5788 | DEFUN ("x-synchronize", Fx_synchronize, Sx_synchronize, 1, 2, 0, |
| 5789 | doc: /* If ON is non-nil, report X errors as soon as the erring request is made. | 5789 | doc: /* If ON is non-nil, report X errors as soon as the erring request is made. |
| 5790 | This function only has an effect on X Windows. With MS Windows, it is | 5790 | This function has an effect only on X Windows. With MS Windows, it is |
| 5791 | defined but does nothing. | 5791 | defined but does nothing. |
| 5792 | 5792 | ||
| 5793 | If ON is nil, allow buffering of requests. | 5793 | If ON is nil, allow buffering of requests. |
| @@ -7365,9 +7365,9 @@ Use a file selection dialog. Select DEFAULT-FILENAME in the dialog's file | |||
| 7365 | selection box, if specified. If MUSTMATCH is non-nil, the returned file | 7365 | selection box, if specified. If MUSTMATCH is non-nil, the returned file |
| 7366 | or directory must exist. | 7366 | or directory must exist. |
| 7367 | 7367 | ||
| 7368 | This function is only defined on NS, MS Windows, and X Windows with the | 7368 | This function is defined only on NS, MS Windows, and X Windows with the |
| 7369 | Motif or Gtk toolkits. With the Motif toolkit, ONLY-DIR-P is ignored. | 7369 | Motif or Gtk toolkits. With the Motif toolkit, ONLY-DIR-P is ignored. |
| 7370 | Otherwise, if ONLY-DIR-P is non-nil, the user can only select directories. | 7370 | Otherwise, if ONLY-DIR-P is non-nil, the user can select only directories. |
| 7371 | On MS Windows 7 and later, the file selection dialog "remembers" the last | 7371 | On MS Windows 7 and later, the file selection dialog "remembers" the last |
| 7372 | directory where the user selected a file, and will open that directory | 7372 | directory where the user selected a file, and will open that directory |
| 7373 | instead of DIR on subsequent invocations of this function with the same | 7373 | instead of DIR on subsequent invocations of this function with the same |
diff --git a/src/xterm.c b/src/xterm.c index 045589534fb..44fbd27b11a 100644 --- a/src/xterm.c +++ b/src/xterm.c | |||
| @@ -13636,7 +13636,7 @@ baseline level. The default value is nil. */); | |||
| 13636 | DEFVAR_BOOL ("x-mouse-click-focus-ignore-position", | 13636 | DEFVAR_BOOL ("x-mouse-click-focus-ignore-position", |
| 13637 | x_mouse_click_focus_ignore_position, | 13637 | x_mouse_click_focus_ignore_position, |
| 13638 | doc: /* Non-nil means that a mouse click to focus a frame does not move point. | 13638 | doc: /* Non-nil means that a mouse click to focus a frame does not move point. |
| 13639 | This variable is only used when the window manager requires that you | 13639 | This variable is used only when the window manager requires that you |
| 13640 | click on a frame to select it (give it focus). In that case, a value | 13640 | click on a frame to select it (give it focus). In that case, a value |
| 13641 | of nil, means that the selected window and cursor position changes to | 13641 | of nil, means that the selected window and cursor position changes to |
| 13642 | reflect the mouse click position, while a non-nil value means that the | 13642 | reflect the mouse click position, while a non-nil value means that the |