mirrors/org-mode
0
0
Fork 1
mirror of https://git.savannah.gnu.org/git/emacs/org-mode.git synced 2024-09-29 22:07:49 +00:00
Code Releases Activity

Merge branch 'maint'

Browse source
This commit is contained in:
Nicolas Goaziou 2017-10-22 14:40:45 +02:00
parent bed03c4b42 a2a034f5b9
commit 95b76608a6
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
lisp/org.el
View file

@ -5754,18 +5754,23 @@ This should be called after the variable `org-link-parameters' has changed."
(verbatim? (member marker '("~" "=")))) (verbatim? (member marker '("~" "="))))
(when (save-excursion (when (save-excursion
(goto-char (match-beginning 0)) (goto-char (match-beginning 0))
;; Do not match headline stars. Do not consider
;; stars of a headline as closing marker for bold
;; markup either. Do not match table hlines.
(and (and
(not (looking-at-p org-outline-regexp-bol)) ;; Do not match headline stars. Do not consider
;; stars of a headline as closing marker for bold
;; markup either.
(not (and (equal marker "*")
(save-excursion
(forward-char)
(skip-chars-backward "*")
(looking-at-p org-outline-regexp-bol))))
;; Do not match table hlines.
(not (and (equal marker "+") (not (and (equal marker "+")
(org-match-line (org-match-line
"^[ \t]*\\(|[-+]+|?\\|\\+[-+]+\\+\\)[ \t]*$"))) "^[ \t]*\\(|[-+]+|?\\|\\+[-+]+\\+\\)[ \t]*$")))
(looking-at (if verbatim? org-verbatim-re org-emph-re)) (looking-at (if verbatim? org-verbatim-re org-emph-re))
(not (string-match-p ;; At a table row, do not cross cell boundaries.
(concat org-outline-regexp-bol "\\'") (not (and (save-match-data (org-match-line "[ \t]*|"))
(match-string 0))))) (string-match-p "|" (match-string 4))))))
(pcase-let ((`(,_ ,face ,_) (assoc marker org-emphasis-alist))) (pcase-let ((`(,_ ,face ,_) (assoc marker org-emphasis-alist)))
(font-lock-prepend-text-property (font-lock-prepend-text-property
(match-beginning 2) (match-end 2) 'face face) (match-beginning 2) (match-end 2) 'face face)