[Emacs-diffs] Changes to emacs/lisp/textmodes/tex-mode.el,v

[Stefan Monnier]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Stefan Monnier <monnier>        07/08/10 04:16:25

Index: textmodes/tex-mode.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/textmodes/tex-mode.el,v
retrieving revision 1.190
retrieving revision 1.191
diff -u -b -r1.190 -r1.191
--- textmodes/tex-mode.el       26 Jul 2007 05:27:35 -0000      1.190
+++ textmodes/tex-mode.el       10 Aug 2007 04:16:20 -0000      1.191
@@ -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))))