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

Merge branch 'master' of orgmode.org:org-mode

This commit is contained in:
Bastien Guerry 2013-02-25 11:21:25 +01:00
parent 662cb98684 87c553d268
commit 988240d5fd
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/org.el
View File

@ -20738,7 +20738,10 @@ With prefix arg UNCOMPILED, load the uncompiled versions."
(defun org-in-verbatim-emphasis ()
(save-match-data
(and (org-in-regexp org-emph-re 2) (member (match-string 3) '("=" "~")))))
(and (org-in-regexp org-emph-re 2)
(>= (point) (match-beginning 3))
(<= (point) (match-end 4))
(member (match-string 3) '("=" "~")))))
(defun org-goto-marker-or-bmk (marker &optional bookmark)
"Go to MARKER, widen if necessary. When marker is not live, try BOOKMARK."

2
lisp/ox-latex.el
View File

@ -1482,7 +1482,7 @@ holding contextual information."
(org-export-data
(org-export-get-optional-title headline info) info)
(and (eq (plist-get info :with-tags) t) tags))))
(if (and opt-title (string-match "\\`\\\\\\(.*?\\){" section-fmt))
(if (and opt-title (string-match "\\`\\\\\\(.*?[^*]\\){" section-fmt))
(format (replace-match "\\1[%s]" nil nil section-fmt 1)
;; Replace square brackets with parenthesis
;; since square brackets are not supported in