Merge branch 'maint'
This commit is contained in:
commit
ea94a0da43
|
@ -433,7 +433,7 @@ attachment-folder.
|
|||
|
||||
Change of attachment-folder due to unset might be if an ID
|
||||
property is set on the node, or if a separate inherited
|
||||
DIR-property exists (that is different than the unset one)."
|
||||
DIR-property exists (that is different from the unset one)."
|
||||
(interactive)
|
||||
(let ((old (org-attach-dir))
|
||||
(new
|
||||
|
|
10
lisp/org.el
10
lisp/org.el
|
@ -4960,9 +4960,10 @@ stacked delimiters is N. Escaping delimiters is not possible."
|
|||
;; Do not span over cells in table rows.
|
||||
(not (and (save-match-data (org-match-line "[ \t]*|"))
|
||||
(string-match-p "|" (match-string 4))))))
|
||||
(pcase-let ((`(,_ ,face ,_) (assoc marker org-emphasis-alist)))
|
||||
(pcase-let ((`(,_ ,face ,_) (assoc marker org-emphasis-alist))
|
||||
(m (if org-hide-emphasis-markers 4 2)))
|
||||
(font-lock-prepend-text-property
|
||||
(match-beginning 2) (match-end 2) 'face face)
|
||||
(match-beginning m) (match-end m) 'face face)
|
||||
(when verbatim?
|
||||
(org-remove-flyspell-overlays-in
|
||||
(match-beginning 0) (match-end 0))
|
||||
|
@ -18080,13 +18081,14 @@ With prefix arg UNCOMPILED, load the uncompiled versions."
|
|||
(and (string= org-dir contrib-dir)
|
||||
(org-load-noerror-mustsuffix (concat contrib-dir f)))
|
||||
(and (org-load-noerror-mustsuffix (concat (org-find-library-dir f) f))
|
||||
(add-to-list 'load-uncore f 'append)
|
||||
(push f load-uncore)
|
||||
't)
|
||||
f))
|
||||
lfeat)))
|
||||
(when load-uncore
|
||||
(message "The following feature%s found in load-path, please check if that's correct:\n%s"
|
||||
(if (> (length load-uncore) 1) "s were" " was") load-uncore))
|
||||
(if (> (length load-uncore) 1) "s were" " was")
|
||||
(reverse load-uncore)))
|
||||
(if load-misses
|
||||
(message "Some error occurred while reloading Org feature%s\n%s\nPlease check *Messages*!\n%s"
|
||||
(if (> (length load-misses) 1) "s" "") load-misses (org-version nil 'full))
|
||||
|
|
Loading…
Reference in New Issue