Merge branch 'maint'

This commit is contained in:
Bastien Guerry 2012-12-24 00:08:20 +01:00
commit 4adf17f811
1 changed files with 1 additions and 1 deletions

View File

@ -5411,7 +5411,7 @@ will be prompted for."
(and move (backward-char 1))))
(defconst org-nonsticky-props
'(mouse-face highlight keymap invisible intangible help-echo org-linked-text))
'(mouse-face highlight keymap invisible intangible help-echo org-linked-text htmlize-link))
(defsubst org-rear-nonsticky-at (pos)
(add-text-properties (1- pos) pos (list 'rear-nonsticky org-nonsticky-props)))