diff options
| author | Eli Zaretskii | 2019-03-22 11:59:11 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2019-03-22 11:59:11 +0300 |
| commit | 09c220a5cfb229ef88d1b3e9065951e3368da1e2 (patch) | |
| tree | 7a95069befb4daf26d15e4c579c0afce83a3dbfc | |
| parent | 8fa94a1ecc18a41ca2738f438b3fbc817c9fdc82 (diff) | |
| download | emacs-09c220a5cfb229ef88d1b3e9065951e3368da1e2.tar.gz emacs-09c220a5cfb229ef88d1b3e9065951e3368da1e2.zip | |
Minor fixes for the last change
* lisp/simple.el (delete-indentation):
* doc/emacs/indent.texi (Indentation Commands):
* etc/NEWS: Fix last change. (Bug#34796)
| -rw-r--r-- | doc/emacs/indent.texi | 6 | ||||
| -rw-r--r-- | etc/NEWS | 6 | ||||
| -rw-r--r-- | lisp/simple.el | 7 |
3 files changed, 11 insertions, 8 deletions
diff --git a/doc/emacs/indent.texi b/doc/emacs/indent.texi index 61cf7332b5c..5f40acba151 100644 --- a/doc/emacs/indent.texi +++ b/doc/emacs/indent.texi | |||
| @@ -110,9 +110,9 @@ parentheses, or if the junction follows another newline. | |||
| 110 | If there is a fill prefix, @kbd{M-^} deletes the fill prefix if it | 110 | If there is a fill prefix, @kbd{M-^} deletes the fill prefix if it |
| 111 | appears after the newline that is deleted. @xref{Fill Prefix}. | 111 | appears after the newline that is deleted. @xref{Fill Prefix}. |
| 112 | 112 | ||
| 113 | With the universal prefix argument, join the current line line to the | 113 | With a prefix argument, join the current line line to the following |
| 114 | following line. With the region active, join lines in the region. If | 114 | line. If the region is active, and no prefix argument is given, join |
| 115 | both the argument is set and the region is active, the region is ignored. | 115 | all lines in the region instead. |
| 116 | 116 | ||
| 117 | @item C-M-\ | 117 | @item C-M-\ |
| 118 | @kindex C-M-\ | 118 | @kindex C-M-\ |
| @@ -370,8 +370,10 @@ region using a given replacement-function in a non-destructive manner | |||
| 370 | arguments mitigating performance issues when operating on huge | 370 | arguments mitigating performance issues when operating on huge |
| 371 | buffers. | 371 | buffers. |
| 372 | 372 | ||
| 373 | ** The command `delete-indentation` now can operate on the active | 373 | ** The command 'delete-indentation' now operates on the active region. |
| 374 | region | 374 | If the region is active, the command joins all the lines in the |
| 375 | region. When there's no active region, the command works on the | ||
| 376 | current and the previous or the next line, as before. | ||
| 375 | 377 | ||
| 376 | +++ | 378 | +++ |
| 377 | 379 | ||
diff --git a/lisp/simple.el b/lisp/simple.el index 7878272ec90..f52bd95bf84 100644 --- a/lisp/simple.el +++ b/lisp/simple.el | |||
| @@ -596,9 +596,10 @@ When called from Lisp code, ARG may be a prefix string to copy." | |||
| 596 | (defun delete-indentation (&optional arg beg end) | 596 | (defun delete-indentation (&optional arg beg end) |
| 597 | "Join this line to previous and fix up whitespace at join. | 597 | "Join this line to previous and fix up whitespace at join. |
| 598 | If there is a fill prefix, delete it from the beginning of this | 598 | If there is a fill prefix, delete it from the beginning of this |
| 599 | line. With prefix ARG, join the current line to the following line. | 599 | line. |
| 600 | With the region active, join lines in the region. If both the | 600 | With prefix ARG, join the current line to the following line. |
| 601 | argument is set and the region is active, the region is ignored." | 601 | If the region is active, join all the lines in the region. (The |
| 602 | region is ignored if prefix argument is given.)" | ||
| 602 | (interactive "*P\nr") | 603 | (interactive "*P\nr") |
| 603 | (if arg (forward-line 1) | 604 | (if arg (forward-line 1) |
| 604 | (if (use-region-p) | 605 | (if (use-region-p) |