tec/org-mode
tec
/
org-mode
forked from mirrors/org-mode
1
0
Fork 0
Code Pull Requests Releases Activity

Merge branch 'maint'

This commit is contained in:
Kyle Meyer 2020-05-09 15:54:44 -04:00
parent e73732f14a 6e50b22ff0
commit b0fb4599c7
2 changed files with 43 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lisp/org.el
View File

@ -11866,7 +11866,8 @@ in Lisp code use `org-set-tags' instead."
(org-set-tags tags)))))
;; `save-excursion' may not replace the point at the right
;; position.
(when (save-excursion (skip-chars-backward "*") (bolp))
(when (and (save-excursion (skip-chars-backward "*") (bolp))
(looking-at-p " "))
(forward-char))))
(defun org-align-tags (&optional all)

42
testing/lisp/test-org.el
View File

@ -6569,7 +6569,47 @@ Paragraph<point>"
(equal "* H1 :foo:\n* H2 :bar:"
(org-test-with-temp-text "* H1 :foo:\n* H2 :bar:"
(let ((org-tags-column 1)) (org-set-tags-command '(4)))
(buffer-string)))))
(buffer-string))))
;; Point does not move with empty headline.
(should
(equal ":foo:"
(org-test-with-temp-text "* <point>"
(cl-letf (((symbol-function 'completing-read)
(lambda (&rest args) ":foo:")))
(let ((org-use-fast-tag-selection nil)
(org-tags-column 1))
(org-set-tags-command)))
(buffer-substring (point) (line-end-position)))))
;; Point does not move at start of line.
(should
(equal "* H1 :foo:"
(org-test-with-temp-text "* H1"
(cl-letf (((symbol-function 'completing-read)
(lambda (&rest args) ":foo:")))
(let ((org-use-fast-tag-selection nil)
(org-tags-column 1))
(org-set-tags-command)))
(buffer-substring (point) (line-end-position)))))
;; Point does not move when within *'s.
(should
(equal "* H1 :foo:"
(org-test-with-temp-text "*<point>* H1"
(cl-letf (((symbol-function 'completing-read)
(lambda (&rest args) ":foo:")))
(let ((org-use-fast-tag-selection nil)
(org-tags-column 1))
(org-set-tags-command)))
(buffer-substring (point) (line-end-position)))))
;; Point workaround does not get fooled when looking at a space.
(should
(equal " b :foo:"
(org-test-with-temp-text "* a<point> b"
(cl-letf (((symbol-function 'completing-read)
(lambda (&rest args) ":foo:")))
(let ((org-use-fast-tag-selection nil)
(org-tags-column 1))
(org-set-tags-command)))
(buffer-substring (point) (line-end-position))))))
(ert-deftest test-org/toggle-tag ()
"Test `org-toggle-tag' specifications."