aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Gildea2019-11-03 18:36:05 -0800
committerStephen Gildea2019-11-03 18:36:45 -0800
commit1d4862e8c18aff5e2a59b9fb37e643a389683047 (patch)
treea8185f4df41d0c4b08f229905443d57305ac9f1a
parent8ae7c8866d01d792127591a56221f382692d2571 (diff)
downloademacs-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.
-rw-r--r--lisp/files.el108
-rw-r--r--lisp/subr.el60
-rw-r--r--src/frame.c2
-rw-r--r--src/fringe.c4
-rw-r--r--src/image.c4
-rw-r--r--src/xfns.c12
-rw-r--r--src/xterm.c2
7 files changed, 96 insertions, 96 deletions
diff --git a/lisp/files.el b/lisp/files.el
index f6dc4baa7fb..7690357058b 100644
--- a/lisp/files.el
+++ b/lisp/files.el
@@ -67,7 +67,7 @@ FROM and TO should be equivalent names, which refer to the
67same directory. TO should be an absolute directory name. 67same directory. TO should be an absolute directory name.
68Do not use `~' in the TO strings. 68Do not use `~' in the TO strings.
69 69
70Use this feature when you have directories which you normally refer to 70Use this feature when you have directories that you normally refer to
71via absolute symbolic links. Make TO the name of the link, and FROM 71via absolute symbolic links. Make TO the name of the link, and FROM
72a regexp matching the name it is linked to." 72a regexp matching the name it is linked to."
73 :type '(repeat (cons :format "%v" 73 :type '(repeat (cons :format "%v"
@@ -123,7 +123,7 @@ This variable is relevant only if `backup-by-copying' is nil."
123 "Non-nil means create backups by copying if this preserves owner or group. 123 "Non-nil means create backups by copying if this preserves owner or group.
124Renaming may still be used (subject to control of other variables) 124Renaming may still be used (subject to control of other variables)
125when it would not result in changing the owner or group of the file; 125when it would not result in changing the owner or group of the file;
126that is, for files which are owned by you and whose group matches 126that is, for files that are owned by you and whose group matches
127the default for a new file created there by you. 127the default for a new file created there by you.
128This variable is relevant only if `backup-by-copying' is nil." 128This variable is relevant only if `backup-by-copying' is nil."
129 :version "24.1" 129 :version "24.1"
@@ -239,7 +239,7 @@ have fast storage with limited space, such as a RAM disk."
239 (concat "^\\([^A-Z[-`a-z]\\|..+\\)?:\\|" ; colon except after drive 239 (concat "^\\([^A-Z[-`a-z]\\|..+\\)?:\\|" ; colon except after drive
240 "[|<>\"?*\000-\037]"))) ; invalid characters 240 "[|<>\"?*\000-\037]"))) ; invalid characters
241 (t (purecopy "[\000]"))) 241 (t (purecopy "[\000]")))
242 "Regexp recognizing file names which aren't allowed by the filesystem.") 242 "Regexp recognizing file names that aren't allowed by the filesystem.")
243 243
244(defcustom file-precious-flag nil 244(defcustom file-precious-flag nil
245 "Non-nil means protect against I/O errors while saving files. 245 "Non-nil means protect against I/O errors while saving files.
@@ -338,7 +338,7 @@ A value of nil means don't add newlines.
338Certain major modes set this locally to the value obtained 338Certain major modes set this locally to the value obtained
339from `mode-require-final-newline'. 339from `mode-require-final-newline'.
340 340
341This variable is only heeded when visiting files (or saving 341This variable is heeded only when visiting files (or saving
342buffers into files they visit). Writing data to the file system 342buffers into files they visit). Writing data to the file system
343with `write-region' and the like is not influenced by this variable." 343with `write-region' and the like is not influenced by this variable."
344 :safe #'symbolp 344 :safe #'symbolp
@@ -504,7 +504,7 @@ for the file's directory."
504(define-obsolete-variable-alias 'write-file-hooks 'write-file-functions "22.1") 504(define-obsolete-variable-alias 'write-file-hooks 'write-file-functions "22.1")
505(defvar write-file-functions nil 505(defvar write-file-functions nil
506 "List of functions to be called before saving a buffer to a file. 506 "List of functions to be called before saving a buffer to a file.
507Only used by `save-buffer'. 507Used only by `save-buffer'.
508If one of them returns non-nil, the file is considered already written 508If one of them returns non-nil, the file is considered already written
509and the rest are not called. 509and the rest are not called.
510These hooks are considered to pertain to the visited file. 510These hooks are considered to pertain to the visited file.
@@ -532,7 +532,7 @@ updates before the buffer is saved, use `before-save-hook'.")
532(defvar write-contents-functions nil 532(defvar write-contents-functions nil
533 "List of functions to be called before writing out a buffer to a file. 533 "List of functions to be called before writing out a buffer to a file.
534 534
535Only used by `save-buffer'. If one of them returns non-nil, the 535Used only by `save-buffer'. If one of them returns non-nil, the
536file is considered already written and the rest are not called 536file is considered already written and the rest are not called
537and neither are the functions in `write-file-functions'. This 537and neither are the functions in `write-file-functions'. This
538hook can thus be used to create save behavior for buffers that 538hook can thus be used to create save behavior for buffers that
@@ -707,7 +707,7 @@ non-empty string that was inserted by this function.
707 (If DEFAULT-DIRNAME is omitted, DIR combined with INITIAL is used, 707 (If DEFAULT-DIRNAME is omitted, DIR combined with INITIAL is used,
708 or just DIR if INITIAL is nil.) 708 or just DIR if INITIAL is nil.)
709If the user exits with an empty minibuffer, this function returns 709If the user exits with an empty minibuffer, this function returns
710an empty string. (This can only happen if the user erased the 710an empty string. (This can happen only if the user erased the
711pre-inserted contents or if `insert-default-directory' is nil.) 711pre-inserted contents or if `insert-default-directory' is nil.)
712Fourth arg MUSTMATCH non-nil means require existing directory's name. 712Fourth arg MUSTMATCH non-nil means require existing directory's name.
713 Non-nil and non-t means also require confirmation after completion. 713 Non-nil and non-t means also require confirmation after completion.
@@ -934,7 +934,7 @@ one or more of those symbols."
934 ;; entries for the poor soul looking just for "foo". OTOH, sometimes 934 ;; entries for the poor soul looking just for "foo". OTOH, sometimes
935 ;; the user does want to pay attention to the extension. We try to 935 ;; the user does want to pay attention to the extension. We try to
936 ;; diffuse this tension by stripping the suffix, except when the 936 ;; diffuse this tension by stripping the suffix, except when the
937 ;; result is a single element (i.e. usually we only list "foo" unless 937 ;; result is a single element (i.e. usually we list only "foo" unless
938 ;; it's the only remaining element in the list, in which case we do 938 ;; it's the only remaining element in the list, in which case we do
939 ;; list "foo", "foo.elc" and "foo.el"). 939 ;; list "foo", "foo.elc" and "foo.el").
940 (fullnames '()) 940 (fullnames '())
@@ -956,11 +956,11 @@ one or more of those symbols."
956 ;; which can cause problems with things like partial-completion. 956 ;; which can cause problems with things like partial-completion.
957 ;; To minimize the problem, filter out completion-regexp-list, so that 957 ;; To minimize the problem, filter out completion-regexp-list, so that
958 ;; M-x load-library RET t/x.e TAB finds some files. Also remove elements 958 ;; M-x load-library RET t/x.e TAB finds some files. Also remove elements
959 ;; from `names' which only matched `string' when they still had 959 ;; from `names' that matched `string' only when they still had
960 ;; their suffix. 960 ;; their suffix.
961 (setq names (all-completions string names)) 961 (setq names (all-completions string names))
962 ;; Remove duplicates of the first element, so that we can easily check 962 ;; Remove duplicates of the first element, so that we can easily check
963 ;; if `names' really only contains a single element. 963 ;; if `names' really contains only a single element.
964 (when (cdr names) (setcdr names (delete (car names) (cdr names)))) 964 (when (cdr names) (setcdr names (delete (car names) (cdr names))))
965 (unless (cdr names) 965 (unless (cdr names)
966 ;; There's no more than one matching non-suffixed element, so expand 966 ;; 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)."
979 979
980(defvar locate-dominating-stop-dir-regexp 980(defvar locate-dominating-stop-dir-regexp
981 (purecopy "\\`\\(?:[\\/][\\/][^\\/]+[\\/]\\|/\\(?:net\\|afs\\|\\.\\.\\.\\)/\\)\\'") 981 (purecopy "\\`\\(?:[\\/][\\/][^\\/]+[\\/]\\|/\\(?:net\\|afs\\|\\.\\.\\.\\)/\\)\\'")
982 "Regexp of directory names which stop the search in `locate-dominating-file'. 982 "Regexp of directory names that stop the search in `locate-dominating-file'.
983Any directory whose name matches this regexp will be treated like 983Any directory whose name matches this regexp will be treated like
984a kind of root directory by `locate-dominating-file' which will stop its search 984a kind of root directory by `locate-dominating-file', which will stop its
985when it bumps into it. 985search when it bumps into it.
986The default regexp prevents fruitless and time-consuming attempts to find 986The default regexp prevents fruitless and time-consuming attempts to find
987special files in directories in which filenames are interpreted as hostnames, 987special files in directories in which filenames are interpreted as hostnames,
988or mount points potentially requiring authentication as a different user.") 988or mount points potentially requiring authentication as a different user.")
@@ -1051,7 +1051,7 @@ directory if it does not exist."
1051 (when (and errtype 1051 (when (and errtype
1052 user-emacs-directory-warning 1052 user-emacs-directory-warning
1053 (not (get 'user-emacs-directory-warning 'this-session))) 1053 (not (get 'user-emacs-directory-warning 'this-session)))
1054 ;; Only warn once per Emacs session. 1054 ;; Warn only once per Emacs session.
1055 (put 'user-emacs-directory-warning 'this-session t) 1055 (put 'user-emacs-directory-warning 'this-session t)
1056 (display-warning 'initialization 1056 (display-warning 'initialization
1057 (format "\ 1057 (format "\
@@ -1065,7 +1065,7 @@ customize the variable `user-emacs-directory-warning'."
1065(defun exec-path () 1065(defun exec-path ()
1066 "Return list of directories to search programs to run in remote subprocesses. 1066 "Return list of directories to search programs to run in remote subprocesses.
1067The remote host is identified by `default-directory'. For remote 1067The remote host is identified by `default-directory'. For remote
1068hosts which do not support subprocesses, this returns `nil'. 1068hosts that do not support subprocesses, this returns `nil'.
1069If `default-directory' is a local directory, this function returns 1069If `default-directory' is a local directory, this function returns
1070the value of the variable `exec-path'." 1070the value of the variable `exec-path'."
1071 (let ((handler (find-file-name-handler default-directory 'exec-path))) 1071 (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
1114be slower or less reliable than accessing local files. 1114be slower or less reliable than accessing local files.
1115 1115
1116`file-remote-p' never opens a new remote connection. It can 1116`file-remote-p' never opens a new remote connection. It can
1117only reuse a connection that is already open. 1117reuse only a connection that is already open.
1118 1118
1119Return nil or a string identifying the remote connection 1119Return nil or a string identifying the remote connection
1120\(ideally a prefix of FILE). Return nil if FILE is a relative 1120\(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
1254containing it, until no links are left at any level. 1254containing it, until no links are left at any level.
1255 1255
1256\(fn FILENAME)" ;; Don't document the optional arguments. 1256\(fn FILENAME)" ;; Don't document the optional arguments.
1257 ;; COUNTER and PREV-DIRS are only used in recursive calls. 1257 ;; COUNTER and PREV-DIRS are used only in recursive calls.
1258 ;; COUNTER can be a cons cell whose car is the count of how many 1258 ;; COUNTER can be a cons cell whose car is the count of how many
1259 ;; more links to chase before getting an error. 1259 ;; more links to chase before getting an error.
1260 ;; PREV-DIRS can be a cons cell whose car is an alist 1260 ;; PREV-DIRS can be a cons cell whose car is an alist
@@ -1452,7 +1452,7 @@ constraints do not force a specific format."
1452 ;;(concat 1452 ;;(concat
1453 ;; "^" (regexp-opt '("/afs/" "/media/" "/mnt" "/net/" "/tmp_mnt/")))) 1453 ;; "^" (regexp-opt '("/afs/" "/media/" "/mnt" "/net/" "/tmp_mnt/"))))
1454 "^\\(?:/\\(?:afs/\\|m\\(?:edia/\\|nt\\)\\|\\(?:ne\\|tmp_mn\\)t/\\)\\)") 1454 "^\\(?:/\\(?:afs/\\|m\\(?:edia/\\|nt\\)\\|\\(?:ne\\|tmp_mn\\)t/\\)\\)")
1455 "File systems which ought to be mounted." 1455 "File systems that ought to be mounted."
1456 :group 'files 1456 :group 'files
1457 :version "26.1" 1457 :version "26.1"
1458 :require 'regexp-opt 1458 :require 'regexp-opt
@@ -1592,8 +1592,8 @@ use with M-x."
1592(defcustom confirm-nonexistent-file-or-buffer 'after-completion 1592(defcustom confirm-nonexistent-file-or-buffer 'after-completion
1593 "Whether confirmation is requested before visiting a new file or buffer. 1593 "Whether confirmation is requested before visiting a new file or buffer.
1594If nil, confirmation is not requested. 1594If nil, confirmation is not requested.
1595If the value is `after-completion', confirmation is only 1595If the value is `after-completion', confirmation is requested
1596 requested if the user called `minibuffer-complete' right before 1596 only if the user called `minibuffer-complete' right before
1597 `minibuffer-complete-and-exit'. 1597 `minibuffer-complete-and-exit'.
1598Any other non-nil value means to request confirmation. 1598Any other non-nil value means to request confirmation.
1599 1599
@@ -1755,7 +1755,7 @@ expand wildcards (if any) and visit multiple files."
1755 1755
1756(defun find-file-existing (filename) 1756(defun find-file-existing (filename)
1757 "Edit the existing file FILENAME. 1757 "Edit the existing file FILENAME.
1758Like \\[find-file], but only allow a file that exists, and do not allow 1758Like \\[find-file], but allow only a file that exists, and do not allow
1759file names with wildcards." 1759file names with wildcards."
1760 (interactive (nbutlast (find-file-read-args "Find existing file: " t))) 1760 (interactive (nbutlast (find-file-read-args "Find existing file: " t)))
1761 (if (and (not (called-interactively-p 'interactive)) 1761 (if (and (not (called-interactively-p 'interactive))
@@ -2208,7 +2208,7 @@ the various files."
2208 (truename (abbreviate-file-name (file-truename filename))) 2208 (truename (abbreviate-file-name (file-truename filename)))
2209 (attributes (file-attributes truename)) 2209 (attributes (file-attributes truename))
2210 (number (nthcdr 10 attributes)) 2210 (number (nthcdr 10 attributes))
2211 ;; Find any buffer for a file which has same truename. 2211 ;; Find any buffer for a file that has same truename.
2212 (other (and (not buf) (find-buffer-visiting filename)))) 2212 (other (and (not buf) (find-buffer-visiting filename))))
2213 ;; Let user know if there is a buffer with the same truename. 2213 ;; Let user know if there is a buffer with the same truename.
2214 (if other 2214 (if other
@@ -2299,13 +2299,13 @@ the various files."
2299 "The file %s is already visited normally, 2299 "The file %s is already visited normally,
2300and you have edited the buffer. Now you have asked to visit it literally, 2300and you have edited the buffer. Now you have asked to visit it literally,
2301meaning no coding system handling, format conversion, or local variables. 2301meaning no coding system handling, format conversion, or local variables.
2302Emacs can only visit a file in one way at a time. 2302Emacs can visit a file in only one way at a time.
2303 2303
2304Do you want to save the file, and visit it literally instead? " 2304Do you want to save the file, and visit it literally instead? "
2305 "The file %s is already visited literally, 2305 "The file %s is already visited literally,
2306meaning no coding system handling, format conversion, or local variables. 2306meaning no coding system handling, format conversion, or local variables.
2307You have edited the buffer. Now you have asked to visit the file normally, 2307You have edited the buffer. Now you have asked to visit the file normally,
2308but Emacs can only visit a file in one way at a time. 2308but Emacs can visit a file in only one way at a time.
2309 2309
2310Do you want to save the file, and visit it normally instead? ") 2310Do you want to save the file, and visit it normally instead? ")
2311 (file-name-nondirectory filename))) 2311 (file-name-nondirectory filename)))
@@ -2330,13 +2330,13 @@ Do you want to discard your changes, and visit the file normally now? ")))
2330 "The file %s is already visited normally. 2330 "The file %s is already visited normally.
2331You have asked to visit it literally, 2331You have asked to visit it literally,
2332meaning no coding system decoding, format conversion, or local variables. 2332meaning no coding system decoding, format conversion, or local variables.
2333But Emacs can only visit a file in one way at a time. 2333But Emacs can visit a file in only one way at a time.
2334 2334
2335Do you want to revisit the file literally now? " 2335Do you want to revisit the file literally now? "
2336 "The file %s is already visited literally, 2336 "The file %s is already visited literally,
2337meaning no coding system decoding, format conversion, or local variables. 2337meaning no coding system decoding, format conversion, or local variables.
2338You have asked to visit it normally, 2338You have asked to visit it normally,
2339but Emacs can only visit a file in one way at a time. 2339but Emacs can visit a file in only one way at a time.
2340 2340
2341Do you want to revisit the file normally now? ") 2341Do you want to revisit the file normally now? ")
2342 (file-name-nondirectory filename))) 2342 (file-name-nondirectory filename)))
@@ -2476,7 +2476,7 @@ and local variable specifications in the file are ignored.
2476Automatic uncompression and adding a newline at the end of the 2476Automatic uncompression and adding a newline at the end of the
2477file due to `require-final-newline' is also disabled. 2477file due to `require-final-newline' is also disabled.
2478 2478
2479If Emacs already has a buffer which is visiting the file, 2479If Emacs already has a buffer that is visiting the file,
2480this command asks you whether to visit it literally instead. 2480this command asks you whether to visit it literally instead.
2481 2481
2482In non-interactive use, the value is the buffer where the file is 2482In non-interactive use, the value is the buffer where the file is
@@ -3678,7 +3678,7 @@ except that any settings of `mode' are ignored.
3678 3678
3679If HANDLE-MODE is t, all we do is check whether a \"mode:\" 3679If HANDLE-MODE is t, all we do is check whether a \"mode:\"
3680is specified, and return the corresponding mode symbol, or nil. 3680is specified, and return the corresponding mode symbol, or nil.
3681In this case, we try to ignore minor-modes, and only return a 3681In this case, we try to ignore minor-modes, and return only a
3682major-mode. 3682major-mode.
3683 3683
3684If `enable-local-variables' or `local-enable-local-variables' is nil, 3684If `enable-local-variables' or `local-enable-local-variables' is nil,
@@ -3908,12 +3908,12 @@ It is dangerous if either of these conditions are met:
3908 (cond ((memq prop '(lisp-indent-hook 3908 (cond ((memq prop '(lisp-indent-hook
3909 lisp-indent-function 3909 lisp-indent-function
3910 scheme-indent-function)) 3910 scheme-indent-function))
3911 ;; Only allow safe values (not functions). 3911 ;; Allow only safe values (not functions).
3912 (or (numberp val) 3912 (or (numberp val)
3913 (and (hack-one-local-variable-quotep val) 3913 (and (hack-one-local-variable-quotep val)
3914 (eq (nth 1 val) 'defun)))) 3914 (eq (nth 1 val) 'defun))))
3915 ((eq prop 'edebug-form-spec) 3915 ((eq prop 'edebug-form-spec)
3916 ;; Only allow indirect form specs. 3916 ;; Allow only indirect form specs.
3917 ;; During bootstrapping, edebug-basic-spec might not be 3917 ;; During bootstrapping, edebug-basic-spec might not be
3918 ;; defined yet. 3918 ;; defined yet.
3919 (and (fboundp 'edebug-basic-spec) 3919 (and (fboundp 'edebug-basic-spec)
@@ -4008,7 +4008,7 @@ Returns the new list."
4008 (let* ((variable (car pair)) 4008 (let* ((variable (car pair))
4009 (value (cdr pair)) 4009 (value (cdr pair))
4010 (slot (assq variable variables))) 4010 (slot (assq variable variables)))
4011 ;; If variables are specified more than once, only use the last. (Why?) 4011 ;; If variables are specified more than once, use only the last. (Why?)
4012 ;; The pseudo-variables mode and eval are different (bug#3430). 4012 ;; The pseudo-variables mode and eval are different (bug#3430).
4013 (if (and slot (not (memq variable '(mode eval)))) 4013 (if (and slot (not (memq variable '(mode eval))))
4014 (setcdr slot value) 4014 (setcdr slot value)
@@ -4264,7 +4264,7 @@ criteria."
4264 4264
4265(defun dir-locals-read-from-dir (dir) 4265(defun dir-locals-read-from-dir (dir)
4266 "Load all variables files in DIR and register a new class and instance. 4266 "Load all variables files in DIR and register a new class and instance.
4267DIR is the absolute name of a directory which must contain at 4267DIR is the absolute name of a directory, which must contain at
4268least one dir-local file (which is a file holding variables to 4268least one dir-local file (which is a file holding variables to
4269apply). 4269apply).
4270Return the new class name, which is a symbol named DIR." 4270Return the new class name, which is a symbol named DIR."
@@ -5042,7 +5042,7 @@ Uses `backup-directory-alist' in the same way as
5042 5042
5043(defun file-relative-name (filename &optional directory) 5043(defun file-relative-name (filename &optional directory)
5044 "Convert FILENAME to be relative to DIRECTORY (default: `default-directory'). 5044 "Convert FILENAME to be relative to DIRECTORY (default: `default-directory').
5045This function returns a relative file name which is equivalent to FILENAME 5045This function returns a relative file name that is equivalent to FILENAME
5046when used with that default directory as the default. 5046when used with that default directory as the default.
5047If FILENAME is a relative file name, it will be interpreted as existing in 5047If FILENAME is a relative file name, it will be interpreted as existing in
5048`default-directory'. 5048`default-directory'.
@@ -5183,14 +5183,14 @@ the last real save, but optional arg FORCE non-nil means delete anyway."
5183 5183
5184(defcustom before-save-hook nil 5184(defcustom before-save-hook nil
5185 "Normal hook that is run before a buffer is saved to its file. 5185 "Normal hook that is run before a buffer is saved to its file.
5186Only used by `save-buffer'." 5186Used only by `save-buffer'."
5187 :options '(copyright-update time-stamp) 5187 :options '(copyright-update time-stamp)
5188 :type 'hook 5188 :type 'hook
5189 :group 'files) 5189 :group 'files)
5190 5190
5191(defcustom after-save-hook nil 5191(defcustom after-save-hook nil
5192 "Normal hook that is run after a buffer is saved to its file. 5192 "Normal hook that is run after a buffer is saved to its file.
5193Only used by `save-buffer'." 5193Used only by `save-buffer'."
5194 :options '(executable-make-buffer-file-executable-if-script-p) 5194 :options '(executable-make-buffer-file-executable-if-script-p)
5195 :type 'hook 5195 :type 'hook
5196 :group 'files) 5196 :group 'files)
@@ -5350,7 +5350,7 @@ Before and after saving the buffer, this function runs
5350 (file-name-nondirectory 5350 (file-name-nondirectory
5351 buffer-file-name))) 5351 buffer-file-name)))
5352 (setq tempsetmodes t) 5352 (setq tempsetmodes t)
5353 (error "Attempt to save to a file which you aren't allowed to write")))))) 5353 (error "Attempt to save to a file that you aren't allowed to write"))))))
5354 (or buffer-backed-up 5354 (or buffer-backed-up
5355 (setq setmodes (backup-buffer))) 5355 (setq setmodes (backup-buffer)))
5356 (let* ((dir (file-name-directory buffer-file-name)) 5356 (let* ((dir (file-name-directory buffer-file-name))
@@ -5800,7 +5800,7 @@ RECURSIVE if DIRECTORY is nonempty."
5800 (handler 5800 (handler
5801 (funcall handler 'delete-directory directory recursive trash)) 5801 (funcall handler 'delete-directory directory recursive trash))
5802 ((and delete-by-moving-to-trash trash) 5802 ((and delete-by-moving-to-trash trash)
5803 ;; Only move non-empty dir to trash if recursive deletion was 5803 ;; Move non-empty dir to trash only if recursive deletion was
5804 ;; requested. This mimics the non-`delete-by-moving-to-trash' 5804 ;; requested. This mimics the non-`delete-by-moving-to-trash'
5805 ;; case, where the operation fails in delete-directory-internal. 5805 ;; case, where the operation fails in delete-directory-internal.
5806 ;; As `move-file-to-trash' trashes directories (empty or 5806 ;; As `move-file-to-trash' trashes directories (empty or
@@ -5994,7 +5994,7 @@ This function ignores its argument.
5994This returns non-nil if the current buffer is visiting a readable file 5994This returns non-nil if the current buffer is visiting a readable file
5995whose modification time does not match that of the buffer. 5995whose modification time does not match that of the buffer.
5996 5996
5997This function only handles buffers that are visiting files. 5997This function handles only buffers that are visiting files.
5998Non-file buffers need a custom function." 5998Non-file buffers need a custom function."
5999 (and buffer-file-name 5999 (and buffer-file-name
6000 (file-readable-p buffer-file-name) 6000 (file-readable-p buffer-file-name)
@@ -6028,7 +6028,7 @@ buffer is sufficient for knowing when that buffer needs to be
6028updated in Auto Revert Mode. Such notification does not include 6028updated in Auto Revert Mode. Such notification does not include
6029changes to files in that directory, only to the directory itself. 6029changes to files in that directory, only to the directory itself.
6030 6030
6031This variable only applies to buffers where `buffer-file-name' is 6031This variable applies only to buffers where `buffer-file-name' is
6032nil; other buffers are tracked by their files.") 6032nil; other buffers are tracked by their files.")
6033 6033
6034(defvar before-revert-hook nil 6034(defvar before-revert-hook nil
@@ -6062,14 +6062,14 @@ With a prefix argument, offer to revert from latest auto-save file, if
6062that is more recent than the visited file. 6062that is more recent than the visited file.
6063 6063
6064This command also implements an interface for special buffers 6064This command also implements an interface for special buffers
6065that contain text which doesn't come from a file, but reflects 6065that contain text that doesn't come from a file, but reflects
6066some other data instead (e.g. Dired buffers, `buffer-list' 6066some other data instead (e.g. Dired buffers, `buffer-list'
6067buffers). This is done via the variable `revert-buffer-function'. 6067buffers). This is done via the variable `revert-buffer-function'.
6068In these cases, it should reconstruct the buffer contents from the 6068In these cases, it should reconstruct the buffer contents from the
6069appropriate data. 6069appropriate data.
6070 6070
6071When called from Lisp, the first argument is IGNORE-AUTO; only offer 6071When called from Lisp, the first argument is IGNORE-AUTO; offer to
6072to revert from the auto-save file when this is nil. Note that the 6072revert from the auto-save file only when this is nil. Note that the
6073sense of this argument is the reverse of the prefix argument, for the 6073sense of this argument is the reverse of the prefix argument, for the
6074sake of backward compatibility. IGNORE-AUTO is optional, defaulting 6074sake of backward compatibility. IGNORE-AUTO is optional, defaulting
6075to nil. 6075to nil.
@@ -6088,7 +6088,7 @@ to do the work, with arguments IGNORE-AUTO and NOCONFIRM.
6088The default function runs the hooks `before-revert-hook' and 6088The default function runs the hooks `before-revert-hook' and
6089`after-revert-hook'." 6089`after-revert-hook'."
6090 ;; I admit it's odd to reverse the sense of the prefix argument, but 6090 ;; I admit it's odd to reverse the sense of the prefix argument, but
6091 ;; there is a lot of code out there which assumes that the first 6091 ;; there is a lot of code out there that assumes that the first
6092 ;; argument should be t to avoid consulting the auto-save file, and 6092 ;; argument should be t to avoid consulting the auto-save file, and
6093 ;; there's no straightforward way to encourage authors to notice a 6093 ;; there's no straightforward way to encourage authors to notice a
6094 ;; reversal of the argument sense. So I'm just changing the user 6094 ;; 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
6109contents of the visited file, with two arguments: the first is the file 6109contents of the visited file, with two arguments: the first is the file
6110name, the second is non-nil if reading an auto-save file. 6110name, the second is non-nil if reading an auto-save file.
6111 6111
6112This function only handles buffers that are visiting files. 6112This function handles only buffers that are visiting files.
6113Non-file buffers need a custom function." 6113Non-file buffers need a custom function."
6114 (with-current-buffer (or (buffer-base-buffer (current-buffer)) 6114 (with-current-buffer (or (buffer-base-buffer (current-buffer))
6115 (current-buffer)) 6115 (current-buffer))
@@ -6507,7 +6507,7 @@ See also `auto-save-file-name-p'."
6507 (let ((buffer-name (buffer-name)) 6507 (let ((buffer-name (buffer-name))
6508 (limit 0) 6508 (limit 0)
6509 file-name) 6509 file-name)
6510 ;; Restrict the characters used in the file name to those which 6510 ;; Restrict the characters used in the file name to those that
6511 ;; are known to be safe on all filesystems, url-encoding the 6511 ;; are known to be safe on all filesystems, url-encoding the
6512 ;; rest. 6512 ;; rest.
6513 ;; We do this on all platforms, because even if we are not 6513 ;; We do this on all platforms, because even if we are not
@@ -6641,7 +6641,7 @@ by `sh' are supported."
6641 6641
6642(defun file-expand-wildcards (pattern &optional full) 6642(defun file-expand-wildcards (pattern &optional full)
6643 "Expand wildcard pattern PATTERN. 6643 "Expand wildcard pattern PATTERN.
6644This returns a list of file names which match the pattern. 6644This returns a list of file names that match the pattern.
6645Files are sorted in `string<' order. 6645Files are sorted in `string<' order.
6646 6646
6647If PATTERN is written as an absolute file name, 6647If PATTERN is written as an absolute file name,
@@ -6725,7 +6725,7 @@ and `list-directory-verbose-switches'."
6725PATTERN is assumed to represent a file-name wildcard suitable for the 6725PATTERN is assumed to represent a file-name wildcard suitable for the
6726underlying filesystem. For Unix and GNU/Linux, each character from the 6726underlying filesystem. For Unix and GNU/Linux, each character from the
6727set [ \\t\\n;<>&|()\\=`\\='\"#$] is quoted with a backslash; for DOS/Windows, all 6727set [ \\t\\n;<>&|()\\=`\\='\"#$] is quoted with a backslash; for DOS/Windows, all
6728the parts of the pattern which don't include wildcard characters are 6728the parts of the pattern that don't include wildcard characters are
6729quoted with double quotes. 6729quoted with double quotes.
6730 6730
6731This function leaves alone existing quote characters (\\ on Unix and \" 6731This function leaves alone existing quote characters (\\ on Unix and \"
@@ -7290,7 +7290,7 @@ only these files will be asked to be saved."
7290 file-name-handler-alist)) 7290 file-name-handler-alist))
7291 7291
7292;; We depend on being the last handler on the list, 7292;; We depend on being the last handler on the list,
7293;; so that anything else which does need handling 7293;; so that anything else that does need handling
7294;; has been handled already. 7294;; has been handled already.
7295;; So it is safe for us to inhibit *all* magic file name handlers for 7295;; So it is safe for us to inhibit *all* magic file name handlers for
7296;; operations, which return a file name. See Bug#29579. 7296;; operations, which return a file name. See Bug#29579.
@@ -7318,7 +7318,7 @@ only these files will be asked to be saved."
7318 (expand-file-name 7318 (expand-file-name
7319 (unhandled-file-name-directory default-directory))) 7319 (unhandled-file-name-directory default-directory)))
7320 default-directory)) 7320 default-directory))
7321 ;; Get a list of the indices of the args which are file names. 7321 ;; Get a list of the indices of the args that are file names.
7322 (file-arg-indices 7322 (file-arg-indices
7323 (cdr (or (assq operation 7323 (cdr (or (assq operation
7324 '(;; The first seven are special because they 7324 '(;; The first seven are special because they
@@ -7349,7 +7349,7 @@ only these files will be asked to be saved."
7349 (copy-file local-copy) 7349 (copy-file local-copy)
7350 (rename-file local-copy) 7350 (rename-file local-copy)
7351 (copy-directory local-copy) 7351 (copy-directory local-copy)
7352 ;; List the arguments which are filenames. 7352 ;; List the arguments that are filenames.
7353 (file-name-completion 0 1) 7353 (file-name-completion 0 1)
7354 (file-name-all-completions 0 1) 7354 (file-name-all-completions 0 1)
7355 (file-equal-p 0 1) 7355 (file-equal-p 0 1)
@@ -7399,7 +7399,7 @@ only these files will be asked to be saved."
7399 ;; We can't use `cl-letf' with `(buffer-local-value)' here 7399 ;; We can't use `cl-letf' with `(buffer-local-value)' here
7400 ;; because it wouldn't work during bootstrapping. 7400 ;; because it wouldn't work during bootstrapping.
7401 (let ((buffer (current-buffer))) 7401 (let ((buffer (current-buffer)))
7402 ;; `unquote-then-quote' is only used for the 7402 ;; `unquote-then-quote' is used only for the
7403 ;; `verify-visited-file-modtime' action, which takes a buffer 7403 ;; `verify-visited-file-modtime' action, which takes a buffer
7404 ;; as only optional argument. 7404 ;; as only optional argument.
7405 (with-current-buffer (or (car arguments) buffer) 7405 (with-current-buffer (or (car arguments) buffer)
@@ -7593,7 +7593,7 @@ based on existing mode bits, as in \"og+rX-w\"."
7593;; Trashcan handling. 7593;; Trashcan handling.
7594(defcustom trash-directory nil 7594(defcustom trash-directory nil
7595 "Directory for `move-file-to-trash' to move files and directories to. 7595 "Directory for `move-file-to-trash' to move files and directories to.
7596This directory is only used when the function `system-move-file-to-trash' 7596This directory is used only when the function `system-move-file-to-trash'
7597is not defined. 7597is not defined.
7598Relative paths are interpreted relative to `default-directory'. 7598Relative paths are interpreted relative to `default-directory'.
7599If the value is nil, Emacs uses a freedesktop.org-style trashcan." 7599If 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
7616Otherwise, if `trash-directory' is non-nil, move FILENAME to that 7616Otherwise, if `trash-directory' is non-nil, move FILENAME to that
7617 directory. 7617 directory.
7618Otherwise, trash FILENAME using the freedesktop.org conventions, 7618Otherwise, trash FILENAME using the freedesktop.org conventions,
7619 like the GNOME, KDE and XFCE desktop environments. Emacs only 7619 like the GNOME, KDE and XFCE desktop environments. Emacs moves
7620 moves files to \"home trash\", ignoring per-volume trashcans." 7620 files only to \"home trash\", ignoring per-volume trashcans."
7621 (interactive "fMove file to trash: ") 7621 (interactive "fMove file to trash: ")
7622 ;; If `system-move-file-to-trash' is defined, use it. 7622 ;; If `system-move-file-to-trash' is defined, use it.
7623 (cond ((fboundp 'system-move-file-to-trash) 7623 (cond ((fboundp 'system-move-file-to-trash)
diff --git a/lisp/subr.el b/lisp/subr.el
index b408ef0931d..03cf3da278f 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -185,7 +185,7 @@ buffer-local wherever it is set."
185(defmacro push (newelt place) 185(defmacro push (newelt place)
186 "Add NEWELT to the list stored in the generalized variable PLACE. 186 "Add NEWELT to the list stored in the generalized variable PLACE.
187This is morally equivalent to (setf PLACE (cons NEWELT PLACE)), 187This is morally equivalent to (setf PLACE (cons NEWELT PLACE)),
188except that PLACE is only evaluated once (after NEWELT)." 188except that PLACE is evaluated only once (after NEWELT)."
189 (declare (debug (form gv-place))) 189 (declare (debug (form gv-place)))
190 (if (symbolp place) 190 (if (symbolp place)
191 ;; Important special case, to avoid triggering GV too early in 191 ;; Important special case, to avoid triggering GV too early in
@@ -696,7 +696,7 @@ non-nil."
696 "Return a sequence of numbers from FROM to TO (both inclusive) as a list. 696 "Return a sequence of numbers from FROM to TO (both inclusive) as a list.
697INC is the increment used between numbers in the sequence and defaults to 1. 697INC is the increment used between numbers in the sequence and defaults to 1.
698So, the Nth element of the list is (+ FROM (* N INC)) where N counts from 698So, the Nth element of the list is (+ FROM (* N INC)) where N counts from
699zero. TO is only included if there is an N for which TO = FROM + N * INC. 699zero. TO is included only if there is an N for which TO = FROM + N * INC.
700If TO is nil or numerically equal to FROM, return (FROM). 700If TO is nil or numerically equal to FROM, return (FROM).
701If INC is positive and TO is less than FROM, or INC is negative 701If INC is positive and TO is less than FROM, or INC is negative
702and TO is larger than FROM, return nil. 702and TO is larger than FROM, return nil.
@@ -892,7 +892,7 @@ This is the same format used for saving keyboard macros (see
892`edmacro-mode'). 892`edmacro-mode').
893 893
894For an approximate inverse of this, see `key-description'." 894For an approximate inverse of this, see `key-description'."
895 ;; Don't use a defalias, since the `pure' property is only true for 895 ;; Don't use a defalias, since the `pure' property is true only for
896 ;; the calling convention of `kbd'. 896 ;; the calling convention of `kbd'.
897 (read-kbd-macro keys)) 897 (read-kbd-macro keys))
898(put 'kbd 'pure t) 898(put 'kbd 'pure t)
@@ -955,7 +955,7 @@ AFTER should be a single event type--a symbol or a character, not a sequence.
955 955
956Bindings are always added before any inherited map. 956Bindings are always added before any inherited map.
957 957
958The order of bindings in a keymap only matters when it is used as 958The order of bindings in a keymap matters only when it is used as
959a menu, so this function is not useful for non-menu keymaps." 959a menu, so this function is not useful for non-menu keymaps."
960 (unless after (setq after t)) 960 (unless after (setq after t))
961 (or (keymapp keymap) 961 (or (keymapp keymap)
@@ -1169,7 +1169,7 @@ KEY is a string or vector representing a sequence of keystrokes."
1169 "Replace OLDDEF with NEWDEF for any keys in KEYMAP now defined as OLDDEF. 1169 "Replace OLDDEF with NEWDEF for any keys in KEYMAP now defined as OLDDEF.
1170In other words, OLDDEF is replaced with NEWDEF wherever it appears. 1170In other words, OLDDEF is replaced with NEWDEF wherever it appears.
1171Alternatively, if optional fourth argument OLDMAP is specified, we redefine 1171Alternatively, if optional fourth argument OLDMAP is specified, we redefine
1172in KEYMAP as NEWDEF those keys which are defined as OLDDEF in OLDMAP. 1172in KEYMAP as NEWDEF those keys that are defined as OLDDEF in OLDMAP.
1173 1173
1174If you don't specify OLDMAP, you can usually get the same results 1174If you don't specify OLDMAP, you can usually get the same results
1175in a cleaner way with command remapping, like this: 1175in a cleaner way with command remapping, like this:
@@ -1241,7 +1241,7 @@ in a cleaner way with command remapping, like this:
1241 1241
1242(defvar global-map nil 1242(defvar global-map nil
1243 "Default global keymap mapping Emacs keyboard input into commands. 1243 "Default global keymap mapping Emacs keyboard input into commands.
1244The value is a keymap which is usually (but not necessarily) Emacs's 1244The value is a keymap that is usually (but not necessarily) Emacs's
1245global map.") 1245global map.")
1246 1246
1247(defvar esc-map nil 1247(defvar esc-map nil
@@ -1611,7 +1611,7 @@ be a list of the form returned by `event-start' and `event-end'."
1611 "expect it to be removed in a future version." "25.2") 1611 "expect it to be removed in a future version." "25.2")
1612 1612
1613;; This was introduced in 21.4 for pre-unicode unification. That 1613;; This was introduced in 21.4 for pre-unicode unification. That
1614;; usage was rendered obsolete in 23.1 which uses Unicode internally. 1614;; usage was rendered obsolete in 23.1, which uses Unicode internally.
1615;; Other uses are possible, so this variable is not _really_ obsolete, 1615;; Other uses are possible, so this variable is not _really_ obsolete,
1616;; but Stefan insists to mark it so. 1616;; but Stefan insists to mark it so.
1617(make-obsolete-variable 'translation-table-for-input nil "23.1") 1617(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."
1761(defmacro letrec (binders &rest body) 1761(defmacro letrec (binders &rest body)
1762 "Bind variables according to BINDERS then eval BODY. 1762 "Bind variables according to BINDERS then eval BODY.
1763The value of the last form in BODY is returned. 1763The value of the last form in BODY is returned.
1764Each element of BINDERS is a list (SYMBOL VALUEFORM) which binds 1764Each element of BINDERS is a list (SYMBOL VALUEFORM) that binds
1765SYMBOL to the value of VALUEFORM. 1765SYMBOL to the value of VALUEFORM.
1766 1766
1767The main difference between this macro and `let'/`let*' is that 1767The main difference between this macro and `let'/`let*' is that
1768all symbols are bound before any of the VALUEFORMs are evalled." 1768all symbols are bound before any of the VALUEFORMs are evalled."
1769 ;; Only useful in lexical-binding mode. 1769 ;; Useful only in lexical-binding mode.
1770 ;; As a special-form, we could implement it more efficiently (and cleanly, 1770 ;; As a special-form, we could implement it more efficiently (and cleanly,
1771 ;; making the vars actually unbound during evaluation of the binders). 1771 ;; making the vars actually unbound during evaluation of the binders).
1772 (declare (debug let) (indent 1)) 1772 (declare (debug let) (indent 1))
@@ -1871,7 +1871,7 @@ can do the job."
1871 (msg (format-message 1871 (msg (format-message
1872 "`add-to-list' can't use lexical var `%s'; use `push' or `cl-pushnew'" 1872 "`add-to-list' can't use lexical var `%s'; use `push' or `cl-pushnew'"
1873 sym)) 1873 sym))
1874 ;; Big ugly hack so we only output a warning during 1874 ;; Big ugly hack, so we output a warning only during
1875 ;; byte-compilation, and so we can use 1875 ;; byte-compilation, and so we can use
1876 ;; byte-compile-not-lexical-var-p to silence the warning 1876 ;; byte-compile-not-lexical-var-p to silence the warning
1877 ;; when a defvar has been seen but not yet executed. 1877 ;; when a defvar has been seen but not yet executed.
@@ -2046,7 +2046,7 @@ running their FOO-mode-hook."
2046 "Execute BODY, but delay any `run-mode-hooks'. 2046 "Execute BODY, but delay any `run-mode-hooks'.
2047These hooks will be executed by the first following call to 2047These hooks will be executed by the first following call to
2048`run-mode-hooks' that occurs outside any `delay-mode-hooks' form. 2048`run-mode-hooks' that occurs outside any `delay-mode-hooks' form.
2049Only affects hooks run in the current buffer." 2049Affects only hooks run in the current buffer."
2050 (declare (debug t) (indent 0)) 2050 (declare (debug t) (indent 0))
2051 `(progn 2051 `(progn
2052 (make-local-variable 'delay-mode-hooks) 2052 (make-local-variable 'delay-mode-hooks)
@@ -2118,7 +2118,7 @@ tho trying to avoid AVOIDED-MODES."
2118 2118
2119This is an XEmacs-compatibility function. Use `define-minor-mode' instead. 2119This is an XEmacs-compatibility function. Use `define-minor-mode' instead.
2120 2120
2121TOGGLE is a symbol which is the name of a buffer-local variable that 2121TOGGLE is a symbol that is the name of a buffer-local variable that
2122is toggled on or off to say whether the minor mode is active or not. 2122is toggled on or off to say whether the minor mode is active or not.
2123 2123
2124NAME specifies what will appear in the mode line when the minor mode 2124NAME 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'."
2405 ;; Wait long enough that Emacs has the time to receive and 2405 ;; Wait long enough that Emacs has the time to receive and
2406 ;; process all the raw events associated with the single-key. 2406 ;; process all the raw events associated with the single-key.
2407 ;; But don't wait too long, or the user may find the delay 2407 ;; But don't wait too long, or the user may find the delay
2408 ;; annoying (or keep hitting more keys which may then get 2408 ;; annoying (or keep hitting more keys, which may then get
2409 ;; lost or misinterpreted). 2409 ;; lost or misinterpreted).
2410 ;; This is only relevant for keys which Emacs perceives as 2410 ;; This is relevant only for keys that Emacs perceives as
2411 ;; "prefixes", such as C-x (because of the C-x 8 map in 2411 ;; "prefixes", such as C-x (because of the C-x 8 map in
2412 ;; key-translate-table and the C-x @ map in function-key-map) 2412 ;; key-translate-table and the C-x @ map in function-key-map)
2413 ;; or ESC (because of terminal escape sequences in 2413 ;; or ESC (because of terminal escape sequences in
@@ -3168,7 +3168,7 @@ alternatives."
3168(defun function-get (f prop &optional autoload) 3168(defun function-get (f prop &optional autoload)
3169 "Return the value of property PROP of function F. 3169 "Return the value of property PROP of function F.
3170If AUTOLOAD is non-nil and F is autoloaded, try to autoload it 3170If AUTOLOAD is non-nil and F is autoloaded, try to autoload it
3171in the hope that it will set PROP. If AUTOLOAD is `macro', only do it 3171in the hope that it will set PROP. If AUTOLOAD is `macro', do it only
3172if it's an autoloaded macro." 3172if it's an autoloaded macro."
3173 (let ((val nil)) 3173 (let ((val nil))
3174 (while (and (symbolp f) 3174 (while (and (symbolp f)
@@ -3664,7 +3664,7 @@ See also `with-temp-file' and `with-output-to-string'."
3664(defmacro with-silent-modifications (&rest body) 3664(defmacro with-silent-modifications (&rest body)
3665 "Execute BODY, pretending it does not modify the buffer. 3665 "Execute BODY, pretending it does not modify the buffer.
3666This macro is typically used around modifications of 3666This macro is typically used around modifications of
3667text properties which do not really affect the buffer's content. 3667text properties that do not really affect the buffer's content.
3668If BODY performs real modifications to the buffer's text, other 3668If BODY performs real modifications to the buffer's text, other
3669than cosmetic ones, undo data may become corrupted. 3669than cosmetic ones, undo data may become corrupted.
3670 3670
@@ -3776,8 +3776,8 @@ FORMAT is a string passed to `message' to format any error message.
3776It should contain a single %-sequence; e.g., \"Error: %S\". 3776It should contain a single %-sequence; e.g., \"Error: %S\".
3777 3777
3778If `debug-on-error' is non-nil, run BODY without catching its errors. 3778If `debug-on-error' is non-nil, run BODY without catching its errors.
3779This is to be used around code which is not expected to signal an error 3779This is to be used around code that is not expected to signal an error
3780but which should be robust in the unexpected case that an error is signaled. 3780but that should be robust in the unexpected case that an error is signaled.
3781 3781
3782For backward compatibility, if FORMAT is not a constant string, it 3782For backward compatibility, if FORMAT is not a constant string, it
3783is assumed to be part of BODY, in which case the message format 3783is 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,
4139which is returned. 4139which is returned.
4140 4140
4141If SEPARATORS is non-nil, it should be a regular expression matching text 4141If SEPARATORS is non-nil, it should be a regular expression matching text
4142which separates, but is not part of, the substrings. If nil it defaults to 4142that separates, but is not part of, the substrings. If nil it defaults to
4143`split-string-default-separators', normally \"[ \\f\\t\\n\\r\\v]+\", and 4143`split-string-default-separators', normally \"[ \\f\\t\\n\\r\\v]+\", and
4144OMIT-NULLS is forced to t. 4144OMIT-NULLS is forced to t.
4145 4145
@@ -4282,7 +4282,7 @@ and replace a sub-expression, e.g.
4282 ;; To avoid excessive consing from multiple matches in long strings, 4282 ;; To avoid excessive consing from multiple matches in long strings,
4283 ;; don't just call `replace-match' continually. Walk down the 4283 ;; don't just call `replace-match' continually. Walk down the
4284 ;; string looking for matches of REGEXP and building up a (reversed) 4284 ;; string looking for matches of REGEXP and building up a (reversed)
4285 ;; list MATCHES. This comprises segments of STRING which weren't 4285 ;; list MATCHES. This comprises segments of STRING that weren't
4286 ;; matched interspersed with replacements for segments that were. 4286 ;; matched interspersed with replacements for segments that were.
4287 ;; [For a `large' number of replacements it's more efficient to 4287 ;; [For a `large' number of replacements it's more efficient to
4288 ;; operate in a temporary buffer; we can't tell from the function's 4288 ;; operate in a temporary buffer; we can't tell from the function's
@@ -4298,7 +4298,7 @@ and replace a sub-expression, e.g.
4298 ;; If we matched the empty string, make sure we advance by one char 4298 ;; If we matched the empty string, make sure we advance by one char
4299 (when (= me mb) (setq me (min l (1+ mb)))) 4299 (when (= me mb) (setq me (min l (1+ mb))))
4300 ;; Generate a replacement for the matched substring. 4300 ;; Generate a replacement for the matched substring.
4301 ;; Operate only on the substring to minimize string consing. 4301 ;; Operate on only the substring to minimize string consing.
4302 ;; Set up match data for the substring for replacement; 4302 ;; Set up match data for the substring for replacement;
4303 ;; presumably this is likely to be faster than munging the 4303 ;; presumably this is likely to be faster than munging the
4304 ;; match data directly in Lisp. 4304 ;; match data directly in Lisp.
@@ -4339,7 +4339,7 @@ attention to case differences."
4339Normally, inserting a string with right-to-left (RTL) script into 4339Normally, inserting a string with right-to-left (RTL) script into
4340a buffer may cause some subsequent text to be displayed as part 4340a buffer may cause some subsequent text to be displayed as part
4341of the RTL segment (usually this affects punctuation characters). 4341of the RTL segment (usually this affects punctuation characters).
4342This function returns a string which displays as STR but forces 4342This function returns a string that displays as STR but forces
4343subsequent text to be displayed as left-to-right. 4343subsequent text to be displayed as left-to-right.
4344 4344
4345If STR contains any RTL character, this function returns a string 4345If STR contains any RTL character, this function returns a string
@@ -4555,7 +4555,7 @@ Used from `delayed-warnings-hook' (which see)."
4555 (push warning collapsed))) 4555 (push warning collapsed)))
4556 (setq delayed-warnings-list (nreverse collapsed)))) 4556 (setq delayed-warnings-list (nreverse collapsed))))
4557 4557
4558;; At present this is only used for Emacs internals. 4558;; At present this is used only for Emacs internals.
4559;; Ref https://lists.gnu.org/r/emacs-devel/2012-02/msg00085.html 4559;; Ref https://lists.gnu.org/r/emacs-devel/2012-02/msg00085.html
4560(defvar delayed-warnings-hook '(collapse-delayed-warnings 4560(defvar delayed-warnings-hook '(collapse-delayed-warnings
4561 display-delayed-warnings) 4561 display-delayed-warnings)
@@ -4621,7 +4621,7 @@ Value is what BODY returns."
4621 4621
4622(defun make-syntax-table (&optional oldtable) 4622(defun make-syntax-table (&optional oldtable)
4623 "Return a new syntax table. 4623 "Return a new syntax table.
4624Create a syntax table which inherits from OLDTABLE (if non-nil) or 4624Create a syntax table that inherits from OLDTABLE (if non-nil) or
4625from `standard-syntax-table' otherwise." 4625from `standard-syntax-table' otherwise."
4626 (let ((table (make-char-table 'syntax-table nil))) 4626 (let ((table (make-char-table 'syntax-table nil)))
4627 (set-char-table-parent table (or oldtable (standard-syntax-table))) 4627 (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."
4640 "Return the code for the syntax class described by SYNTAX. 4640 "Return the code for the syntax class described by SYNTAX.
4641 4641
4642SYNTAX should be a raw syntax descriptor; the return value is a 4642SYNTAX should be a raw syntax descriptor; the return value is a
4643integer which encodes the corresponding syntax class. See Info 4643integer that encodes the corresponding syntax class. See Info
4644node `(elisp)Syntax Table Internals' for a list of codes. 4644node `(elisp)Syntax Table Internals' for a list of codes.
4645 4645
4646If SYNTAX is nil, return nil." 4646If SYNTAX is nil, return nil."
@@ -4911,7 +4911,7 @@ the number of frames to skip (minus 1).")
4911 4911
4912(defun called-interactively-p (&optional kind) 4912(defun called-interactively-p (&optional kind)
4913 "Return t if the containing function was called by `call-interactively'. 4913 "Return t if the containing function was called by `call-interactively'.
4914If KIND is `interactive', then only return t if the call was made 4914If KIND is `interactive', then return t only if the call was made
4915interactively by the user, i.e. not in `noninteractive' mode nor 4915interactively by the user, i.e. not in `noninteractive' mode nor
4916when `executing-kbd-macro'. 4916when `executing-kbd-macro'.
4917If KIND is `any', on the other hand, it will return t for any kind of 4917If 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.
5044Optional arg ON-EXIT, if non-nil, specifies a function that is 5044Optional arg ON-EXIT, if non-nil, specifies a function that is
5045called, with no arguments, after MAP is deactivated. 5045called, with no arguments, after MAP is deactivated.
5046 5046
5047This uses `overriding-terminal-local-map' which takes precedence over all other 5047This uses `overriding-terminal-local-map', which takes precedence over all
5048keymaps. As usual, if no match for a key is found in MAP, the normal key 5048other keymaps. As usual, if no match for a key is found in MAP, the normal
5049lookup sequence then continues. 5049key lookup sequence then continues.
5050 5050
5051This returns an \"exit function\", which can be called with no argument 5051This returns an \"exit function\", which can be called with no argument
5052to deactivate this transient map, regardless of KEEP-PRED." 5052to deactivate this transient map, regardless of KEEP-PRED."
@@ -5224,7 +5224,7 @@ NEW-MESSAGE, if non-nil, sets a new message for the reporter."
5224 max-value)) 5224 max-value))
5225 (when (integerp value) 5225 (when (integerp value)
5226 (setcar reporter (ceiling (car reporter)))) 5226 (setcar reporter (ceiling (car reporter))))
5227 ;; Only print message if enough time has passed 5227 ;; Print message only if enough time has passed
5228 (when enough-time-passed 5228 (when enough-time-passed
5229 (if suffix 5229 (if suffix
5230 (aset parameters 6 suffix) 5230 (aset parameters 6 suffix)
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.
6123If the value is an integer, highlighting is only shown after moving the 6123If the value is an integer, highlighting is shown only after moving the
6124mouse, while keyboard input turns off the highlight even when the mouse 6124mouse, while keyboard input turns off the highlight even when the mouse
6125is over the clickable text. However, the mouse shape still indicates 6125is over the clickable text. However, the mouse shape still indicates
6126when the mouse is over clickable text. */); 6126when 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.
1719This means that display lines which are exactly as wide as the window 1719This 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
1721showing (or hiding) the final newline in the right fringe; when point 1721showing (or hiding) the final newline in the right fringe; when point
1722is at the final newline, the cursor is shown in the right fringe. 1722is at the final newline, the cursor is shown in the right fringe.
1723If nil, also continue lines which are exactly as wide as the window. */); 1723If 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.
1759FILTER nil or a frame means clear all images in the selected frame. 1759FILTER nil or a frame means clear all images in the selected frame.
1760FILTER t means clear the image caches of all frames. 1760FILTER t means clear the image caches of all frames.
1761Anything else, means only clear those images which refer to FILTER, 1761Anything else means clear only those images that refer to FILTER,
1762which is then usually a filename. */) 1762which 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.
10056Return t if TYPE is a supported image type. 10056Return t if TYPE is a supported image type.
10057 10057
10058If image libraries are loaded dynamically (currently only the case on 10058If image libraries are loaded dynamically (currently the case only on
10059MS-Windows), load the library for TYPE if it is not yet loaded, using 10059MS-Windows), load the library for TYPE if it is not yet loaded, using
10060the library file(s) specified by `dynamic-library-alist'. */) 10060the 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
3Copyright (C) 1989, 1992-2019 Free Software Foundation, Inc. 3Copyright (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
5788DEFUN ("x-synchronize", Fx_synchronize, Sx_synchronize, 1, 2, 0, 5788DEFUN ("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.
5790This function only has an effect on X Windows. With MS Windows, it is 5790This function has an effect only on X Windows. With MS Windows, it is
5791defined but does nothing. 5791defined but does nothing.
5792 5792
5793If ON is nil, allow buffering of requests. 5793If ON is nil, allow buffering of requests.
@@ -7365,9 +7365,9 @@ Use a file selection dialog. Select DEFAULT-FILENAME in the dialog's file
7365selection box, if specified. If MUSTMATCH is non-nil, the returned file 7365selection box, if specified. If MUSTMATCH is non-nil, the returned file
7366or directory must exist. 7366or directory must exist.
7367 7367
7368This function is only defined on NS, MS Windows, and X Windows with the 7368This function is defined only on NS, MS Windows, and X Windows with the
7369Motif or Gtk toolkits. With the Motif toolkit, ONLY-DIR-P is ignored. 7369Motif or Gtk toolkits. With the Motif toolkit, ONLY-DIR-P is ignored.
7370Otherwise, if ONLY-DIR-P is non-nil, the user can only select directories. 7370Otherwise, if ONLY-DIR-P is non-nil, the user can select only directories.
7371On MS Windows 7 and later, the file selection dialog "remembers" the last 7371On MS Windows 7 and later, the file selection dialog "remembers" the last
7372directory where the user selected a file, and will open that directory 7372directory where the user selected a file, and will open that directory
7373instead of DIR on subsequent invocations of this function with the same 7373instead 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.
13639This variable is only used when the window manager requires that you 13639This variable is used only when the window manager requires that you
13640click on a frame to select it (give it focus). In that case, a value 13640click on a frame to select it (give it focus). In that case, a value
13641of nil, means that the selected window and cursor position changes to 13641of nil, means that the selected window and cursor position changes to
13642reflect the mouse click position, while a non-nil value means that the 13642reflect the mouse click position, while a non-nil value means that the