awesome-emacs/nursery
1
0
Fork 0
mirror of https://github.com/chrisbarrett/nursery synced 2025-09-26 16:40:56 -05:00
Code Issues Packages Projects Releases Wiki Activity

Adapt delete-blank-lines to fix corner cases in blank line handling

Browse Source
This commit is contained in:
Chris Barrett
2022-10-05 22:46:04 +13:00
parent c60e41ea19
commit 0a51c63076
1 changed files with 15 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
lisp/org-format.el
View File

@@ -73,6 +73,19 @@ Only applies to level-1 headings in the document."
(let ((tags (org-get-tags))) (let ((tags (org-get-tags)))
(seq-contains-p tags org-archive-tag)))) (seq-contains-p tags org-archive-tag))))
(defun org-format--delete-blank-lines ()
"Modified version of `delete-blank-lines'."
(beginning-of-line)
(when (looking-at "[ \t]*$")
(delete-region (point)
(if (re-search-backward "[^ \t\n]" nil t)
(progn (forward-line 1) (point))
(point-min))))
;; Handle the special case where point is followed by newline and eob.
;; Delete the line, leaving point at eob.
(when (looking-at "^[ \t]*\n\\'")
(delete-region (point) (point-max))))
(defun org-format-all-headings () (defun org-format-all-headings ()
"Ensure that blank lines exist between headings and their contents." "Ensure that blank lines exist between headings and their contents."
(interactive) (interactive)
@@ -100,7 +113,7 @@ Only applies to level-1 headings in the document."
(unless (and (fboundp 'org-transclusion-within-transclusion-p) (unless (and (fboundp 'org-transclusion-within-transclusion-p)
(org-transclusion-within-transclusion-p)) (org-transclusion-within-transclusion-p))
(forward-line 1) (forward-line 1)
(delete-blank-lines) (org-format--delete-blank-lines)
(org-format--ensure-empty-lines org-format-blank-lines-before-meta) (org-format--ensure-empty-lines org-format-blank-lines-before-meta)
(org-end-of-meta-data t) (org-end-of-meta-data t)
(org-format--ensure-empty-lines org-format-blank-lines-before-content))) (org-format--ensure-empty-lines org-format-blank-lines-before-content)))
@@ -110,7 +123,7 @@ Only applies to level-1 headings in the document."
(org-with-wide-buffer (org-with-wide-buffer
;; Clean up trailing whitespace. ;; Clean up trailing whitespace.
(goto-char (point-max)) (goto-char (point-max))
(delete-blank-lines) (org-format--delete-blank-lines)
;; Format transcluded headings as if they were really there. ;; Format transcluded headings as if they were really there.
(goto-char (point-min)) (goto-char (point-min))