diff options
| author | Bastien Guerry <bzg@altern.org> | 2013-02-25 11:21:25 +0100 |
|---|---|---|
| committer | Bastien Guerry <bzg@altern.org> | 2013-02-25 11:21:25 +0100 |
| commit | 988240d5fd7a27678824690cf741ccbaf1da923a (patch) | |
| tree | 3404bc9998e21ecfba5dd1768e81868c7309ffd7 | |
| parent | 662cb9868474b01da31413fd034111373e662edb (diff) | |
| parent | 87c553d268817b5bc917b5c15d2b9cc07d6fbb07 (diff) | |
| download | org-mode-988240d5fd7a27678824690cf741ccbaf1da923a.tar.gz | |
Merge branch 'master' of orgmode.org:org-mode
| -rw-r--r-- | lisp/org.el | 5 | ||||
| -rw-r--r-- | lisp/ox-latex.el | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/lisp/org.el b/lisp/org.el index 4cc1035..2f10f52 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -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." diff --git a/lisp/ox-latex.el b/lisp/ox-latex.el index 0ac251f..3b0924c 100644 --- a/lisp/ox-latex.el +++ b/lisp/ox-latex.el @@ -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 |