diff options
| author | Stephen Gildea | 2019-11-16 21:17:02 -0800 |
|---|---|---|
| committer | Stephen Gildea | 2019-11-16 21:19:22 -0800 |
| commit | 32d1c1fc1f8d33df80c99cd147160b85583271f6 (patch) | |
| tree | 91cde79b2020ead94146bc20fe275c1e583e58ea | |
| parent | 3dcf06bfa035c3caaeac5ce5c585dbfc07f31331 (diff) | |
| download | emacs-32d1c1fc1f8d33df80c99cd147160b85583271f6.tar.gz emacs-32d1c1fc1f8d33df80c99cd147160b85583271f6.zip | |
; Grammar in simple.el doc strings and comments
* lisp/simple.el: Improve the English grammar in some doc strings
and comments.
| -rw-r--r-- | lisp/simple.el | 88 |
1 files changed, 44 insertions, 44 deletions
diff --git a/lisp/simple.el b/lisp/simple.el index 9b4aa235e47..8229899f9ac 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -317,7 +317,7 @@ invocation of `next-error'. | |||
| 317 | 317 | ||
| 318 | Once \\[next-error] has chosen the buffer for error messages, it | 318 | Once \\[next-error] has chosen the buffer for error messages, it |
| 319 | runs `next-error-hook' with `run-hooks', and stays with that buffer | 319 | runs `next-error-hook' with `run-hooks', and stays with that buffer |
| 320 | until you use it in some other buffer which uses Compilation mode | 320 | until you use it in some other buffer that uses Compilation mode |
| 321 | or Compilation Minor mode. | 321 | or Compilation Minor mode. |
| 322 | 322 | ||
| 323 | To control which errors are matched, customize the variable | 323 | To control which errors are matched, customize the variable |
| @@ -487,14 +487,14 @@ rather than files. These modes usually use read-only buffers." | |||
| 487 | It must be called via `run-hook-with-args-until-success' with no arguments. | 487 | It must be called via `run-hook-with-args-until-success' with no arguments. |
| 488 | 488 | ||
| 489 | If any function on this hook returns a non-nil value, `delete-selection-mode' | 489 | If any function on this hook returns a non-nil value, `delete-selection-mode' |
| 490 | will act on that value (see `delete-selection-helper'), and will | 490 | will act on that value (see `delete-selection-helper') and will |
| 491 | usually delete the region. If all the functions on this hook return | 491 | usually delete the region. If all the functions on this hook return |
| 492 | nil, it is an indiction that `self-insert-command' needs the region | 492 | nil, it is an indiction that `self-insert-command' needs the region |
| 493 | untouched by `delete-selection-mode', and will itself do whatever is | 493 | untouched by `delete-selection-mode' and will itself do whatever is |
| 494 | appropriate with the region. | 494 | appropriate with the region. |
| 495 | Any function on `post-self-insert-hook' which act on the region should | 495 | Any function on `post-self-insert-hook' that acts on the region should |
| 496 | add a function to this hook so that `delete-selection-mode' could | 496 | add a function to this hook so that `delete-selection-mode' could |
| 497 | refrain from deleting the region before `post-self-insert-hook' | 497 | refrain from deleting the region before the `post-self-insert-hook' |
| 498 | functions are called. | 498 | functions are called. |
| 499 | This hook is run by `delete-selection-uses-region-p', which see.") | 499 | This hook is run by `delete-selection-uses-region-p', which see.") |
| 500 | 500 | ||
| @@ -543,7 +543,7 @@ A non-nil INTERACTIVE argument means to run the `post-self-insert-hook'." | |||
| 543 | (delete-region (point) | 543 | (delete-region (point) |
| 544 | (line-end-position)))) | 544 | (line-end-position)))) |
| 545 | ;; Indent the line after the newline, except in one case: | 545 | ;; Indent the line after the newline, except in one case: |
| 546 | ;; when we added the newline at the beginning of a line which | 546 | ;; when we added the newline at the beginning of a line that |
| 547 | ;; starts a page. | 547 | ;; starts a page. |
| 548 | (or was-page-start | 548 | (or was-page-start |
| 549 | (move-to-left-margin nil t))))) | 549 | (move-to-left-margin nil t))))) |
| @@ -561,7 +561,7 @@ A non-nil INTERACTIVE argument means to run the `post-self-insert-hook'." | |||
| 561 | ;; We first used let-binding to protect the hook, but that | 561 | ;; We first used let-binding to protect the hook, but that |
| 562 | ;; was naive since add-hook affects the symbol-default | 562 | ;; was naive since add-hook affects the symbol-default |
| 563 | ;; value of the variable, whereas the let-binding might | 563 | ;; value of the variable, whereas the let-binding might |
| 564 | ;; only protect the buffer-local value. | 564 | ;; protect only the buffer-local value. |
| 565 | (remove-hook 'post-self-insert-hook postproc t)))) | 565 | (remove-hook 'post-self-insert-hook postproc t)))) |
| 566 | nil) | 566 | nil) |
| 567 | 567 | ||
| @@ -878,7 +878,7 @@ This is useful for inserting control characters. | |||
| 878 | With argument, insert ARG copies of the character. | 878 | With argument, insert ARG copies of the character. |
| 879 | 879 | ||
| 880 | If the first character you type after this command is an octal digit, | 880 | If the first character you type after this command is an octal digit, |
| 881 | you should type a sequence of octal digits which specify a character code. | 881 | you should type a sequence of octal digits that specify a character code. |
| 882 | Any nondigit terminates the sequence. If the terminator is a RET, | 882 | Any nondigit terminates the sequence. If the terminator is a RET, |
| 883 | it is discarded; any other terminator is used itself as input. | 883 | it is discarded; any other terminator is used itself as input. |
| 884 | The variable `read-quoted-char-radix' specifies the radix for this feature; | 884 | The variable `read-quoted-char-radix' specifies the radix for this feature; |
| @@ -953,7 +953,7 @@ Leave one space or none, according to the context." | |||
| 953 | 953 | ||
| 954 | (defun delete-horizontal-space (&optional backward-only) | 954 | (defun delete-horizontal-space (&optional backward-only) |
| 955 | "Delete all spaces and tabs around point. | 955 | "Delete all spaces and tabs around point. |
| 956 | If BACKWARD-ONLY is non-nil, only delete them before point." | 956 | If BACKWARD-ONLY is non-nil, delete them only before point." |
| 957 | (interactive "*P") | 957 | (interactive "*P") |
| 958 | (let ((orig-pos (point))) | 958 | (let ((orig-pos (point))) |
| 959 | (delete-region | 959 | (delete-region |
| @@ -994,7 +994,7 @@ The second call in a sequence deletes all spaces. | |||
| 994 | 994 | ||
| 995 | The third call in a sequence restores the original whitespace (and point). | 995 | The third call in a sequence restores the original whitespace (and point). |
| 996 | 996 | ||
| 997 | If MODE is `single-shot', it only performs the first step in the sequence. | 997 | If MODE is `single-shot', it performs only the first step in the sequence. |
| 998 | If MODE is `fast' and the first step would not result in any change | 998 | If MODE is `fast' and the first step would not result in any change |
| 999 | \(i.e., there are exactly (abs N) spaces around point), | 999 | \(i.e., there are exactly (abs N) spaces around point), |
| 1000 | the function goes straight to the second step. | 1000 | the function goes straight to the second step. |
| @@ -1197,7 +1197,7 @@ the actual saved text might be different from what was killed." | |||
| 1197 | (defun mark-whole-buffer () | 1197 | (defun mark-whole-buffer () |
| 1198 | "Put point at beginning and mark at end of buffer. | 1198 | "Put point at beginning and mark at end of buffer. |
| 1199 | Also push mark at point before pushing mark at end of buffer. | 1199 | Also push mark at point before pushing mark at end of buffer. |
| 1200 | If narrowing is in effect, only uses the accessible part of the buffer. | 1200 | If narrowing is in effect, uses only the accessible part of the buffer. |
| 1201 | You probably should not use this function in Lisp programs; | 1201 | You probably should not use this function in Lisp programs; |
| 1202 | it is usually a mistake for a Lisp function to use any subroutine | 1202 | it is usually a mistake for a Lisp function to use any subroutine |
| 1203 | that uses or sets the mark." | 1203 | that uses or sets the mark." |
| @@ -1630,7 +1630,7 @@ there is no such truncation. | |||
| 1630 | If the resulting value is an integer, and CHAR-PRINT-LIMIT is | 1630 | If the resulting value is an integer, and CHAR-PRINT-LIMIT is |
| 1631 | non-nil (interactively, unless given a non-zero prefix argument) | 1631 | non-nil (interactively, unless given a non-zero prefix argument) |
| 1632 | it will be printed in several additional formats (octal, | 1632 | it will be printed in several additional formats (octal, |
| 1633 | hexadecimal, and character). The character format is only used | 1633 | hexadecimal, and character). The character format is used only |
| 1634 | if the value is below CHAR-PRINT-LIMIT (interactively, if the | 1634 | if the value is below CHAR-PRINT-LIMIT (interactively, if the |
| 1635 | prefix argument is -1 or the value doesn't exceed | 1635 | prefix argument is -1 or the value doesn't exceed |
| 1636 | `eval-expression-print-maximum-character'). | 1636 | `eval-expression-print-maximum-character'). |
| @@ -1692,7 +1692,7 @@ the minibuffer, then read and evaluate the result." | |||
| 1692 | 1692 | ||
| 1693 | (defun repeat-complex-command (arg) | 1693 | (defun repeat-complex-command (arg) |
| 1694 | "Edit and re-evaluate last complex command, or ARGth from last. | 1694 | "Edit and re-evaluate last complex command, or ARGth from last. |
| 1695 | A complex command is one which used the minibuffer. | 1695 | A complex command is one that used the minibuffer. |
| 1696 | The command is placed in the minibuffer as a Lisp form for editing. | 1696 | The command is placed in the minibuffer as a Lisp form for editing. |
| 1697 | The result is executed, repeating the command as changed. | 1697 | The result is executed, repeating the command as changed. |
| 1698 | If the command has been changed or is not the most recent previous | 1698 | If the command has been changed or is not the most recent previous |
| @@ -2298,8 +2298,8 @@ previous element of the minibuffer history in the minibuffer." | |||
| 2298 | (unless (eolp) (backward-char 1))))))) | 2298 | (unless (eolp) (backward-char 1))))))) |
| 2299 | 2299 | ||
| 2300 | (defun next-complete-history-element (n) | 2300 | (defun next-complete-history-element (n) |
| 2301 | "Get next history element which completes the minibuffer before the point. | 2301 | "Get next history element that completes the minibuffer before the point. |
| 2302 | The contents of the minibuffer after the point are deleted, and replaced | 2302 | The contents of the minibuffer after the point are deleted and replaced |
| 2303 | by the new completion." | 2303 | by the new completion." |
| 2304 | (interactive "p") | 2304 | (interactive "p") |
| 2305 | (let ((point-at-start (point))) | 2305 | (let ((point-at-start (point))) |
| @@ -2314,8 +2314,8 @@ by the new completion." | |||
| 2314 | 2314 | ||
| 2315 | (defun previous-complete-history-element (n) | 2315 | (defun previous-complete-history-element (n) |
| 2316 | "\ | 2316 | "\ |
| 2317 | Get previous history element which completes the minibuffer before the point. | 2317 | Get previous history element that completes the minibuffer before the point. |
| 2318 | The contents of the minibuffer after the point are deleted, and replaced | 2318 | The contents of the minibuffer after the point are deleted and replaced |
| 2319 | by the new completion." | 2319 | by the new completion." |
| 2320 | (interactive "p") | 2320 | (interactive "p") |
| 2321 | (next-complete-history-element (- n))) | 2321 | (next-complete-history-element (- n))) |
| @@ -2497,7 +2497,7 @@ If t, we undid all the way to the end of it.") | |||
| 2497 | Repeat this command to undo more changes. | 2497 | Repeat this command to undo more changes. |
| 2498 | A numeric ARG serves as a repeat count. | 2498 | A numeric ARG serves as a repeat count. |
| 2499 | 2499 | ||
| 2500 | In Transient Mark mode when the mark is active, only undo changes within | 2500 | In Transient Mark mode when the mark is active, undo changes only within |
| 2501 | the current region. Similarly, when not in Transient Mark mode, just \\[universal-argument] | 2501 | the current region. Similarly, when not in Transient Mark mode, just \\[universal-argument] |
| 2502 | as an argument limits undo to changes within the current region." | 2502 | as an argument limits undo to changes within the current region." |
| 2503 | (interactive "*P") | 2503 | (interactive "*P") |
| @@ -2787,7 +2787,7 @@ Return what remains of the list." | |||
| 2787 | (defun undo-start (&optional beg end) | 2787 | (defun undo-start (&optional beg end) |
| 2788 | "Set `pending-undo-list' to the front of the undo list. | 2788 | "Set `pending-undo-list' to the front of the undo list. |
| 2789 | The next call to `undo-more' will undo the most recently made change. | 2789 | The next call to `undo-more' will undo the most recently made change. |
| 2790 | If BEG and END are specified, then only undo elements | 2790 | If BEG and END are specified, then undo only elements |
| 2791 | that apply to text between BEG and END are used; other undo elements | 2791 | that apply to text between BEG and END are used; other undo elements |
| 2792 | are ignored. If BEG and END are nil, all undo elements are used." | 2792 | are ignored. If BEG and END are nil, all undo elements are used." |
| 2793 | (if (eq buffer-undo-list t) | 2793 | (if (eq buffer-undo-list t) |
| @@ -3225,7 +3225,7 @@ Normally, Emacs discards the undo info for the current command if | |||
| 3225 | it exceeds `undo-outer-limit'. But if you set this option | 3225 | it exceeds `undo-outer-limit'. But if you set this option |
| 3226 | non-nil, it asks in the echo area whether to discard the info. | 3226 | non-nil, it asks in the echo area whether to discard the info. |
| 3227 | If you answer no, there is a slight risk that Emacs might crash, so | 3227 | If you answer no, there is a slight risk that Emacs might crash, so |
| 3228 | only do it if you really want to undo the command. | 3228 | do it only if you really want to undo the command. |
| 3229 | 3229 | ||
| 3230 | This option is mainly intended for debugging. You have to be | 3230 | This option is mainly intended for debugging. You have to be |
| 3231 | careful if you use it for other purposes. Garbage collection is | 3231 | careful if you use it for other purposes. Garbage collection is |
| @@ -3241,7 +3241,7 @@ excessively long before answering the question." | |||
| 3241 | We don't ask the user about truncating the undo list until the | 3241 | We don't ask the user about truncating the undo list until the |
| 3242 | current item gets bigger than this amount. | 3242 | current item gets bigger than this amount. |
| 3243 | 3243 | ||
| 3244 | This variable only matters if `undo-ask-before-discard' is non-nil.") | 3244 | This variable matters only if `undo-ask-before-discard' is non-nil.") |
| 3245 | (make-variable-buffer-local 'undo-extra-outer-limit) | 3245 | (make-variable-buffer-local 'undo-extra-outer-limit) |
| 3246 | 3246 | ||
| 3247 | ;; When the first undo batch in an undo list is longer than | 3247 | ;; When the first undo batch in an undo list is longer than |
| @@ -3611,7 +3611,7 @@ impose the use of a shell (with its need to quote arguments)." | |||
| 3611 | (push-mark nil t) | 3611 | (push-mark nil t) |
| 3612 | ;; We do not use -f for csh; we will not support broken use of | 3612 | ;; We do not use -f for csh; we will not support broken use of |
| 3613 | ;; .cshrcs. Even the BSD csh manual says to use | 3613 | ;; .cshrcs. Even the BSD csh manual says to use |
| 3614 | ;; "if ($?prompt) exit" before things which are not useful | 3614 | ;; "if ($?prompt) exit" before things that are not useful |
| 3615 | ;; non-interactively. Besides, if someone wants their other | 3615 | ;; non-interactively. Besides, if someone wants their other |
| 3616 | ;; aliases for shell commands then they can still have them. | 3616 | ;; aliases for shell commands then they can still have them. |
| 3617 | (call-process-shell-command command nil (if error-file | 3617 | (call-process-shell-command command nil (if error-file |
| @@ -3734,7 +3734,7 @@ string and it is displayed in the echo area, it is not specified whether | |||
| 3734 | the contents are inserted into the buffer anyway. | 3734 | the contents are inserted into the buffer anyway. |
| 3735 | 3735 | ||
| 3736 | Optional arguments ACTION and FRAME are as for `display-buffer', | 3736 | Optional arguments ACTION and FRAME are as for `display-buffer', |
| 3737 | and are only used if a pop-up buffer is displayed." | 3737 | and are used only if a pop-up buffer is displayed." |
| 3738 | (cond ((and (stringp message) (not (string-match "\n" message))) | 3738 | (cond ((and (stringp message) (not (string-match "\n" message))) |
| 3739 | ;; Trivial case where we can use the echo area | 3739 | ;; Trivial case where we can use the echo area |
| 3740 | (message "%s" message)) | 3740 | (message "%s" message)) |
| @@ -3894,7 +3894,7 @@ interactively, this is t." | |||
| 3894 | (if error-file | 3894 | (if error-file |
| 3895 | (list t error-file) | 3895 | (list t error-file) |
| 3896 | t))) | 3896 | t))) |
| 3897 | ;; It is rude to delete a buffer which the command is not using. | 3897 | ;; It is rude to delete a buffer that the command is not using. |
| 3898 | ;; (let ((shell-buffer (get-buffer "*Shell Command Output*"))) | 3898 | ;; (let ((shell-buffer (get-buffer "*Shell Command Output*"))) |
| 3899 | ;; (and shell-buffer (not (eq shell-buffer (current-buffer))) | 3899 | ;; (and shell-buffer (not (eq shell-buffer (current-buffer))) |
| 3900 | ;; (kill-buffer shell-buffer))) | 3900 | ;; (kill-buffer shell-buffer))) |
| @@ -4009,8 +4009,8 @@ by `file-local-name' before passing it to this function. | |||
| 4009 | 4009 | ||
| 4010 | File names in INFILE and BUFFER are handled normally, but file | 4010 | File names in INFILE and BUFFER are handled normally, but file |
| 4011 | names in ARGS should be relative to `default-directory', as they | 4011 | names in ARGS should be relative to `default-directory', as they |
| 4012 | are passed to the process verbatim. (This is a difference to | 4012 | are passed to the process verbatim. (This is a difference from |
| 4013 | `call-process' which does not support file name handlers for INFILE | 4013 | `call-process', which does not support file name handlers for INFILE |
| 4014 | and BUFFER.) | 4014 | and BUFFER.) |
| 4015 | 4015 | ||
| 4016 | Some file name handlers might not support all variants, for example | 4016 | Some file name handlers might not support all variants, for example |
| @@ -4217,7 +4217,7 @@ see other processes running on the system, use `list-system-processes'." | |||
| 4217 | (when strs (mapconcat #'identity strs " ")))))) | 4217 | (when strs (mapconcat #'identity strs " ")))))) |
| 4218 | 4218 | ||
| 4219 | (defvar prefix-command-echo-keystrokes-functions nil | 4219 | (defvar prefix-command-echo-keystrokes-functions nil |
| 4220 | "Abnormal hook which constructs the description of the current prefix state. | 4220 | "Abnormal hook that constructs the description of the current prefix state. |
| 4221 | Each function is called with no argument, should return a string or nil.") | 4221 | Each function is called with no argument, should return a string or nil.") |
| 4222 | 4222 | ||
| 4223 | (defun prefix-command-update () | 4223 | (defun prefix-command-update () |
| @@ -4316,7 +4316,7 @@ Digits or minus sign following \\[universal-argument] make up the numeric argume | |||
| 4316 | Repeating \\[universal-argument] without digits or minus sign | 4316 | Repeating \\[universal-argument] without digits or minus sign |
| 4317 | multiplies the argument by 4 each time. | 4317 | multiplies the argument by 4 each time. |
| 4318 | For some commands, just \\[universal-argument] by itself serves as a flag | 4318 | For some commands, just \\[universal-argument] by itself serves as a flag |
| 4319 | which is different in effect from any particular numeric argument. | 4319 | that is different in effect from any particular numeric argument. |
| 4320 | These commands include \\[set-mark-command] and \\[start-kbd-macro]." | 4320 | These commands include \\[set-mark-command] and \\[start-kbd-macro]." |
| 4321 | (interactive) | 4321 | (interactive) |
| 4322 | (prefix-command-preserve-state) | 4322 | (prefix-command-preserve-state) |
| @@ -4438,7 +4438,7 @@ MS-Windows, or the pasteboard on Nextstep/Mac OS. | |||
| 4438 | This variable holds a function that Emacs calls whenever text is | 4438 | This variable holds a function that Emacs calls whenever text is |
| 4439 | put in the kill ring, to make the new kill available to other | 4439 | put in the kill ring, to make the new kill available to other |
| 4440 | programs. The function takes one argument, TEXT, which is a | 4440 | programs. The function takes one argument, TEXT, which is a |
| 4441 | string containing the text which should be made available.") | 4441 | string containing the text that should be made available.") |
| 4442 | 4442 | ||
| 4443 | (defvar interprogram-paste-function #'gui-selection-value | 4443 | (defvar interprogram-paste-function #'gui-selection-value |
| 4444 | "Function to call to get text cut from other programs. | 4444 | "Function to call to get text cut from other programs. |
| @@ -4890,7 +4890,7 @@ bidirectional display before and after the region." | |||
| 4890 | ;; Replace each run of non-LTR characters with a single RLM. Note | 4890 | ;; Replace each run of non-LTR characters with a single RLM. Note |
| 4891 | ;; that the \cR category includes both the Arabic Letter (AL) and | 4891 | ;; that the \cR category includes both the Arabic Letter (AL) and |
| 4892 | ;; R characters; here we ignore the distinction between them, | 4892 | ;; R characters; here we ignore the distinction between them, |
| 4893 | ;; because that distinction only affects Arabic Number (AN) | 4893 | ;; because that distinction affects only Arabic Number (AN) |
| 4894 | ;; characters, which are weak and don't affect the reordering. | 4894 | ;; characters, which are weak and don't affect the reordering. |
| 4895 | (squeeze-bidi-context-1 start end "\\CL+" "\x200f"))) | 4895 | (squeeze-bidi-context-1 start end "\\CL+" "\x200f"))) |
| 4896 | 4896 | ||
| @@ -5972,7 +5972,7 @@ in effect and the mark is active, by acting on the region instead | |||
| 5972 | of their usual default part of the buffer's text. Examples of | 5972 | of their usual default part of the buffer's text. Examples of |
| 5973 | such commands include \\[comment-dwim], \\[flush-lines], \\[keep-lines], | 5973 | such commands include \\[comment-dwim], \\[flush-lines], \\[keep-lines], |
| 5974 | \\[query-replace], \\[query-replace-regexp], \\[ispell], and \\[undo]. | 5974 | \\[query-replace], \\[query-replace-regexp], \\[ispell], and \\[undo]. |
| 5975 | To see the documentation of commands which are sensitive to the | 5975 | To see the documentation of commands that are sensitive to the |
| 5976 | Transient Mark mode, invoke \\[apropos-documentation] and type \"transient\" | 5976 | Transient Mark mode, invoke \\[apropos-documentation] and type \"transient\" |
| 5977 | or \"mark.*active\" at the prompt." | 5977 | or \"mark.*active\" at the prompt." |
| 5978 | :global t | 5978 | :global t |
| @@ -5989,16 +5989,16 @@ as a fallback, and won't change the buffer bounds.") | |||
| 5989 | 5989 | ||
| 5990 | (defvar non-essential nil | 5990 | (defvar non-essential nil |
| 5991 | "Whether the currently executing code is performing an essential task. | 5991 | "Whether the currently executing code is performing an essential task. |
| 5992 | This variable should be non-nil only when running code which should not | 5992 | This variable should be non-nil only when running code that should not |
| 5993 | disturb the user. E.g. it can be used to prevent Tramp from prompting the | 5993 | disturb the user. E.g., it can be used to prevent Tramp from prompting |
| 5994 | user for a password when we are simply scanning a set of files in the | 5994 | the user for a password when we are simply scanning a set of files in the |
| 5995 | background or displaying possible completions before the user even asked | 5995 | background or displaying possible completions before the user even asked |
| 5996 | for it.") | 5996 | for it.") |
| 5997 | 5997 | ||
| 5998 | (defun pop-global-mark () | 5998 | (defun pop-global-mark () |
| 5999 | "Pop off global mark ring and jump to the top location." | 5999 | "Pop off global mark ring and jump to the top location." |
| 6000 | (interactive) | 6000 | (interactive) |
| 6001 | ;; Pop entries which refer to non-existent buffers. | 6001 | ;; Pop entries that refer to non-existent buffers. |
| 6002 | (while (and global-mark-ring (not (marker-buffer (car global-mark-ring)))) | 6002 | (while (and global-mark-ring (not (marker-buffer (car global-mark-ring)))) |
| 6003 | (setq global-mark-ring (cdr global-mark-ring))) | 6003 | (setq global-mark-ring (cdr global-mark-ring))) |
| 6004 | (or global-mark-ring | 6004 | (or global-mark-ring |
| @@ -6033,7 +6033,7 @@ function will not vscroll. | |||
| 6033 | ARG defaults to 1. | 6033 | ARG defaults to 1. |
| 6034 | 6034 | ||
| 6035 | If there is no character in the target line exactly under the current column, | 6035 | If there is no character in the target line exactly under the current column, |
| 6036 | the cursor is positioned after the character in that line which spans this | 6036 | the cursor is positioned after the character in that line that spans this |
| 6037 | column, or at the end of the line if it is not long enough. | 6037 | column, or at the end of the line if it is not long enough. |
| 6038 | If there is no line in the buffer after this one, behavior depends on the | 6038 | If there is no line in the buffer after this one, behavior depends on the |
| 6039 | value of `next-line-add-newlines'. If non-nil, it inserts a newline character | 6039 | value of `next-line-add-newlines'. If non-nil, it inserts a newline character |
| @@ -6081,7 +6081,7 @@ function will not vscroll. | |||
| 6081 | ARG defaults to 1. | 6081 | ARG defaults to 1. |
| 6082 | 6082 | ||
| 6083 | If there is no character in the target line exactly over the current column, | 6083 | If there is no character in the target line exactly over the current column, |
| 6084 | the cursor is positioned after the character in that line which spans this | 6084 | the cursor is positioned after the character in that line that spans this |
| 6085 | column, or at the end of the line if it is not long enough. | 6085 | column, or at the end of the line if it is not long enough. |
| 6086 | 6086 | ||
| 6087 | If the variable `line-move-visual' is non-nil, this command moves | 6087 | If the variable `line-move-visual' is non-nil, this command moves |
| @@ -6166,7 +6166,7 @@ lines." | |||
| 6166 | :group 'editing-basics | 6166 | :group 'editing-basics |
| 6167 | :version "23.1") | 6167 | :version "23.1") |
| 6168 | 6168 | ||
| 6169 | ;; Only used if display-graphic-p. | 6169 | ;; Used only if display-graphic-p. |
| 6170 | (declare-function font-info "font.c" (name &optional frame)) | 6170 | (declare-function font-info "font.c" (name &optional frame)) |
| 6171 | 6171 | ||
| 6172 | (defun default-font-height () | 6172 | (defun default-font-height () |
| @@ -6781,7 +6781,7 @@ rests." | |||
| 6781 | (defun move-beginning-of-line (arg) | 6781 | (defun move-beginning-of-line (arg) |
| 6782 | "Move point to beginning of current line as displayed. | 6782 | "Move point to beginning of current line as displayed. |
| 6783 | \(If there's an image in the line, this disregards newlines | 6783 | \(If there's an image in the line, this disregards newlines |
| 6784 | which are part of the text that the image rests on.) | 6784 | that are part of the text that the image rests on.) |
| 6785 | 6785 | ||
| 6786 | With argument ARG not nil or 1, move forward ARG - 1 lines first. | 6786 | With argument ARG not nil or 1, move forward ARG - 1 lines first. |
| 6787 | If point reaches the beginning or end of buffer, it stops there. | 6787 | If point reaches the beginning or end of buffer, it stops there. |
| @@ -7273,7 +7273,7 @@ constitute a word." | |||
| 7273 | (put 'fill-prefix 'safe-local-variable 'string-or-null-p) | 7273 | (put 'fill-prefix 'safe-local-variable 'string-or-null-p) |
| 7274 | 7274 | ||
| 7275 | (defcustom auto-fill-inhibit-regexp nil | 7275 | (defcustom auto-fill-inhibit-regexp nil |
| 7276 | "Regexp to match lines which should not be auto-filled." | 7276 | "Regexp to match lines that should not be auto-filled." |
| 7277 | :type '(choice (const :tag "None" nil) | 7277 | :type '(choice (const :tag "None" nil) |
| 7278 | regexp) | 7278 | regexp) |
| 7279 | :group 'fill) | 7279 | :group 'fill) |
| @@ -7365,7 +7365,7 @@ Returns t if it really did any work." | |||
| 7365 | t))) | 7365 | t))) |
| 7366 | 7366 | ||
| 7367 | (defvar comment-line-break-function 'comment-indent-new-line | 7367 | (defvar comment-line-break-function 'comment-indent-new-line |
| 7368 | "Mode-specific function which line breaks and continues a comment. | 7368 | "Mode-specific function that line breaks and continues a comment. |
| 7369 | This function is called during auto-filling when a comment syntax | 7369 | This function is called during auto-filling when a comment syntax |
| 7370 | is defined. | 7370 | is defined. |
| 7371 | The function should take a single optional argument, which is a flag | 7371 | The function should take a single optional argument, which is a flag |
| @@ -7656,7 +7656,7 @@ Returns non-nil if we find there is a mismatch." | |||
| 7656 | (eq (syntax-class end-syntax) 5) | 7656 | (eq (syntax-class end-syntax) 5) |
| 7657 | (cdr end-syntax)))) | 7657 | (cdr end-syntax)))) |
| 7658 | ;; For self-matched chars like " and $, we can't know when they're | 7658 | ;; For self-matched chars like " and $, we can't know when they're |
| 7659 | ;; mismatched or unmatched, so we can only do it for parens. | 7659 | ;; mismatched or unmatched, so we can do it only for parens. |
| 7660 | (when matching-paren | 7660 | (when matching-paren |
| 7661 | (not (and start | 7661 | (not (and start |
| 7662 | (or | 7662 | (or |
| @@ -7875,7 +7875,7 @@ specification for `play-sound'." | |||
| 7875 | 7875 | ||
| 7876 | (defcustom read-mail-command 'rmail | 7876 | (defcustom read-mail-command 'rmail |
| 7877 | "Your preference for a mail reading package. | 7877 | "Your preference for a mail reading package. |
| 7878 | This is used by some keybindings which support reading mail. | 7878 | This is used by some keybindings that support reading mail. |
| 7879 | See also `mail-user-agent' concerning sending mail." | 7879 | See also `mail-user-agent' concerning sending mail." |
| 7880 | :type '(radio (function-item :tag "Rmail" :format "%t\n" rmail) | 7880 | :type '(radio (function-item :tag "Rmail" :format "%t\n" rmail) |
| 7881 | (function-item :tag "Gnus" :format "%t\n" gnus) | 7881 | (function-item :tag "Gnus" :format "%t\n" gnus) |
| @@ -8841,7 +8841,7 @@ See also `normal-erase-is-backspace'." | |||
| 8841 | (define-key local-function-key-map [backspace] [?\C-?]) | 8841 | (define-key local-function-key-map [backspace] [?\C-?]) |
| 8842 | (dolist (b bindings) | 8842 | (dolist (b bindings) |
| 8843 | ;; Not sure if input-decode-map is really right, but | 8843 | ;; Not sure if input-decode-map is really right, but |
| 8844 | ;; keyboard-translate-table (used below) only works | 8844 | ;; keyboard-translate-table (used below) works only |
| 8845 | ;; for integer events, and key-translation-table is | 8845 | ;; for integer events, and key-translation-table is |
| 8846 | ;; global (like the global-map, used earlier). | 8846 | ;; global (like the global-map, used earlier). |
| 8847 | (define-key input-decode-map (car b) nil) | 8847 | (define-key input-decode-map (car b) nil) |