mirrors
/
org-mode
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git
0
0
Fork 1
Code Releases Activity

Merge branch 'maint'

This commit is contained in:
Bastien 2020-09-05 08:03:12 +02:00
parent 5beeb094a2 ee3c3b5547
commit 42bd67fdf0
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lisp/org.el
View File

@ -5921,7 +5921,7 @@ and subscripts."
"Remove outline overlays that do not contain non-white stuff."
(dolist (o (overlays-at pos))
(and (eq 'outline (overlay-get o 'invisible))
(not (string-match "\\S-" (buffer-substring (overlay-start o)
(not (string-match-p "\\S-" (buffer-substring (overlay-start o)
(overlay-end o))))
(delete-overlay o))))
@ -6376,7 +6376,7 @@ Use `\\[org-edit-special]' to edit table.el tables"))
(defun org-cycle-internal-global ()
"Do the global cycling action."
;; Hack to avoid display of messages for .org attachments in Gnus
(let ((ga (string-match "\\*fontification" (buffer-name))))
(let ((ga (string-match-p "\\*fontification" (buffer-name))))
(cond
((and (eq last-command this-command)
(eq org-cycle-global-status 'overview))
@ -6457,8 +6457,7 @@ Use `\\[org-edit-special]' to edit table.el tables"))
(goto-char eos)
(outline-next-heading)
(when (org-invisible-p) (org-flag-heading nil))))
((and (or (>= eol eos)
(not (string-match "\\S-" (buffer-substring eol eos))))
((and (>= eol eos)
(or has-children
(not (setq children-skipped
org-cycle-skip-children-state-if-no-children))))