diff options
| author | Juanma Barranquero | 2014-02-21 14:22:14 +0100 |
|---|---|---|
| committer | Juanma Barranquero | 2014-02-21 14:22:14 +0100 |
| commit | bed5126f521b70ea3c21e99fe340759729b6d660 (patch) | |
| tree | 2349fad47c1401d6ff84b83f539070cb085da360 | |
| parent | 2ed94e04988f8b85e43d150955d712bd6324b392 (diff) | |
| download | emacs-bed5126f521b70ea3c21e99fe340759729b6d660.tar.gz emacs-bed5126f521b70ea3c21e99fe340759729b6d660.zip | |
lisp/simple.el (choose-completion): Fix docstring typo.
(read-quoted-char-radix): Remove unneeded * in docstring.
(process-file, kill-whole-line, pop-to-mark-command, set-mark-command):
Don't escape parentheses unnecessarily in docstrings.
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/simple.el | 22 |
2 files changed, 18 insertions, 11 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 73b27f22ae6..2ddcbbfbd4b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,10 @@ | |||
| 1 | 2014-02-21 Juanma Barranquero <lekktu@gmail.com> | ||
| 2 | |||
| 3 | * simple.el (choose-completion): Fix docstring typo. | ||
| 4 | (read-quoted-char-radix): Remove unneeded * in docstring. | ||
| 5 | (process-file, kill-whole-line, pop-to-mark-command, set-mark-command): | ||
| 6 | Don't escape parentheses unnecessarily in docstrings. | ||
| 7 | |||
| 1 | 2014-02-21 Martin Rudalics <rudalics@gmx.at> | 8 | 2014-02-21 Martin Rudalics <rudalics@gmx.at> |
| 2 | 9 | ||
| 3 | Fix handling of window-min-height/-width (Bug#16738). | 10 | Fix handling of window-min-height/-width (Bug#16738). |
diff --git a/lisp/simple.el b/lisp/simple.el index c20bf134639..85a7476dbe0 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -641,7 +641,7 @@ column specified by the function `current-left-margin'." | |||
| 641 | (indent-according-to-mode))) | 641 | (indent-according-to-mode))) |
| 642 | 642 | ||
| 643 | (defcustom read-quoted-char-radix 8 | 643 | (defcustom read-quoted-char-radix 8 |
| 644 | "*Radix for \\[quoted-insert] and other uses of `read-quoted-char'. | 644 | "Radix for \\[quoted-insert] and other uses of `read-quoted-char'. |
| 645 | Legitimate radix values are 8, 10 and 16." | 645 | Legitimate radix values are 8, 10 and 16." |
| 646 | :type '(choice (const 8) (const 10) (const 16)) | 646 | :type '(choice (const 8) (const 10) (const 16)) |
| 647 | :group 'editing-basics) | 647 | :group 'editing-basics) |
| @@ -3184,9 +3184,9 @@ subprocess is `default-directory'. | |||
| 3184 | 3184 | ||
| 3185 | File names in INFILE and BUFFER are handled normally, but file | 3185 | File names in INFILE and BUFFER are handled normally, but file |
| 3186 | names in ARGS should be relative to `default-directory', as they | 3186 | names in ARGS should be relative to `default-directory', as they |
| 3187 | are passed to the process verbatim. \(This is a difference to | 3187 | are passed to the process verbatim. (This is a difference to |
| 3188 | `call-process' which does not support file handlers for INFILE | 3188 | `call-process' which does not support file handlers for INFILE |
| 3189 | and BUFFER.\) | 3189 | and BUFFER.) |
| 3190 | 3190 | ||
| 3191 | Some file handlers might not support all variants, for example | 3191 | Some file handlers might not support all variants, for example |
| 3192 | they might behave as if DISPLAY was nil, regardless of the actual | 3192 | they might behave as if DISPLAY was nil, regardless of the actual |
| @@ -4107,7 +4107,7 @@ even beep.)" | |||
| 4107 | "Kill current line. | 4107 | "Kill current line. |
| 4108 | With prefix ARG, kill that many lines starting from the current line. | 4108 | With prefix ARG, kill that many lines starting from the current line. |
| 4109 | If ARG is negative, kill backward. Also kill the preceding newline. | 4109 | If ARG is negative, kill backward. Also kill the preceding newline. |
| 4110 | \(This is meant to make \\[repeat] work well with negative arguments.\) | 4110 | \(This is meant to make \\[repeat] work well with negative arguments.) |
| 4111 | If ARG is zero, kill current line but exclude the trailing newline." | 4111 | If ARG is zero, kill current line but exclude the trailing newline." |
| 4112 | (interactive "p") | 4112 | (interactive "p") |
| 4113 | (or arg (setq arg 1)) | 4113 | (or arg (setq arg 1)) |
| @@ -4531,7 +4531,7 @@ Start discarding off end if gets this big." | |||
| 4531 | 4531 | ||
| 4532 | (defun pop-to-mark-command () | 4532 | (defun pop-to-mark-command () |
| 4533 | "Jump to mark, and pop a new position for mark off the ring. | 4533 | "Jump to mark, and pop a new position for mark off the ring. |
| 4534 | \(Does not affect global mark ring\)." | 4534 | \(Does not affect global mark ring)." |
| 4535 | (interactive) | 4535 | (interactive) |
| 4536 | (if (null (mark t)) | 4536 | (if (null (mark t)) |
| 4537 | (error "No mark set in this buffer") | 4537 | (error "No mark set in this buffer") |
| @@ -4577,11 +4577,11 @@ global mark ring, if the previous mark was set in another buffer. | |||
| 4577 | When Transient Mark Mode is off, immediately repeating this | 4577 | When Transient Mark Mode is off, immediately repeating this |
| 4578 | command activates `transient-mark-mode' temporarily. | 4578 | command activates `transient-mark-mode' temporarily. |
| 4579 | 4579 | ||
| 4580 | With prefix argument \(e.g., \\[universal-argument] \\[set-mark-command]\), \ | 4580 | With prefix argument (e.g., \\[universal-argument] \\[set-mark-command]), \ |
| 4581 | jump to the mark, and set the mark from | 4581 | jump to the mark, and set the mark from |
| 4582 | position popped off the local mark ring \(this does not affect the global | 4582 | position popped off the local mark ring (this does not affect the global |
| 4583 | mark ring\). Use \\[pop-global-mark] to jump to a mark popped off the global | 4583 | mark ring). Use \\[pop-global-mark] to jump to a mark popped off the global |
| 4584 | mark ring \(see `pop-global-mark'\). | 4584 | mark ring (see `pop-global-mark'). |
| 4585 | 4585 | ||
| 4586 | If `set-mark-command-repeat-pop' is non-nil, repeating | 4586 | If `set-mark-command-repeat-pop' is non-nil, repeating |
| 4587 | the \\[set-mark-command] command with no prefix argument pops the next position | 4587 | the \\[set-mark-command] command with no prefix argument pops the next position |
| @@ -5380,7 +5380,7 @@ If NOERROR, don't signal an error if we can't move that many lines." | |||
| 5380 | ;; the middle of a continued line. When we get to | 5380 | ;; the middle of a continued line. When we get to |
| 5381 | ;; line-move-finish, point is at the start of a new *screen* | 5381 | ;; line-move-finish, point is at the start of a new *screen* |
| 5382 | ;; line but the same text line; then line-move-to-column would | 5382 | ;; line but the same text line; then line-move-to-column would |
| 5383 | ;; move us backwards. Test using C-n with point on the "x" in | 5383 | ;; move us backwards. Test using C-n with point on the "x" in |
| 5384 | ;; (insert "a" (propertize "x" 'field t) (make-string 89 ?y)) | 5384 | ;; (insert "a" (propertize "x" 'field t) (make-string 89 ?y)) |
| 5385 | (and forward | 5385 | (and forward |
| 5386 | (< (point) old) | 5386 | (< (point) old) |
| @@ -6914,7 +6914,7 @@ With prefix argument N, move N items (negative N means move backward)." | |||
| 6914 | 6914 | ||
| 6915 | (defun choose-completion (&optional event) | 6915 | (defun choose-completion (&optional event) |
| 6916 | "Choose the completion at point. | 6916 | "Choose the completion at point. |
| 6917 | If EVENT, use EVENTs position to determine the starting position." | 6917 | If EVENT, use EVENT's position to determine the starting position." |
| 6918 | (interactive (list last-nonmenu-event)) | 6918 | (interactive (list last-nonmenu-event)) |
| 6919 | ;; In case this is run via the mouse, give temporary modes such as | 6919 | ;; In case this is run via the mouse, give temporary modes such as |
| 6920 | ;; isearch a chance to turn off. | 6920 | ;; isearch a chance to turn off. |