emacs: lisp/font-lock.el comparison

comparison lisp/font-lock.el @ 89909:68c22ea6027c

Sync to HEAD

author	Kenichi Handa <handa@m17n.org>
date	Fri, 16 Apr 2004 12:51:06 +0000
parents	2f877ed80fa6
children	4c90ffeb71c5

comparison

equal deleted inserted replaced

-:ee1402f7b568
+:68c22ea6027c
 ;;; font-lock.el --- Electric font lock mode
-;; Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 1999, 2000, 2001, 02, 2003
+;; Copyright (C) 1992, 93, 94, 95, 96, 97, 98, 1999, 2000, 2001, 02, 2003, 2004
 ;;  Free Software Foundation, Inc.
 ;; Author: jwz, then rms, then sm
 ;; Maintainer: FSF
 ;; Keywords: languages, faces
 ;;; Code:
 (require 'syntax)
 ;; Define core `font-lock' group.
-(defgroup font-lock nil
+(defgroup font-lock '((jit-lock custom-group))
 "Font Lock mode text highlighting package."
 :link '(custom-manual "(emacs)Font Lock")
 :link '(custom-manual "(elisp)Font Lock Mode")
 :group 'faces)
 :group 'font-lock)
 ;; Define support mode groups here to impose `font-lock' group order.
 (defgroup fast-lock nil
 "Font Lock support mode to cache fontification."
-:link '(custom-manual "(emacs)Support Modes")
 :load 'fast-lock
 :group 'font-lock)
 (defgroup lazy-lock nil
 "Font Lock support mode to fontify lazily."
-:link '(custom-manual "(emacs)Support Modes")
 :load 'lazy-lock
-:group 'font-lock)
-(defgroup jit-lock nil
-"Font Lock support mode to fontify just-in-time."
-:link '(custom-manual "(emacs)Support Modes")
-:version "21.1"
-:load 'jit-lock
 :group 'font-lock)
 ;; User variables.
 (defcustom font-lock-maximum-size 256000
 		  '(syntax-table face font-lock-multiline)
 		'(face font-lock-multiline))))))
 ;; Called when any modification is made to buffer text.
 (defun font-lock-after-change-function (beg end old-len)
-(let ((inhibit-point-motion-hooks t))
+(let ((inhibit-point-motion-hooks t)
+	(inhibit-quit t))
 (save-excursion
 (save-match-data
 	;; Rescan between start of lines enclosing the region.
 	(font-lock-fontify-region
 	 (progn (goto-char beg) (beginning-of-line) (point))
 	    (custom-declare-face face (list (list t face-spec)) nil)))))))
 ;; But now we do it the custom way.  Note that `defface' will not overwrite any
 ;; faces declared above via `custom-declare-face'.
 (defface font-lock-comment-face
-'((((type tty pc) (class color) (background light)) (:foreground "red"))
+'((((class grayscale) (background light))
-(((type tty pc) (class color) (background dark)) (:foreground "red1"))
-(((class grayscale) (background light))
 (:foreground "DimGray" :weight bold :slant italic))
 (((class grayscale) (background dark))
 (:foreground "LightGray" :weight bold :slant italic))
-(((class color) (background light)) (:foreground "Firebrick"))
+(((class color) (min-colors 88) (background light))
-(((class color) (background dark)) (:foreground "chocolate1"))
+(:foreground "Firebrick"))
+(((class color) (min-colors 88) (background dark))
+(:foreground "chocolate1"))
+(((class color) (min-colors 16) (background light))
+(:foreground "red"))
+(((class color) (min-colors 16) (background dark))
+(:foreground "red1"))
+(((class color) (min-colors 8) (background light))
+(:foreground "red"))
+(((class color) (min-colors 8) (background dark))
+(:foreground "red1"))
 (t (:weight bold :slant italic)))
 "Font Lock mode face used to highlight comments."
 :group 'font-lock-highlighting-faces)
 (defface font-lock-string-face
-'((((type tty) (class color)) (:foreground "green"))
+'((((class grayscale) (background light)) (:foreground "DimGray" :slant italic))
-(((class grayscale) (background light)) (:foreground "DimGray" :slant italic))
 (((class grayscale) (background dark)) (:foreground "LightGray" :slant italic))
-(((class color) (background light)) (:foreground "RosyBrown"))
+(((class color) (min-colors 88) (background light)) (:foreground "RosyBrown"))
-(((class color) (background dark)) (:foreground "LightSalmon"))
+(((class color) (min-colors 88) (background dark)) (:foreground "LightSalmon"))
+(((class color) (min-colors 16) (background light)) (:foreground "RosyBrown"))
+(((class color) (min-colors 16) (background dark)) (:foreground "LightSalmon"))
+(((class color) (min-colors 8)) (:foreground "green"))
 (t (:slant italic)))
 "Font Lock mode face used to highlight strings."
 :group 'font-lock-highlighting-faces)
 (defface font-lock-doc-face
 '((t :inherit font-lock-string-face))
 "Font Lock mode face used to highlight documentation."
 :group 'font-lock-highlighting-faces)
 (defface font-lock-keyword-face
-'((((type tty) (class color)) (:foreground "cyan" :weight bold))
+'((((class grayscale) (background light)) (:foreground "LightGray" :weight bold))
-(((class grayscale) (background light)) (:foreground "LightGray" :weight bold))
 (((class grayscale) (background dark)) (:foreground "DimGray" :weight bold))
-(((class color) (background light)) (:foreground "Purple"))
+(((class color) (min-colors 88) (background light)) (:foreground "Purple"))
-(((class color) (background dark)) (:foreground "Cyan"))
+(((class color) (min-colors 88) (background dark)) (:foreground "Cyan"))
+(((class color) (min-colors 16) (background light)) (:foreground "Purple"))
+(((class color) (min-colors 16) (background dark)) (:foreground "Cyan"))
+(((class color) (min-colors 8)) (:foreground "cyan" :weight bold))
 (t (:weight bold)))
 "Font Lock mode face used to highlight keywords."
 :group 'font-lock-highlighting-faces)
 (defface font-lock-builtin-face
-'((((type tty) (class color)) (:foreground "blue" :weight light))
+'((((class grayscale) (background light)) (:foreground "LightGray" :weight bold))
-(((class grayscale) (background light)) (:foreground "LightGray" :weight bold))
 (((class grayscale) (background dark)) (:foreground "DimGray" :weight bold))
-(((class color) (background light)) (:foreground "Orchid"))
+(((class color) (min-colors 88) (background light)) (:foreground "Orchid"))
-(((class color) (background dark)) (:foreground "LightSteelBlue"))
+(((class color) (min-colors 88) (background dark)) (:foreground "LightSteelBlue"))
+(((class color) (min-colors 16) (background light)) (:foreground "Orchid"))
+(((class color) (min-colors 16) (background dark)) (:foreground "LightSteelBlue"))
+(((class color) (min-colors 8)) (:foreground "blue" :weight bold))
 (t (:weight bold)))
 "Font Lock mode face used to highlight builtins."
 :group 'font-lock-highlighting-faces)
 (defface font-lock-function-name-face
-'((((type tty) (class color)) (:foreground "blue" :weight bold))
+'((((class color) (min-colors 88) (background light)) (:foreground "Blue"))
-(((class color) (background light)) (:foreground "Blue"))
+(((class color) (min-colors 88) (background dark)) (:foreground "LightSkyBlue"))
-(((class color) (background dark)) (:foreground "LightSkyBlue"))
+(((class color) (min-colors 16) (background light)) (:foreground "Blue"))
+(((class color) (min-colors 16) (background dark)) (:foreground "LightSkyBlue"))
+(((class color) (min-colors 8)) (:foreground "blue" :weight bold))
 (t (:inverse-video t :weight bold)))
 "Font Lock mode face used to highlight function names."
 :group 'font-lock-highlighting-faces)
 (defface font-lock-variable-name-face
-'((((type tty) (class color)) (:foreground "yellow" :weight light))
+'((((class grayscale) (background light))
-(((class grayscale) (background light))
 (:foreground "Gray90" :weight bold :slant italic))
 (((class grayscale) (background dark))
 (:foreground "DimGray" :weight bold :slant italic))
-(((class color) (background light)) (:foreground "DarkGoldenrod"))
+(((class color) (min-colors 88) (background light)) (:foreground "DarkGoldenrod"))
-(((class color) (background dark)) (:foreground "LightGoldenrod"))
+(((class color) (min-colors 88) (background dark)) (:foreground "LightGoldenrod"))
+(((class color) (min-colors 16) (background light)) (:foreground "DarkGoldenrod"))
+(((class color) (min-colors 16) (background dark)) (:foreground "LightGoldenrod"))
+(((class color) (min-colors 8)) (:foreground "yellow" :weight light))
 (t (:weight bold :slant italic)))
 "Font Lock mode face used to highlight variable names."
 :group 'font-lock-highlighting-faces)
 (defface font-lock-type-face
-'((((type tty) (class color)) (:foreground "green"))
+'((((class grayscale) (background light)) (:foreground "Gray90" :weight bold))
-(((class grayscale) (background light)) (:foreground "Gray90" :weight bold))
 (((class grayscale) (background dark)) (:foreground "DimGray" :weight bold))
-(((class color) (background light)) (:foreground "ForestGreen"))
+(((class color) (min-colors 88) (background light)) (:foreground "ForestGreen"))
-(((class color) (background dark)) (:foreground "PaleGreen"))
+(((class color) (min-colors 88) (background dark)) (:foreground "PaleGreen"))
+(((class color) (min-colors 16) (background light)) (:foreground "ForestGreen"))
+(((class color) (min-colors 16) (background dark)) (:foreground "PaleGreen"))
+(((class color) (min-colors 8)) (:foreground "green"))
 (t (:weight bold :underline t)))
 "Font Lock mode face used to highlight type and classes."
 :group 'font-lock-highlighting-faces)
 (defface font-lock-constant-face
-'((((type tty) (class color)) (:foreground "magenta"))
+'((((class grayscale) (background light))
-(((class grayscale) (background light))
 (:foreground "LightGray" :weight bold :underline t))
 (((class grayscale) (background dark))
 (:foreground "Gray50" :weight bold :underline t))
-(((class color) (background light)) (:foreground "CadetBlue"))
+(((class color) (min-colors 88) (background light)) (:foreground "CadetBlue"))
-(((class color) (background dark)) (:foreground "Aquamarine"))
+(((class color) (min-colors 88) (background dark)) (:foreground "Aquamarine"))
+(((class color) (min-colors 16) (background light)) (:foreground "CadetBlue"))
+(((class color) (min-colors 16) (background dark)) (:foreground "Aquamarine"))
+(((class color) (min-colors 8)) (:foreground "magenta"))
 (t (:weight bold :underline t)))
 "Font Lock mode face used to highlight constants and labels."
 :group 'font-lock-highlighting-faces)
 (defface font-lock-warning-face
-'((((type tty) (class color)) (:foreground "red"))
+'((((class color) (min-colors 88) (background light)) (:foreground "Red" :weight bold))
-(((class color) (background light)) (:foreground "Red" :weight bold))
+(((class color) (min-colors 88) (background dark)) (:foreground "Pink" :weight bold))
-(((class color) (background dark)) (:foreground "Pink" :weight bold))
+(((class color) (min-colors 16) (background light)) (:foreground "Red" :weight bold))
+(((class color) (min-colors 16) (background dark)) (:foreground "Pink" :weight bold))    (((class color) (min-colors 8)) (:foreground "red"))
 (t (:inverse-video t :weight bold)))
 "Font Lock mode face used to highlight warnings."
 :group 'font-lock-highlighting-faces)
 (defface font-lock-preprocessor-face
 		    "save-window-excursion" "save-selected-window"
 		    "save-match-data" "save-current-buffer" "unwind-protect"
 		    "condition-case" "track-mouse"
 		    "eval-after-load" "eval-and-compile" "eval-when-compile"
 		    "eval-when"
+		    "with-category-table"
 		    "with-current-buffer" "with-electric-help"
+		    "with-local-quit" "with-no-warnings"
 		    "with-output-to-string" "with-output-to-temp-buffer"
+		    "with-selected-window" "with-syntax-table"
 		    "with-temp-buffer" "with-temp-file" "with-temp-message"
-		    "with-timeout") t)
+		    "with-timeout" "with-timeout-handler") t)
 	     "\\>")
 	    1)
 ;;
 ;; Control structures.  Common Lisp forms.
 (cons (concat
 		    "cerror" "break" "ignore-errors"
 		    "loop" "do" "do*" "dotimes" "dolist" "the" "locally"
 		    "proclaim" "declaim" "declare" "symbol-macrolet"
 		    "lexical-let" "lexical-let*" "flet" "labels" "compiler-let"
 		    "destructuring-bind" "macrolet" "tagbody" "block"
-		    "return" "return-from") t)
+		    "return" "return-from"
+		    "with-accessors" "with-compilation-unit"
+		    "with-condition-restarts" "with-hash-table-iterator"
+		    "with-input-from-string" "with-open-file"
+		    "with-open-stream" "with-output-to-string"
+		    "with-package-iterator" "with-simple-restart"
+		    "with-slots" "with-standard-io-syntax") t)
 	     "\\>")
 	    1)
 ;;
 ;; Exit/Feature symbols as constants.
 (list (concat "(\\(catch\\|throw\\|featurep\\|provide\\|require\\)\\>"
 '("\\<:\\sw+\\>" 0 font-lock-builtin-face)
 ;;
 ;; ELisp and CLisp `&' keywords as types.
 '("\\&\\sw+\\>" . font-lock-type-face)
 ;;
-;; CL `with-' and `do-' constructs
+;;; This is too general -- rms.
-'("(\\(\\(do-\\|with-\\)\\(\\s_\\|\\w\\)*\\)" 1 font-lock-keyword-face)
+;;; A user complained that he has functions whose names start with `do'
+;;; and that they get the wrong color.
+;;;      ;; CL `with-' and `do-' constructs
+;;;      '("(\\(\\(do-\\|with-\\)\\(\\s_\\|\\w\\)*\\)" 1 font-lock-keyword-face)
 )))
 "Gaudy level highlighting for Lisp modes.")
 (defvar lisp-font-lock-keywords lisp-font-lock-keywords-1
 "Default expressions to highlight in Lisp modes.")
 (provide 'font-lock)
-(when (eq font-lock-support-mode 'jit-lock-mode)
+;;; arch-tag: 682327e4-64d8-4057-b20b-1fbb9f1fc54c
-(require 'jit-lock))
 ;;; font-lock.el ends here

Mercurial > emacs

comparison lisp/font-lock.el @ 89909:68c22ea6027c