procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Minor fixes for the last change

Browse source 
* lisp/simple.el (delete-indentation):
* doc/emacs/indent.texi (Indentation Commands):
* etc/NEWS: Fix last change.  (Bug#34796)
This commit is contained in:
Eli Zaretskii 2019-03-22 11:59:11 +03:00
parent 8fa94a1ecc
commit 09c220a5cf
3 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
doc/emacs/indent.texi
View file

@ -110,9 +110,9 @@ parentheses, or if the junction follows another newline.
If there is a fill prefix, @kbd{M-^} deletes the fill prefix if it
appears after the newline that is deleted. @xref{Fill Prefix}.
With the universal prefix argument, join the current line line to the
following line. With the region active, join lines in the region. If
both the argument is set and the region is active, the region is ignored.
With a prefix argument, join the current line line to the following
line. If the region is active, and no prefix argument is given, join
all lines in the region instead.
@item C-M-\
@kindex C-M-\

6
etc/NEWS
View file

@ -370,8 +370,10 @@ region using a given replacement-function in a non-destructive manner
arguments mitigating performance issues when operating on huge
buffers.
** The command `delete-indentation` now can operate on the active
region
** The command 'delete-indentation' now operates on the active region.
If the region is active, the command joins all the lines in the
region. When there's no active region, the command works on the
current and the previous or the next line, as before.
+++

7
lisp/simple.el
View file

@ -596,9 +596,10 @@ When called from Lisp code, ARG may be a prefix string to copy."
(defun delete-indentation (&optional arg beg end)
"Join this line to previous and fix up whitespace at join.
If there is a fill prefix, delete it from the beginning of this
line. With prefix ARG, join the current line to the following line.
With the region active, join lines in the region. If both the
argument is set and the region is active, the region is ignored."
line.
With prefix ARG, join the current line to the following line.
If the region is active, join all the lines in the region. (The
region is ignored if prefix argument is given.)"
(interactive "*P\nr")
(if arg (forward-line 1)
(if (use-region-p)