From: "Łukasz Stelmach" <stlman@poczta.fm>
To: 34796@debbugs.gnu.org
Cc: "Łukasz Stelmach" <stlman@poczta.fm>
Subject: bug#34796: [PATCH] * lisp/simple.el (delete-indentation): Join lines in a region
Date: Sat, 9 Mar 2019 18:56:34 +0100 [thread overview]
Message-ID: <20190309175634.23262-1-stlman@poczta.fm> (raw)
If a region is active, join all the lines it spans.
---
lisp/simple.el | 42 +++++++++++++++++++++++++-----------------
1 file changed, 25 insertions(+), 17 deletions(-)
diff --git a/lisp/simple.el b/lisp/simple.el
index d4ae5eb..1b3d1bf 100644
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -593,25 +593,33 @@ When called from Lisp code, ARG may be a prefix string to copy."
(indent-to col 0)
(goto-char pos)))
-(defun delete-indentation (&optional arg)
+(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 argument, join this line to following line."
- (interactive "*P")
+If there is a fill prefix, delete it from the beginning of this
+line. With argument, join this line to following line. With a
+region active, join lines in the region. If both argument and
+region are set, the region is ignored."
+ (interactive "*P\nr")
+ (if arg (forward-line 1)
+ (if (use-region-p)
+ (goto-char end)))
(beginning-of-line)
- (if arg (forward-line 1))
- (if (eq (preceding-char) ?\n)
- (progn
- (delete-region (point) (1- (point)))
- ;; If the second line started with the fill prefix,
- ;; delete the prefix.
- (if (and fill-prefix
- (<= (+ (point) (length fill-prefix)) (point-max))
- (string= fill-prefix
- (buffer-substring (point)
- (+ (point) (length fill-prefix)))))
- (delete-region (point) (+ (point) (length fill-prefix))))
- (fixup-whitespace))))
+ (while (eq (preceding-char) ?\n)
+ (progn
+ (delete-region (point) (1- (point)))
+ ;; If the second line started with the fill prefix,
+ ;; delete the prefix.
+ (if (and fill-prefix
+ (<= (+ (point) (length fill-prefix)) (point-max))
+ (string= fill-prefix
+ (buffer-substring (point)
+ (+ (point) (length fill-prefix)))))
+ (delete-region (point) (+ (point) (length fill-prefix))))
+ (fixup-whitespace)
+ (if (and beg
+ (not arg)
+ (< beg (point-at-bol)))
+ (beginning-of-line)))))
(defalias 'join-line #'delete-indentation) ; easier to find
--
2.20.1
next reply other threads:[~2019-03-09 17:56 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-09 17:56 Łukasz Stelmach [this message]
[not found] ` <handler.34796.B.155215436111455.ack@debbugs.gnu.org>
2019-03-10 7:14 ` bug#34796: [PATCH] * lisp/simple.el (delete-indentation): Join lines in a region Łukasz Stelmach
2019-03-15 8:13 ` Eli Zaretskii
2019-03-15 21:06 ` bug#34796: [PATCH] If the region is active, join all the lines it spans Łukasz Stelmach
2019-03-22 9:08 ` Eli Zaretskii
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190309175634.23262-1-stlman@poczta.fm \
--to=stlman@poczta.fm \
--cc=34796@debbugs.gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/emacs.git
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.