# HG changeset patch
# User Stefan Monnier <monnier@iro.umontreal.ca>
# Date 1186719381 0
# Node ID 13d9a34c970a49915e5bd4dc8600c879fc6eae48
# Parent  c0011ad9af50f2eb61b77e7efb6e101417fd5867
(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.

diff -r c0011ad9af50 -r 13d9a34c970a lisp/ChangeLog
--- a/lisp/ChangeLog	Thu Aug 09 09:38:59 2007 +0000
+++ b/lisp/ChangeLog	Fri Aug 10 04:16:21 2007 +0000
@@ -1,7 +1,14 @@
+2007-08-10  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+	* textmodes/tex-mode.el (tex-font-lock-unfontify-region): Fix to
+	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.
+
 2007-08-09  Edward O'Connor  <hober0@gmail.com> (tiny change)
 
-        * url/url-auth.el (url-basic-auth): When prompting for username
-          and password, default to the username and password in the URL.
+	* url/url-auth.el (url-basic-auth): When prompting for username
+	and password, default to the username and password in the URL.
 
 2007-08-08  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 
@@ -285,16 +292,15 @@
 	(fortran-mode): Use fortran-line-length, and
 	fortran-font-lock-syntactic-keywords as a function.  Add a
 	hack-local-variables-hook function.
-	(fortran-line-length, fortran-hack-local-variables): New
-	functions.
-	(fortran-window-create, fortran-strip-sequence-nos): Doc fix.  Use
-	fortran-line-length rather than 72.
+	(fortran-line-length, fortran-hack-local-variables): New functions.
+	(fortran-window-create, fortran-strip-sequence-nos): Doc fix.
+	Use fortran-line-length rather than 72.
 	(fortran-window-create-momentarily): Doc fix.
 
 2007-07-31  Drew Adams  <drew.adams@oracle.com>  (tiny change)
 
-	* cus-edit.el (custom-group-value-create, custom-goto-parent): Fix
-	parent groups link.
+	* cus-edit.el (custom-group-value-create, custom-goto-parent):
+	Fix parent groups link.
 
 2007-07-31  Paul Pogonyshev  <pogonyshev@gmx.net>
 
diff -r c0011ad9af50 -r 13d9a34c970a lisp/textmodes/tex-mode.el
--- 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))))