[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
master 1d4862e: Fix English grammar in some doc strings and comments
|
From: |
Stephen Gildea |
|
Subject: |
master 1d4862e: Fix English grammar in some doc strings and comments |
|
Date: |
Sun, 3 Nov 2019 21:38:02 -0500 (EST) |
branch: master
commit 1d4862e8c18aff5e2a59b9fb37e643a389683047
Author: Stephen Gildea <address@hidden>
Commit: Stephen Gildea <address@hidden>
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.
---
lisp/files.el | 108 +++++++++++++++++++++++++++++-----------------------------
lisp/subr.el | 60 ++++++++++++++++----------------
src/frame.c | 2 +-
src/fringe.c | 4 +--
src/image.c | 4 +--
src/xfns.c | 12 +++----
src/xterm.c | 2 +-
7 files changed, 96 insertions(+), 96 deletions(-)
diff --git a/lisp/files.el b/lisp/files.el
index f6dc4ba..7690357 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -67,7 +67,7 @@ FROM and TO should be equivalent names, which refer to the
same directory. TO should be an absolute directory name.
Do not use `~' in the TO strings.
-Use this feature when you have directories which you normally refer to
+Use this feature when you have directories that you normally refer to
via absolute symbolic links. Make TO the name of the link, and FROM
a regexp matching the name it is linked to."
:type '(repeat (cons :format "%v"
@@ -123,7 +123,7 @@ This variable is relevant only if `backup-by-copying' is
nil."
"Non-nil means create backups by copying if this preserves owner or group.
Renaming may still be used (subject to control of other variables)
when it would not result in changing the owner or group of the file;
-that is, for files which are owned by you and whose group matches
+that is, for files that are owned by you and whose group matches
the default for a new file created there by you.
This variable is relevant only if `backup-by-copying' is nil."
:version "24.1"
@@ -239,7 +239,7 @@ have fast storage with limited space, such as a RAM disk."
(concat "^\\([^A-Z[-`a-z]\\|..+\\)?:\\|" ; colon except after drive
"[|<>\"?*\000-\037]"))) ; invalid characters
(t (purecopy "[\000]")))
- "Regexp recognizing file names which aren't allowed by the filesystem.")
+ "Regexp recognizing file names that aren't allowed by the filesystem.")
(defcustom file-precious-flag nil
"Non-nil means protect against I/O errors while saving files.
@@ -338,7 +338,7 @@ A value of nil means don't add newlines.
Certain major modes set this locally to the value obtained
from `mode-require-final-newline'.
-This variable is only heeded when visiting files (or saving
+This variable is heeded only when visiting files (or saving
buffers into files they visit). Writing data to the file system
with `write-region' and the like is not influenced by this variable."
:safe #'symbolp
@@ -504,7 +504,7 @@ for the file's directory."
(define-obsolete-variable-alias 'write-file-hooks 'write-file-functions "22.1")
(defvar write-file-functions nil
"List of functions to be called before saving a buffer to a file.
-Only used by `save-buffer'.
+Used only by `save-buffer'.
If one of them returns non-nil, the file is considered already written
and the rest are not called.
These hooks are considered to pertain to the visited file.
@@ -532,7 +532,7 @@ updates before the buffer is saved, use
`before-save-hook'.")
(defvar write-contents-functions nil
"List of functions to be called before writing out a buffer to a file.
-Only used by `save-buffer'. If one of them returns non-nil, the
+Used only by `save-buffer'. If one of them returns non-nil, the
file is considered already written and the rest are not called
and neither are the functions in `write-file-functions'. This
hook can thus be used to create save behavior for buffers that
@@ -707,7 +707,7 @@ non-empty string that was inserted by this function.
(If DEFAULT-DIRNAME is omitted, DIR combined with INITIAL is used,
or just DIR if INITIAL is nil.)
If the user exits with an empty minibuffer, this function returns
-an empty string. (This can only happen if the user erased the
+an empty string. (This can happen only if the user erased the
pre-inserted contents or if `insert-default-directory' is nil.)
Fourth arg MUSTMATCH non-nil means require existing directory's name.
Non-nil and non-t means also require confirmation after completion.
@@ -934,7 +934,7 @@ one or more of those symbols."
;; entries for the poor soul looking just for "foo". OTOH, sometimes
;; the user does want to pay attention to the extension. We try to
;; diffuse this tension by stripping the suffix, except when the
- ;; result is a single element (i.e. usually we only list "foo" unless
+ ;; result is a single element (i.e. usually we list only "foo" unless
;; it's the only remaining element in the list, in which case we do
;; list "foo", "foo.elc" and "foo.el").
(fullnames '())
@@ -956,11 +956,11 @@ one or more of those symbols."
;; which can cause problems with things like partial-completion.
;; To minimize the problem, filter out completion-regexp-list, so that
;; M-x load-library RET t/x.e TAB finds some files. Also remove elements
- ;; from `names' which only matched `string' when they still had
+ ;; from `names' that matched `string' only when they still had
;; their suffix.
(setq names (all-completions string names))
;; Remove duplicates of the first element, so that we can easily check
- ;; if `names' really only contains a single element.
+ ;; if `names' really contains only a single element.
(when (cdr names) (setcdr names (delete (car names) (cdr names))))
(unless (cdr names)
;; There's no more than one matching non-suffixed element, so expand
@@ -979,10 +979,10 @@ PATH-AND-SUFFIXES is a pair of lists, (DIRECTORIES .
SUFFIXES)."
(defvar locate-dominating-stop-dir-regexp
(purecopy
"\\`\\(?:[\\/][\\/][^\\/]+[\\/]\\|/\\(?:net\\|afs\\|\\.\\.\\.\\)/\\)\\'")
- "Regexp of directory names which stop the search in `locate-dominating-file'.
+ "Regexp of directory names that stop the search in `locate-dominating-file'.
Any directory whose name matches this regexp will be treated like
-a kind of root directory by `locate-dominating-file' which will stop its search
-when it bumps into it.
+a kind of root directory by `locate-dominating-file', which will stop its
+search when it bumps into it.
The default regexp prevents fruitless and time-consuming attempts to find
special files in directories in which filenames are interpreted as hostnames,
or mount points potentially requiring authentication as a different user.")
@@ -1051,7 +1051,7 @@ directory if it does not exist."
(when (and errtype
user-emacs-directory-warning
(not (get 'user-emacs-directory-warning 'this-session)))
- ;; Only warn once per Emacs session.
+ ;; Warn only once per Emacs session.
(put 'user-emacs-directory-warning 'this-session t)
(display-warning 'initialization
(format "\
@@ -1065,7 +1065,7 @@ customize the variable `user-emacs-directory-warning'."
(defun exec-path ()
"Return list of directories to search programs to run in remote subprocesses.
The remote host is identified by `default-directory'. For remote
-hosts which do not support subprocesses, this returns `nil'.
+hosts that do not support subprocesses, this returns `nil'.
If `default-directory' is a local directory, this function returns
the value of the variable `exec-path'."
(let ((handler (find-file-name-handler default-directory 'exec-path)))
@@ -1114,7 +1114,7 @@ A file is considered remote if accessing it is likely to
be slower or less reliable than accessing local files.
`file-remote-p' never opens a new remote connection. It can
-only reuse a connection that is already open.
+reuse only a connection that is already open.
Return nil or a string identifying the remote connection
\(ideally a prefix of FILE). Return nil if FILE is a relative
@@ -1254,7 +1254,7 @@ both at the level of the file and at the level of the
directories
containing it, until no links are left at any level.
\(fn FILENAME)" ;; Don't document the optional arguments.
- ;; COUNTER and PREV-DIRS are only used in recursive calls.
+ ;; COUNTER and PREV-DIRS are used only in recursive calls.
;; COUNTER can be a cons cell whose car is the count of how many
;; more links to chase before getting an error.
;; PREV-DIRS can be a cons cell whose car is an alist
@@ -1452,7 +1452,7 @@ constraints do not force a specific format."
;;(concat
;; "^" (regexp-opt '("/afs/" "/media/" "/mnt" "/net/" "/tmp_mnt/"))))
"^\\(?:/\\(?:afs/\\|m\\(?:edia/\\|nt\\)\\|\\(?:ne\\|tmp_mn\\)t/\\)\\)")
- "File systems which ought to be mounted."
+ "File systems that ought to be mounted."
:group 'files
:version "26.1"
:require 'regexp-opt
@@ -1592,8 +1592,8 @@ use with M-x."
(defcustom confirm-nonexistent-file-or-buffer 'after-completion
"Whether confirmation is requested before visiting a new file or buffer.
If nil, confirmation is not requested.
-If the value is `after-completion', confirmation is only
- requested if the user called `minibuffer-complete' right before
+If the value is `after-completion', confirmation is requested
+ only if the user called `minibuffer-complete' right before
`minibuffer-complete-and-exit'.
Any other non-nil value means to request confirmation.
@@ -1755,7 +1755,7 @@ expand wildcards (if any) and visit multiple files."
(defun find-file-existing (filename)
"Edit the existing file FILENAME.
-Like \\[find-file], but only allow a file that exists, and do not allow
+Like \\[find-file], but allow only a file that exists, and do not allow
file names with wildcards."
(interactive (nbutlast (find-file-read-args "Find existing file: " t)))
(if (and (not (called-interactively-p 'interactive))
@@ -2208,7 +2208,7 @@ the various files."
(truename (abbreviate-file-name (file-truename filename)))
(attributes (file-attributes truename))
(number (nthcdr 10 attributes))
- ;; Find any buffer for a file which has same truename.
+ ;; Find any buffer for a file that has same truename.
(other (and (not buf) (find-buffer-visiting filename))))
;; Let user know if there is a buffer with the same truename.
(if other
@@ -2299,13 +2299,13 @@ the various files."
"The file %s is already visited normally,
and you have edited the buffer. Now you have asked to visit it literally,
meaning no coding system handling, format conversion, or local variables.
-Emacs can only visit a file in one way at a time.
+Emacs can visit a file in only one way at a time.
Do you want to save the file, and visit it literally instead? "
"The file %s is already visited literally,
meaning no coding system handling, format conversion, or local variables.
You have edited the buffer. Now you have asked to visit the file normally,
-but Emacs can only visit a file in one way at a time.
+but Emacs can visit a file in only one way at a time.
Do you want to save the file, and visit it normally instead? ")
(file-name-nondirectory filename)))
@@ -2330,13 +2330,13 @@ Do you want to discard your changes, and visit the file
normally now? ")))
"The file %s is already visited normally.
You have asked to visit it literally,
meaning no coding system decoding, format conversion, or local variables.
-But Emacs can only visit a file in one way at a time.
+But Emacs can visit a file in only one way at a time.
Do you want to revisit the file literally now? "
"The file %s is already visited literally,
meaning no coding system decoding, format conversion, or local variables.
You have asked to visit it normally,
-but Emacs can only visit a file in one way at a time.
+but Emacs can visit a file in only one way at a time.
Do you want to revisit the file normally now? ")
(file-name-nondirectory filename)))
@@ -2476,7 +2476,7 @@ and local variable specifications in the file are ignored.
Automatic uncompression and adding a newline at the end of the
file due to `require-final-newline' is also disabled.
-If Emacs already has a buffer which is visiting the file,
+If Emacs already has a buffer that is visiting the file,
this command asks you whether to visit it literally instead.
In non-interactive use, the value is the buffer where the file is
@@ -3678,7 +3678,7 @@ except that any settings of `mode' are ignored.
If HANDLE-MODE is t, all we do is check whether a \"mode:\"
is specified, and return the corresponding mode symbol, or nil.
-In this case, we try to ignore minor-modes, and only return a
+In this case, we try to ignore minor-modes, and return only a
major-mode.
If `enable-local-variables' or `local-enable-local-variables' is nil,
@@ -3908,12 +3908,12 @@ It is dangerous if either of these conditions are met:
(cond ((memq prop '(lisp-indent-hook
lisp-indent-function
scheme-indent-function))
- ;; Only allow safe values (not functions).
+ ;; Allow only safe values (not functions).
(or (numberp val)
(and (hack-one-local-variable-quotep val)
(eq (nth 1 val) 'defun))))
((eq prop 'edebug-form-spec)
- ;; Only allow indirect form specs.
+ ;; Allow only indirect form specs.
;; During bootstrapping, edebug-basic-spec might not be
;; defined yet.
(and (fboundp 'edebug-basic-spec)
@@ -4008,7 +4008,7 @@ Returns the new list."
(let* ((variable (car pair))
(value (cdr pair))
(slot (assq variable variables)))
- ;; If variables are specified more than once, only use the last. (Why?)
+ ;; If variables are specified more than once, use only the last. (Why?)
;; The pseudo-variables mode and eval are different (bug#3430).
(if (and slot (not (memq variable '(mode eval))))
(setcdr slot value)
@@ -4264,7 +4264,7 @@ criteria."
(defun dir-locals-read-from-dir (dir)
"Load all variables files in DIR and register a new class and instance.
-DIR is the absolute name of a directory which must contain at
+DIR is the absolute name of a directory, which must contain at
least one dir-local file (which is a file holding variables to
apply).
Return the new class name, which is a symbol named DIR."
@@ -5042,7 +5042,7 @@ Uses `backup-directory-alist' in the same way as
(defun file-relative-name (filename &optional directory)
"Convert FILENAME to be relative to DIRECTORY (default: `default-directory').
-This function returns a relative file name which is equivalent to FILENAME
+This function returns a relative file name that is equivalent to FILENAME
when used with that default directory as the default.
If FILENAME is a relative file name, it will be interpreted as existing in
`default-directory'.
@@ -5183,14 +5183,14 @@ the last real save, but optional arg FORCE non-nil
means delete anyway."
(defcustom before-save-hook nil
"Normal hook that is run before a buffer is saved to its file.
-Only used by `save-buffer'."
+Used only by `save-buffer'."
:options '(copyright-update time-stamp)
:type 'hook
:group 'files)
(defcustom after-save-hook nil
"Normal hook that is run after a buffer is saved to its file.
-Only used by `save-buffer'."
+Used only by `save-buffer'."
:options '(executable-make-buffer-file-executable-if-script-p)
:type 'hook
:group 'files)
@@ -5350,7 +5350,7 @@ Before and after saving the buffer, this function runs
(file-name-nondirectory
buffer-file-name)))
(setq tempsetmodes t)
- (error "Attempt to save to a file which you aren't allowed to
write"))))))
+ (error "Attempt to save to a file that you aren't allowed to
write"))))))
(or buffer-backed-up
(setq setmodes (backup-buffer)))
(let* ((dir (file-name-directory buffer-file-name))
@@ -5800,7 +5800,7 @@ RECURSIVE if DIRECTORY is nonempty."
(handler
(funcall handler 'delete-directory directory recursive trash))
((and delete-by-moving-to-trash trash)
- ;; Only move non-empty dir to trash if recursive deletion was
+ ;; Move non-empty dir to trash only if recursive deletion was
;; requested. This mimics the non-`delete-by-moving-to-trash'
;; case, where the operation fails in delete-directory-internal.
;; As `move-file-to-trash' trashes directories (empty or
@@ -5994,7 +5994,7 @@ This function ignores its argument.
This returns non-nil if the current buffer is visiting a readable file
whose modification time does not match that of the buffer.
-This function only handles buffers that are visiting files.
+This function handles only buffers that are visiting files.
Non-file buffers need a custom function."
(and buffer-file-name
(file-readable-p buffer-file-name)
@@ -6028,7 +6028,7 @@ buffer is sufficient for knowing when that buffer needs
to be
updated in Auto Revert Mode. Such notification does not include
changes to files in that directory, only to the directory itself.
-This variable only applies to buffers where `buffer-file-name' is
+This variable applies only to buffers where `buffer-file-name' is
nil; other buffers are tracked by their files.")
(defvar before-revert-hook nil
@@ -6062,14 +6062,14 @@ With a prefix argument, offer to revert from latest
auto-save file, if
that is more recent than the visited file.
This command also implements an interface for special buffers
-that contain text which doesn't come from a file, but reflects
+that contain text that doesn't come from a file, but reflects
some other data instead (e.g. Dired buffers, `buffer-list'
buffers). This is done via the variable `revert-buffer-function'.
In these cases, it should reconstruct the buffer contents from the
appropriate data.
-When called from Lisp, the first argument is IGNORE-AUTO; only offer
-to revert from the auto-save file when this is nil. Note that the
+When called from Lisp, the first argument is IGNORE-AUTO; offer to
+revert from the auto-save file only when this is nil. Note that the
sense of this argument is the reverse of the prefix argument, for the
sake of backward compatibility. IGNORE-AUTO is optional, defaulting
to nil.
@@ -6088,7 +6088,7 @@ to do the work, with arguments IGNORE-AUTO and NOCONFIRM.
The default function runs the hooks `before-revert-hook' and
`after-revert-hook'."
;; I admit it's odd to reverse the sense of the prefix argument, but
- ;; there is a lot of code out there which assumes that the first
+ ;; there is a lot of code out there that assumes that the first
;; argument should be t to avoid consulting the auto-save file, and
;; there's no straightforward way to encourage authors to notice a
;; reversal of the argument sense. So I'm just changing the user
@@ -6109,7 +6109,7 @@ Calls `revert-buffer-insert-file-contents-function' to
reread the
contents of the visited file, with two arguments: the first is the file
name, the second is non-nil if reading an auto-save file.
-This function only handles buffers that are visiting files.
+This function handles only buffers that are visiting files.
Non-file buffers need a custom function."
(with-current-buffer (or (buffer-base-buffer (current-buffer))
(current-buffer))
@@ -6507,7 +6507,7 @@ See also `auto-save-file-name-p'."
(let ((buffer-name (buffer-name))
(limit 0)
file-name)
- ;; Restrict the characters used in the file name to those which
+ ;; Restrict the characters used in the file name to those that
;; are known to be safe on all filesystems, url-encoding the
;; rest.
;; We do this on all platforms, because even if we are not
@@ -6641,7 +6641,7 @@ by `sh' are supported."
(defun file-expand-wildcards (pattern &optional full)
"Expand wildcard pattern PATTERN.
-This returns a list of file names which match the pattern.
+This returns a list of file names that match the pattern.
Files are sorted in `string<' order.
If PATTERN is written as an absolute file name,
@@ -6725,7 +6725,7 @@ and `list-directory-verbose-switches'."
PATTERN is assumed to represent a file-name wildcard suitable for the
underlying filesystem. For Unix and GNU/Linux, each character from the
set [ \\t\\n;<>&|()\\=`\\='\"#$] is quoted with a backslash; for DOS/Windows,
all
-the parts of the pattern which don't include wildcard characters are
+the parts of the pattern that don't include wildcard characters are
quoted with double quotes.
This function leaves alone existing quote characters (\\ on Unix and \"
@@ -7290,7 +7290,7 @@ only these files will be asked to be saved."
file-name-handler-alist))
;; We depend on being the last handler on the list,
-;; so that anything else which does need handling
+;; so that anything else that does need handling
;; has been handled already.
;; So it is safe for us to inhibit *all* magic file name handlers for
;; operations, which return a file name. See Bug#29579.
@@ -7318,7 +7318,7 @@ only these files will be asked to be saved."
(expand-file-name
(unhandled-file-name-directory default-directory)))
default-directory))
- ;; Get a list of the indices of the args which are file names.
+ ;; Get a list of the indices of the args that are file names.
(file-arg-indices
(cdr (or (assq operation
'(;; The first seven are special because they
@@ -7349,7 +7349,7 @@ only these files will be asked to be saved."
(copy-file local-copy)
(rename-file local-copy)
(copy-directory local-copy)
- ;; List the arguments which are filenames.
+ ;; List the arguments that are filenames.
(file-name-completion 0 1)
(file-name-all-completions 0 1)
(file-equal-p 0 1)
@@ -7399,7 +7399,7 @@ only these files will be asked to be saved."
;; We can't use `cl-letf' with `(buffer-local-value)' here
;; because it wouldn't work during bootstrapping.
(let ((buffer (current-buffer)))
- ;; `unquote-then-quote' is only used for the
+ ;; `unquote-then-quote' is used only for the
;; `verify-visited-file-modtime' action, which takes a buffer
;; as only optional argument.
(with-current-buffer (or (car arguments) buffer)
@@ -7593,7 +7593,7 @@ based on existing mode bits, as in \"og+rX-w\"."
;; Trashcan handling.
(defcustom trash-directory nil
"Directory for `move-file-to-trash' to move files and directories to.
-This directory is only used when the function `system-move-file-to-trash'
+This directory is used only when the function `system-move-file-to-trash'
is not defined.
Relative paths are interpreted relative to `default-directory'.
If the value is nil, Emacs uses a freedesktop.org-style trashcan."
@@ -7616,8 +7616,8 @@ If the function `system-move-file-to-trash' is defined,
call it
Otherwise, if `trash-directory' is non-nil, move FILENAME to that
directory.
Otherwise, trash FILENAME using the freedesktop.org conventions,
- like the GNOME, KDE and XFCE desktop environments. Emacs only
- moves files to \"home trash\", ignoring per-volume trashcans."
+ like the GNOME, KDE and XFCE desktop environments. Emacs moves
+ files only to \"home trash\", ignoring per-volume trashcans."
(interactive "fMove file to trash: ")
;; If `system-move-file-to-trash' is defined, use it.
(cond ((fboundp 'system-move-file-to-trash)
diff --git a/lisp/subr.el b/lisp/subr.el
index b408ef0..03cf3da 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -185,7 +185,7 @@ buffer-local wherever it is set."
(defmacro push (newelt place)
"Add NEWELT to the list stored in the generalized variable PLACE.
This is morally equivalent to (setf PLACE (cons NEWELT PLACE)),
-except that PLACE is only evaluated once (after NEWELT)."
+except that PLACE is evaluated only once (after NEWELT)."
(declare (debug (form gv-place)))
(if (symbolp place)
;; Important special case, to avoid triggering GV too early in
@@ -696,7 +696,7 @@ non-nil."
"Return a sequence of numbers from FROM to TO (both inclusive) as a list.
INC is the increment used between numbers in the sequence and defaults to 1.
So, the Nth element of the list is (+ FROM (* N INC)) where N counts from
-zero. TO is only included if there is an N for which TO = FROM + N * INC.
+zero. TO is included only if there is an N for which TO = FROM + N * INC.
If TO is nil or numerically equal to FROM, return (FROM).
If INC is positive and TO is less than FROM, or INC is negative
and TO is larger than FROM, return nil.
@@ -892,7 +892,7 @@ This is the same format used for saving keyboard macros (see
`edmacro-mode').
For an approximate inverse of this, see `key-description'."
- ;; Don't use a defalias, since the `pure' property is only true for
+ ;; Don't use a defalias, since the `pure' property is true only for
;; the calling convention of `kbd'.
(read-kbd-macro keys))
(put 'kbd 'pure t)
@@ -955,7 +955,7 @@ AFTER should be a single event type--a symbol or a
character, not a sequence.
Bindings are always added before any inherited map.
-The order of bindings in a keymap only matters when it is used as
+The order of bindings in a keymap matters only when it is used as
a menu, so this function is not useful for non-menu keymaps."
(unless after (setq after t))
(or (keymapp keymap)
@@ -1169,7 +1169,7 @@ KEY is a string or vector representing a sequence of
keystrokes."
"Replace OLDDEF with NEWDEF for any keys in KEYMAP now defined as OLDDEF.
In other words, OLDDEF is replaced with NEWDEF wherever it appears.
Alternatively, if optional fourth argument OLDMAP is specified, we redefine
-in KEYMAP as NEWDEF those keys which are defined as OLDDEF in OLDMAP.
+in KEYMAP as NEWDEF those keys that are defined as OLDDEF in OLDMAP.
If you don't specify OLDMAP, you can usually get the same results
in a cleaner way with command remapping, like this:
@@ -1241,7 +1241,7 @@ in a cleaner way with command remapping, like this:
(defvar global-map nil
"Default global keymap mapping Emacs keyboard input into commands.
-The value is a keymap which is usually (but not necessarily) Emacs's
+The value is a keymap that is usually (but not necessarily) Emacs's
global map.")
(defvar esc-map nil
@@ -1611,7 +1611,7 @@ be a list of the form returned by `event-start' and
`event-end'."
"expect it to be removed in a future version." "25.2")
;; This was introduced in 21.4 for pre-unicode unification. That
-;; usage was rendered obsolete in 23.1 which uses Unicode internally.
+;; usage was rendered obsolete in 23.1, which uses Unicode internally.
;; Other uses are possible, so this variable is not _really_ obsolete,
;; but Stefan insists to mark it so.
(make-obsolete-variable 'translation-table-for-input nil "23.1")
@@ -1761,12 +1761,12 @@ the hook's buffer-local value rather than its default
value."
(defmacro letrec (binders &rest body)
"Bind variables according to BINDERS then eval BODY.
The value of the last form in BODY is returned.
-Each element of BINDERS is a list (SYMBOL VALUEFORM) which binds
+Each element of BINDERS is a list (SYMBOL VALUEFORM) that binds
SYMBOL to the value of VALUEFORM.
The main difference between this macro and `let'/`let*' is that
all symbols are bound before any of the VALUEFORMs are evalled."
- ;; Only useful in lexical-binding mode.
+ ;; Useful only in lexical-binding mode.
;; As a special-form, we could implement it more efficiently (and cleanly,
;; making the vars actually unbound during evaluation of the binders).
(declare (debug let) (indent 1))
@@ -1871,7 +1871,7 @@ can do the job."
(msg (format-message
"`add-to-list' can't use lexical var `%s'; use `push' or
`cl-pushnew'"
sym))
- ;; Big ugly hack so we only output a warning during
+ ;; Big ugly hack, so we output a warning only during
;; byte-compilation, and so we can use
;; byte-compile-not-lexical-var-p to silence the warning
;; when a defvar has been seen but not yet executed.
@@ -2046,7 +2046,7 @@ running their FOO-mode-hook."
"Execute BODY, but delay any `run-mode-hooks'.
These hooks will be executed by the first following call to
`run-mode-hooks' that occurs outside any `delay-mode-hooks' form.
-Only affects hooks run in the current buffer."
+Affects only hooks run in the current buffer."
(declare (debug t) (indent 0))
`(progn
(make-local-variable 'delay-mode-hooks)
@@ -2118,7 +2118,7 @@ tho trying to avoid AVOIDED-MODES."
This is an XEmacs-compatibility function. Use `define-minor-mode' instead.
-TOGGLE is a symbol which is the name of a buffer-local variable that
+TOGGLE is a symbol that is the name of a buffer-local variable that
is toggled on or off to say whether the minor mode is active or not.
NAME specifies what will appear in the mode line when the minor mode
@@ -2405,9 +2405,9 @@ some sort of escape sequence, the ambiguity is resolved
via `read-key-delay'."
;; Wait long enough that Emacs has the time to receive and
;; process all the raw events associated with the single-key.
;; But don't wait too long, or the user may find the delay
- ;; annoying (or keep hitting more keys which may then get
+ ;; annoying (or keep hitting more keys, which may then get
;; lost or misinterpreted).
- ;; This is only relevant for keys which Emacs perceives as
+ ;; This is relevant only for keys that Emacs perceives as
;; "prefixes", such as C-x (because of the C-x 8 map in
;; key-translate-table and the C-x @ map in function-key-map)
;; or ESC (because of terminal escape sequences in
@@ -3168,7 +3168,7 @@ alternatives."
(defun function-get (f prop &optional autoload)
"Return the value of property PROP of function F.
If AUTOLOAD is non-nil and F is autoloaded, try to autoload it
-in the hope that it will set PROP. If AUTOLOAD is `macro', only do it
+in the hope that it will set PROP. If AUTOLOAD is `macro', do it only
if it's an autoloaded macro."
(let ((val nil))
(while (and (symbolp f)
@@ -3664,7 +3664,7 @@ See also `with-temp-file' and `with-output-to-string'."
(defmacro with-silent-modifications (&rest body)
"Execute BODY, pretending it does not modify the buffer.
This macro is typically used around modifications of
-text properties which do not really affect the buffer's content.
+text properties that do not really affect the buffer's content.
If BODY performs real modifications to the buffer's text, other
than cosmetic ones, undo data may become corrupted.
@@ -3776,8 +3776,8 @@ FORMAT is a string passed to `message' to format any
error message.
It should contain a single %-sequence; e.g., \"Error: %S\".
If `debug-on-error' is non-nil, run BODY without catching its errors.
-This is to be used around code which is not expected to signal an error
-but which should be robust in the unexpected case that an error is signaled.
+This is to be used around code that is not expected to signal an error
+but that should be robust in the unexpected case that an error is signaled.
For backward compatibility, if FORMAT is not a constant string, it
is assumed to be part of BODY, in which case the message format
@@ -4139,7 +4139,7 @@ the substrings between the splitting points are collected
as a list,
which is returned.
If SEPARATORS is non-nil, it should be a regular expression matching text
-which separates, but is not part of, the substrings. If nil it defaults to
+that separates, but is not part of, the substrings. If nil it defaults to
`split-string-default-separators', normally \"[ \\f\\t\\n\\r\\v]+\", and
OMIT-NULLS is forced to t.
@@ -4282,7 +4282,7 @@ and replace a sub-expression, e.g.
;; To avoid excessive consing from multiple matches in long strings,
;; don't just call `replace-match' continually. Walk down the
;; string looking for matches of REGEXP and building up a (reversed)
- ;; list MATCHES. This comprises segments of STRING which weren't
+ ;; list MATCHES. This comprises segments of STRING that weren't
;; matched interspersed with replacements for segments that were.
;; [For a `large' number of replacements it's more efficient to
;; operate in a temporary buffer; we can't tell from the function's
@@ -4298,7 +4298,7 @@ and replace a sub-expression, e.g.
;; If we matched the empty string, make sure we advance by one char
(when (= me mb) (setq me (min l (1+ mb))))
;; Generate a replacement for the matched substring.
- ;; Operate only on the substring to minimize string consing.
+ ;; Operate on only the substring to minimize string consing.
;; Set up match data for the substring for replacement;
;; presumably this is likely to be faster than munging the
;; match data directly in Lisp.
@@ -4339,7 +4339,7 @@ attention to case differences."
Normally, inserting a string with right-to-left (RTL) script into
a buffer may cause some subsequent text to be displayed as part
of the RTL segment (usually this affects punctuation characters).
-This function returns a string which displays as STR but forces
+This function returns a string that displays as STR but forces
subsequent text to be displayed as left-to-right.
If STR contains any RTL character, this function returns a string
@@ -4555,7 +4555,7 @@ Used from `delayed-warnings-hook' (which see)."
(push warning collapsed)))
(setq delayed-warnings-list (nreverse collapsed))))
-;; At present this is only used for Emacs internals.
+;; At present this is used only for Emacs internals.
;; Ref https://lists.gnu.org/r/emacs-devel/2012-02/msg00085.html
(defvar delayed-warnings-hook '(collapse-delayed-warnings
display-delayed-warnings)
@@ -4621,7 +4621,7 @@ Value is what BODY returns."
(defun make-syntax-table (&optional oldtable)
"Return a new syntax table.
-Create a syntax table which inherits from OLDTABLE (if non-nil) or
+Create a syntax table that inherits from OLDTABLE (if non-nil) or
from `standard-syntax-table' otherwise."
(let ((table (make-char-table 'syntax-table nil)))
(set-char-table-parent table (or oldtable (standard-syntax-table)))
@@ -4640,7 +4640,7 @@ If POS is outside the buffer's accessible portion, return
nil."
"Return the code for the syntax class described by SYNTAX.
SYNTAX should be a raw syntax descriptor; the return value is a
-integer which encodes the corresponding syntax class. See Info
+integer that encodes the corresponding syntax class. See Info
node `(elisp)Syntax Table Internals' for a list of codes.
If SYNTAX is nil, return nil."
@@ -4911,7 +4911,7 @@ the number of frames to skip (minus 1).")
(defun called-interactively-p (&optional kind)
"Return t if the containing function was called by `call-interactively'.
-If KIND is `interactive', then only return t if the call was made
+If KIND is `interactive', then return t only if the call was made
interactively by the user, i.e. not in `noninteractive' mode nor
when `executing-kbd-macro'.
If KIND is `any', on the other hand, it will return t for any kind of
@@ -5044,9 +5044,9 @@ if it returns non-nil, then MAP stays active.
Optional arg ON-EXIT, if non-nil, specifies a function that is
called, with no arguments, after MAP is deactivated.
-This uses `overriding-terminal-local-map' which takes precedence over all other
-keymaps. As usual, if no match for a key is found in MAP, the normal key
-lookup sequence then continues.
+This uses `overriding-terminal-local-map', which takes precedence over all
+other keymaps. As usual, if no match for a key is found in MAP, the normal
+key lookup sequence then continues.
This returns an \"exit function\", which can be called with no argument
to deactivate this transient map, regardless of KEEP-PRED."
@@ -5224,7 +5224,7 @@ NEW-MESSAGE, if non-nil, sets a new message for the
reporter."
max-value))
(when (integerp value)
(setcar reporter (ceiling (car reporter))))
- ;; Only print message if enough time has passed
+ ;; Print message only if enough time has passed
(when enough-time-passed
(if suffix
(aset parameters 6 suffix)
diff --git a/src/frame.c b/src/frame.c
index 8ca5106..486d025 100644
--- a/src/frame.c
+++ b/src/frame.c
@@ -6120,7 +6120,7 @@ which need to do mouse handling at the Lisp level. */);
DEFVAR_LISP ("mouse-highlight", Vmouse_highlight,
doc: /* If non-nil, clickable text is highlighted when mouse is
over it.
-If the value is an integer, highlighting is only shown after moving the
+If the value is an integer, highlighting is shown only after moving the
mouse, while keyboard input turns off the highlight even when the mouse
is over the clickable text. However, the mouse shape still indicates
when the mouse is over clickable text. */);
diff --git a/src/fringe.c b/src/fringe.c
index 08bf271..ded7c44 100644
--- a/src/fringe.c
+++ b/src/fringe.c
@@ -1716,8 +1716,8 @@ syms_of_fringe (void)
DEFVAR_LISP ("overflow-newline-into-fringe", Voverflow_newline_into_fringe,
doc: /* Non-nil means that newline may flow into the right fringe.
-This means that display lines which are exactly as wide as the window
-\(not counting the final newline) will only occupy one screen line, by
+This means that display lines that are exactly as wide as the window
+\(not counting the final newline) will occupy only one screen line, by
showing (or hiding) the final newline in the right fringe; when point
is at the final newline, the cursor is shown in the right fringe.
If nil, also continue lines which are exactly as wide as the window. */);
diff --git a/src/image.c b/src/image.c
index 08e4208..870f008 100644
--- a/src/image.c
+++ b/src/image.c
@@ -1758,7 +1758,7 @@ DEFUN ("clear-image-cache", Fclear_image_cache,
Sclear_image_cache,
doc: /* Clear the image cache.
FILTER nil or a frame means clear all images in the selected frame.
FILTER t means clear the image caches of all frames.
-Anything else, means only clear those images which refer to FILTER,
+Anything else means clear only those images that refer to FILTER,
which is then usually a filename. */)
(Lisp_Object filter)
{
@@ -10055,7 +10055,7 @@ DEFUN ("init-image-library", Finit_image_library,
Sinit_image_library, 1, 1, 0,
doc: /* Initialize image library implementing image type TYPE.
Return t if TYPE is a supported image type.
-If image libraries are loaded dynamically (currently only the case on
+If image libraries are loaded dynamically (currently the case only on
MS-Windows), load the library for TYPE if it is not yet loaded, using
the library file(s) specified by `dynamic-library-alist'. */)
(Lisp_Object type)
diff --git a/src/xfns.c b/src/xfns.c
index 20e63a2..b1b4070 100644
--- a/src/xfns.c
+++ b/src/xfns.c
@@ -1,4 +1,4 @@
-/* Functions for the X window system.
+/* Functions for the X Window System.
Copyright (C) 1989, 1992-2019 Free Software Foundation, Inc.
@@ -5351,8 +5351,8 @@ and width values are in pixels.
FRAME.
`outer-border-width' is the width of the X border of FRAME. The X
- border is usually only shown for frames without window manager
- decorations like child and tooltip frames. */)
+ border is usually shown only for frames without window manager
+ decorations, such as child and tooltip frames. */)
(Lisp_Object frame)
{
return frame_geometry (frame, Qnil);
@@ -5787,7 +5787,7 @@ DEFUN ("x-display-list", Fx_display_list,
Sx_display_list, 0, 0, 0,
DEFUN ("x-synchronize", Fx_synchronize, Sx_synchronize, 1, 2, 0,
doc: /* If ON is non-nil, report X errors as soon as the erring request
is made.
-This function only has an effect on X Windows. With MS Windows, it is
+This function has an effect only on X Windows. With MS Windows, it is
defined but does nothing.
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
selection box, if specified. If MUSTMATCH is non-nil, the returned file
or directory must exist.
-This function is only defined on NS, MS Windows, and X Windows with the
+This function is defined only on NS, MS Windows, and X Windows with the
Motif or Gtk toolkits. With the Motif toolkit, ONLY-DIR-P is ignored.
-Otherwise, if ONLY-DIR-P is non-nil, the user can only select directories.
+Otherwise, if ONLY-DIR-P is non-nil, the user can select only directories.
On MS Windows 7 and later, the file selection dialog "remembers" the last
directory where the user selected a file, and will open that directory
instead of DIR on subsequent invocations of this function with the same
diff --git a/src/xterm.c b/src/xterm.c
index 0455895..44fbd27 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -13636,7 +13636,7 @@ baseline level. The default value is nil. */);
DEFVAR_BOOL ("x-mouse-click-focus-ignore-position",
x_mouse_click_focus_ignore_position,
doc: /* Non-nil means that a mouse click to focus a frame does not move
point.
-This variable is only used when the window manager requires that you
+This variable is used only when the window manager requires that you
click on a frame to select it (give it focus). In that case, a value
of nil, means that the selected window and cursor position changes to
reflect the mouse click position, while a non-nil value means that the
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- master 1d4862e: Fix English grammar in some doc strings and comments,
Stephen Gildea <=