ndwarshuis
/
org-mode
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint' into master

This commit is contained in:
Kyle Meyer 2020-10-03 02:28:11 -04:00
parent 920da33f11 8d3610df08
commit 262bebb764
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lisp/org-capture.el
View File

@ -1150,10 +1150,11 @@ may have been stored before."
(insert-here? (insert-here?
;; FIXME: level should probably set directly within (let ...). ;; FIXME: level should probably set directly within (let ...).
(setq level (org-get-valid-level (setq level (org-get-valid-level
(if (or (org-at-heading-p) (if (or (org-at-heading-p)
(ignore-errors (org-back-to-heading t))) (ignore-errors
(org-outline-level) (save-excursion (org-back-to-heading t))))
1)))) (org-outline-level)
1))))
;; Insert as a child of the current entry. ;; Insert as a child of the current entry.
((org-capture-get :target-entry-p) ((org-capture-get :target-entry-p)
(setq level (org-get-valid-level (setq level (org-get-valid-level

2
lisp/org.el
View File

@ -16577,7 +16577,7 @@ overwritten, and the table is not marked as requiring realignment."
(1+ org-self-insert-command-undo-counter)))))))) (1+ org-self-insert-command-undo-counter))))))))
(defun org-check-before-invisible-edit (kind) (defun org-check-before-invisible-edit (kind)
"Check is editing if kind KIND would be dangerous with invisible text around. "Check if editing kind KIND would be dangerous with invisible text around.
The detailed reaction depends on the user option `org-catch-invisible-edits'." The detailed reaction depends on the user option `org-catch-invisible-edits'."
;; First, try to get out of here as quickly as possible, to reduce overhead ;; First, try to get out of here as quickly as possible, to reduce overhead
(when (and org-catch-invisible-edits (when (and org-catch-invisible-edits