Use font-lock-face property; derive from special-mode

* lisp/textmodes/reftex-sel.el (reftex-select-label-mode)
(reftex-select-bib-mode, reftex-insert-docstruct): Derive modes
from special-mode (instead of fundamental-mode) and propertize
with font-lock-face instead of just face.

* lisp/textmodes/reftex-toc.el (reftex-toc-mode, reftex-toc): Ditto.

Fixes: debbugs:18496

3 files changed, 19 insertions, 10 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5725aa924d7..ec995c1b406 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,12 @@
+2014-09-21  Tassilo Horn  <tsdh@gnu.org>
+
+        * textmodes/reftex-sel.el (reftex-select-label-mode)
+        (reftex-select-bib-mode, reftex-insert-docstruct): Derive modes
+        from special-mode (instead of fundamental-mode) and propertize
+        with font-lock-face instead of just face. (Bug#18496)
+
+        * textmodes/reftex-toc.el (reftex-toc-mode, reftex-toc): Ditto.
+
 2014-09-19  Dmitry Gutov  <dgutov@yandex.ru>
 
         * emacs-lisp/lisp.el (lisp-completion-at-point): Only calculate
diff --git a/lisp/textmodes/reftex-sel.el b/lisp/textmodes/reftex-sel.el
index a993a883b0f..e1fc8bf908e 100644
--- a/lisp/textmodes/reftex-sel.el
+++ b/lisp/textmodes/reftex-sel.el
@@ -103,7 +103,7 @@ This keymap can be used to configure the label selection process which is
 started with the command \\[reftex-reference].")
 
 ;;;###autoload
-(define-derived-mode reftex-select-label-mode fundamental-mode "LSelect"
+(define-derived-mode reftex-select-label-mode special-mode "LSelect"
   "Major mode for selecting a label in a LaTeX document.
 This buffer was created with RefTeX.
 It only has a meaningful keymap when you are in the middle of a
@@ -149,7 +149,7 @@ This keymap can be used to configure the BibTeX selection process which is
 started with the command \\[reftex-citation].")
 
 ;;;###autoload
-(define-derived-mode reftex-select-bib-mode fundamental-mode "BSelect"
+(define-derived-mode reftex-select-bib-mode special-mode "BSelect"
   "Major mode for selecting a citation key in a LaTeX document.
 This buffer was created with RefTeX.
 It only has a meaningful keymap when you are in the middle of a
@@ -296,7 +296,7 @@ During a selection process, these are the local bindings.
           (setq to (point))
           (when font
             (put-text-property from to
-                               'face reftex-file-boundary-face))
+                               'font-lock-face reftex-file-boundary-face))
           (when toc-buffer
             (if mouse-face
                 (put-text-property from (1- to)
@@ -314,7 +314,7 @@ During a selection process, these are the local bindings.
           (setq to (point))
           (when font
             (put-text-property from to
-                               'face reftex-section-heading-face))
+                               'font-lock-face reftex-section-heading-face))
           (when toc-buffer
             (if mouse-face
                 (put-text-property from (1- to)
@@ -353,7 +353,7 @@ During a selection process, these are the local bindings.
             (setq to (point))
             (put-text-property
              (- (point) (length label)) to
-             'face (if comment
+             'font-lock-face (if comment
                        'font-lock-comment-face
                      label-face))
             (goto-char to))
@@ -383,14 +383,14 @@ During a selection process, these are the local bindings.
           (setq index-tag (format "<%s>" (nth 1 cell)))
           (and font
                (put-text-property 0 (length index-tag)
-                                  'face reftex-index-tag-face index-tag))
+                                  'font-lock-face reftex-index-tag-face index-tag))
           (insert label-indent index-tag " " (nth 7 cell))
 
           (when font
             (setq to (point))
             (put-text-property
              (- (point) (length (nth 7 cell))) to
-             'face index-face)
+             'font-lock-face index-face)
             (goto-char to))
           (insert "\n")
           (setq to (point))
@@ -690,7 +690,7 @@ Cycle in reverse order if optional argument REVERSE is non-nil."
           eoe (or (next-single-property-change (point) :data) (point-max)))
     (setq ovl (reftex-make-overlay boe eoe))
     (push (list data ovl separator) reftex-select-marked)
-    (reftex-overlay-put ovl 'face reftex-select-mark-face)
+    (reftex-overlay-put ovl 'font-lock-face reftex-select-mark-face)
     (reftex-overlay-put ovl 'before-string
                         (if separator
                             (format "*%c%d* " separator
diff --git a/lisp/textmodes/reftex-toc.el b/lisp/textmodes/reftex-toc.el
index e164770fa0c..fab558ff2fb 100644
--- a/lisp/textmodes/reftex-toc.el
+++ b/lisp/textmodes/reftex-toc.el
@@ -129,7 +129,7 @@
 (defvar reftex-toc-include-index-indicator nil)
 (defvar reftex-toc-max-level-indicator nil)
 
-(define-derived-mode reftex-toc-mode fundamental-mode "TOC"
+(define-derived-mode reftex-toc-mode special-mode "TOC"
   "Major mode for managing Table of Contents for LaTeX files.
 This buffer was created with RefTeX.
 Press `?' for a summary of important key bindings.
@@ -279,7 +279,7 @@ SPC=view TAB=goto RET=goto+hide [q]uit [r]escan [l]abels [f]ollow [x]r [?]Help
 " (abbreviate-file-name reftex-last-toc-master)))
 
       (if (reftex-use-fonts)
-          (put-text-property (point-min) (point) 'face reftex-toc-header-face))
+          (put-text-property (point-min) (point) 'font-lock-face reftex-toc-header-face))
       (put-text-property (point-min) (point) 'intangible t)
       (put-text-property (point-min) (1+ (point-min)) 'xr-alist xr-alist)