diff options
| author | Juri Linkov | 2020-06-09 02:28:53 +0300 |
|---|---|---|
| committer | Juri Linkov | 2020-06-09 02:28:53 +0300 |
| commit | 6b9eac67590cf4396cdde5a21ace8e96d30a1ea2 (patch) | |
| tree | 88bc1de9f9624591f05346e2eb76be6667335cc9 | |
| parent | 43ad7dc1af327486963e5e3a3ae8efdb454fd38d (diff) | |
| download | emacs-6b9eac67590cf4396cdde5a21ace8e96d30a1ea2.tar.gz emacs-6b9eac67590cf4396cdde5a21ace8e96d30a1ea2.zip | |
* lisp/simple.el (shell-command-on-region): Fix docstring.
* lisp/simple.el (shell-command-on-region): Mention REGION-NONCONTIGUOUS-P
in docstring (bug#41440)
* etc/NEWS: Better example for 'windmove-display-default-keybindings'.
| -rw-r--r-- | etc/NEWS | 4 | ||||
| -rw-r--r-- | lisp/simple.el | 7 |
2 files changed, 8 insertions, 3 deletions
| @@ -956,8 +956,8 @@ displays the buffer from the next command in that window. For example, | |||
| 956 | 'S-M-right C-h i' displays the "*Info*" buffer in the right window, | 956 | 'S-M-right C-h i' displays the "*Info*" buffer in the right window, |
| 957 | creating the window if necessary. A special key can be customized to | 957 | creating the window if necessary. A special key can be customized to |
| 958 | display the buffer in the same window, for example, 'S-M-0 C-h e' | 958 | display the buffer in the same window, for example, 'S-M-0 C-h e' |
| 959 | displays the "*Messages*" buffer in the same window. 'S-M-t C-h C-n' | 959 | displays the "*Messages*" buffer in the same window. 'S-M-t C-h r' |
| 960 | displays NEWS in a new tab. | 960 | displays the Emacs manual in a new tab. |
| 961 | 961 | ||
| 962 | +++ | 962 | +++ |
| 963 | *** Windmove also supports directional window deletion. | 963 | *** Windmove also supports directional window deletion. |
diff --git a/lisp/simple.el b/lisp/simple.el index 6d7600e414c..1555b376a36 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -3914,7 +3914,12 @@ is used for ERROR-BUFFER. | |||
| 3914 | 3914 | ||
| 3915 | Optional seventh arg DISPLAY-ERROR-BUFFER, if non-nil, means to | 3915 | Optional seventh arg DISPLAY-ERROR-BUFFER, if non-nil, means to |
| 3916 | display the error buffer if there were any errors. When called | 3916 | display the error buffer if there were any errors. When called |
| 3917 | interactively, this is t." | 3917 | interactively, this is t. |
| 3918 | |||
| 3919 | Non-nil REGION-NONCONTIGUOUS-P means that the region is composed of | ||
| 3920 | noncontiguous pieces. The most common example of this is a | ||
| 3921 | rectangular region, where the pieces are separated by newline | ||
| 3922 | characters." | ||
| 3918 | (interactive (let (string) | 3923 | (interactive (let (string) |
| 3919 | (unless (mark) | 3924 | (unless (mark) |
| 3920 | (user-error "The mark is not set now, so there is no region")) | 3925 | (user-error "The mark is not set now, so there is no region")) |