From: Ihor Radchenko <yantar92@posteo.net>
To: Spencer Baugh <sbaugh@janestreet.com>
Cc: emacs-orgmode@gnu.org
Subject: Re: [BUG] org-delete-indentation on region doesn't work when END is before BEGIN [9.6.1 (release_9.6.1-40-g3d817c @ /home/sbaugh/.local/src/emacs29/lisp/org/)]
Date: Sun, 16 Apr 2023 11:07:12 +0000 [thread overview]
Message-ID: <87v8hwt7a7.fsf@localhost> (raw)
In-Reply-To: <ier3552edfr.fsf@janestreet.com>
[-- Attachment #1: Type: text/plain, Size: 443 bytes --]
Spencer Baugh <sbaugh@janestreet.com> writes:
> 1. emacs -Q
> 2. Insert the following in an org-mode buffer
> * head
> a
> b
> 3. C-x h M-^ and note that it's now formatted as:
> a
> b
> * head
`org-delete-indentation' did not support regions properly.
I tried to make things more consistent with `delete-indentation in the
attached patch.
May you please test the patch and let me know if there are any other
inconsistencies you observe?
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-org-delete-indentation-Support-region-selection.patch --]
[-- Type: text/x-patch, Size: 3543 bytes --]
From 6e9a09dd74e0fcb38563b1042163e95e3e43c4da Mon Sep 17 00:00:00 2001
Message-Id: <6e9a09dd74e0fcb38563b1042163e95e3e43c4da.1681642978.git.yantar92@posteo.net>
From: Ihor Radchenko <yantar92@posteo.net>
Date: Sun, 16 Apr 2023 13:00:40 +0200
Subject: [PATCH] org-delete-indentation: Support region selection
* lisp/org.el (org-delete-indentation): Support active region when the
first line in region is a heading. Clarify in the docstring that
region is ignored with prefix argument.
Reported-by: Spencer Baugh <sbaugh@janestreet.com>
Link: https://orgmode.org/list/ier3552edfr.fsf@janestreet.com
---
lisp/org.el | 41 +++++++++++++++++++++++++----------------
1 file changed, 25 insertions(+), 16 deletions(-)
diff --git a/lisp/org.el b/lisp/org.el
index 26d2a8610..9422fd587 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -17675,41 +17675,50 @@ (defun org-kill-note-or-show-branches ()
(org-fold-show-branches)
(org-fold-hide-archived-subtrees beg end)))))
-(defun org-delete-indentation (&optional arg)
+(defun org-delete-indentation (&optional arg beg end)
"Join current line to previous and fix whitespace at join.
If previous line is a headline add to headline title. Otherwise
the function calls `delete-indentation'.
-I.e. with a non-nil optional argument, join the line with the
-following one. If there is a region then join the lines in that
-region."
- (interactive "*P")
+If there is a region (BEG END), then join the lines in that region.
+
+With a non-nil prefix ARG, join the line with the following one,
+ignoring region."
+ (interactive
+ (cons current-prefix-arg
+ (when (and (not current-prefix-arg) (use-region-p))
+ (list (region-beginning) (region-end)))))
+ (unless (and beg end)
+ ;; No region selected or BEG/END arguments not passed.
+ (setq beg (line-beginning-position (if arg 1 0))
+ end (line-end-position (if arg 2 1))))
(if (save-excursion
- (beginning-of-line (if arg 1 0))
- (let ((case-fold-search nil))
- (looking-at org-complex-heading-regexp)))
+ (goto-char beg)
+ (beginning-of-line)
+ (and (< (line-end-position) end)
+ (let ((case-fold-search nil))
+ (looking-at org-complex-heading-regexp))))
;; At headline.
(let ((tags-column (when (match-beginning 5)
(save-excursion (goto-char (match-beginning 5))
(current-column))))
- (string (concat " " (progn (when arg (forward-line 1))
- (org-trim (delete-and-extract-region
- (line-beginning-position)
- (line-end-position)))))))
- (unless (bobp) (delete-region (point) (1- (point))))
+ string)
+ (goto-char beg)
+ ;; Join all but headline.
+ (save-excursion (save-match-data (delete-indentation nil (line-beginning-position 2) end)))
+ (setq string (org-trim (delete-and-extract-region (line-end-position) (line-end-position 2))))
(goto-char (or (match-end 4)
(match-beginning 5)
(match-end 0)))
(skip-chars-backward " \t")
- (save-excursion (insert string))
+ (save-excursion (insert " " string))
;; Adjust alignment of tags.
(cond
((not tags-column)) ;no tags
(org-auto-align-tags (org-align-tags))
(t (org--align-tags-here tags-column)))) ;preserve tags column
- (let ((current-prefix-arg arg))
- (call-interactively #'delete-indentation))))
+ (funcall-interactively #'delete-indentation arg beg end)))
(defun org-open-line (n)
"Insert a new row in tables, call `open-line' elsewhere.
--
2.40.0
[-- Attachment #3: Type: text/plain, Size: 224 bytes --]
--
Ihor Radchenko // yantar92,
Org mode contributor,
Learn more about Org mode at <https://orgmode.org/>.
Support Org development at <https://liberapay.com/org-mode>,
or support my work at <https://liberapay.com/yantar92>
next prev parent reply other threads:[~2023-04-16 11:05 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-14 14:38 [BUG] org-delete-indentation on region doesn't work when END is before BEGIN [9.6.1 (release_9.6.1-40-g3d817c @ /home/sbaugh/.local/src/emacs29/lisp/org/)] Spencer Baugh
2023-04-15 14:41 ` Emacs and org mode in aws Naresh Gurbuxani
2023-04-16 11:04 ` Ihor Radchenko
2023-04-16 15:44 ` Naresh Gurbuxani
2023-04-16 15:59 ` Ihor Radchenko
2023-04-17 3:43 ` Christopher M. Miles
2023-04-16 11:07 ` Ihor Radchenko [this message]
2023-04-30 15:05 ` [BUG] org-delete-indentation on region doesn't work when END is before BEGIN [9.6.1 (release_9.6.1-40-g3d817c @ /home/sbaugh/.local/src/emacs29/lisp/org/)] Ihor Radchenko
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
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87v8hwt7a7.fsf@localhost \
--to=yantar92@posteo.net \
--cc=emacs-orgmode@gnu.org \
--cc=sbaugh@janestreet.com \
/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 public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).