Mercurial > hg > xemacs-beta

diff lisp/packages/font-lock.el @ 114:8619ce7e4c50 r20-1b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r20-1b9
author cvs
date Mon, 13 Aug 2007 09:21:54 +0200
parents 360340f9fd5f
children 9b50b4588a93
line wrap: on
line diff
--- a/lisp/packages/font-lock.el	Mon Aug 13 09:20:50 2007 +0200
+++ b/lisp/packages/font-lock.el	Mon Aug 13 09:21:54 2007 +0200
@@ -770,8 +770,10 @@
     (setq font-lock-old-extent nil)))
 
 (defun font-lock-pre-idle-hook ()
-  (if font-lock-old-extent
-      (font-lock-fontify-glumped-region)))
+  (condition-case nil
+      (if font-lock-old-extent
+	  (font-lock-fontify-glumped-region))
+    (error (warn "Error caught in `font-lock-pre-idle-hook'"))))
 
 (defvar font-lock-always-fontify-immediately nil
   "Set this to non-nil to disable font-lock deferral.")
@@ -2269,9 +2271,11 @@
 	       '(2 font-lock-reference-face)
 	       (list (concat
 		      "\\=\\.\\(" java-font-lock-identifier-regexp "\\)")
-		     nil nil '(1 (if (= (char-after (match-end 0)) ?.)
-				     'font-lock-reference-face
-				   'font-lock-type-face))))
+		     nil nil '(1 (let ((c (char-after (match-end 0))))
+				   (if (and (characterp c)
+					    (= c ?.))
+				       'font-lock-reference-face
+				     'font-lock-type-face)))))
 
 	 ;; Constructors:
 	 (list (concat