diff lisp/textmodes/tex-mode.el @ 82341:13d9a34c970a

(tex-font-lock-unfontify-region): Take tex-font-script-display into account. (tex-font-script-display, tex-font-lock-suscript): Change from a cons cell to a list of 2 elements to simplify the unfontify code.
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 10 Aug 2007 04:16:21 +0000
parents b98604865ea0
children fc8dde12dd1e 424b655804ca
line wrap: on
line diff
--- a/lisp/textmodes/tex-mode.el	Thu Aug 09 09:38:59 2007 +0000
+++ b/lisp/textmodes/tex-mode.el	Fri Aug 10 04:16:21 2007 +0000
@@ -249,14 +249,12 @@
   :group 'tex)
 (put 'tex-fontify-script 'safe-local-variable 'booleanp)
 
-(defcustom tex-font-script-display '(-0.2 . 0.2)
+(defcustom tex-font-script-display '(-0.2 0.2)
   "Display specification for subscript and superscript content.
-The car is used for subscript, the cdr is used for superscripts."
+The first is used for subscript, the second is used for superscripts."
   :group 'tex
-  :type '(cons (choice (float :tag "Subscript")
-		       (const :tag "No lowering" nil))
-	       (choice (float :tag "Superscript")
-		       (const :tag "No raising" nil))))
+  :type '(list (float :tag "Subscript")
+               (float :tag "Superscript")))
 
 (defvar tex-last-temp-file nil
   "Latest temporary file generated by \\[tex-region] and \\[tex-buffer].
@@ -609,7 +607,7 @@
 		odd))
     (if (eq (char-after pos) ?_)
 	`(face subscript display (raise ,(car tex-font-script-display)))
-      `(face superscript display (raise ,(cdr tex-font-script-display))))))
+      `(face superscript display (raise ,(cadr tex-font-script-display))))))
 
 (defun tex-font-lock-match-suscript (limit)
   "Match subscript and superscript patterns up to LIMIT."
@@ -669,7 +667,7 @@
     (let ((next (next-single-property-change beg 'display nil end))
 	  (prop (get-text-property beg 'display)))
       (if (and (eq (car-safe prop) 'raise)
-	       (member (car-safe (cdr prop)) '(-0.3 +0.3))
+	       (member (car-safe (cdr prop)) tex-font-script-display)
 	       (null (cddr prop)))
 	  (put-text-property beg next 'display nil))
       (setq beg next))))