diff options
author | Bastien Guerry <bzg@altern.org> | 2013-01-02 23:54:12 +0100 |
---|---|---|
committer | Bastien Guerry <bzg@altern.org> | 2013-01-02 23:54:12 +0100 |
commit | ab17f9959eaa22d23f066a36cb26eb2d8ba54bd4 (patch) | |
tree | a262c1dfebd81c441d915d72378b7b8c0ac6a361 | |
parent | 56b47cd0fe2c2cba246e475b44e5d0fb6fb8ea26 (diff) | |
parent | fd0380b52fdde98820c0ac8e21a39d8ed61ae671 (diff) | |
download | org-mode-ab17f9959eaa22d23f066a36cb26eb2d8ba54bd4.tar.gz |
Merge branch 'maint'
-rw-r--r-- | lisp/org.el | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lisp/org.el b/lisp/org.el index 8b09118..b0fcb58 100644 --- a/lisp/org.el +++ b/lisp/org.el @@ -5566,9 +5566,9 @@ by a #." '(font-lock-fontified t invisible t) '(font-lock-fontified t face org-document-info-keyword))) (add-text-properties - (match-beginning 6) (match-end 6) + (match-beginning 6) (1+ (match-end 6)) (if (string-equal dc1 "+title:") - '(font-lock-fontified t face org-document-title) + '(font-lock-fontified t face org-document-title) '(font-lock-fontified t face org-document-info)))) ((or (equal dc1 "+results") (member dc1 '("+begin:" "+end:" "+caption:" "+label:" @@ -9034,13 +9034,13 @@ part of Org's core." "::" (match-string 1)) link cpltxt)) ((and (featurep 'org-id) - (or (eq org-link-to-org-use-id t) + (or (eq org-id-link-to-org-use-id t) (and (org-called-interactively-p 'any) - (or (eq org-link-to-org-use-id 'create-if-interactive) - (and (eq org-link-to-org-use-id + (or (eq org-id-link-to-org-use-id 'create-if-interactive) + (and (eq org-id-link-to-org-use-id 'create-if-interactive-and-no-custom-id) (not custom-id)))) - (and org-link-to-org-use-id (org-entry-get nil "ID")))) + (and org-id-link-to-org-use-id (org-entry-get nil "ID")))) ;; We can make a link using the ID. (setq link (condition-case nil (prog1 (org-id-store-link) |