[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/generic-x.el
From: |
Lute Kamstra |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/generic-x.el |
Date: |
Thu, 24 Mar 2005 04:14:33 -0500 |
Index: emacs/lisp/generic-x.el
diff -c emacs/lisp/generic-x.el:1.26 emacs/lisp/generic-x.el:1.27
*** emacs/lisp/generic-x.el:1.26 Wed Mar 23 10:47:26 2005
--- emacs/lisp/generic-x.el Thu Mar 24 09:14:33 2005
***************
*** 324,330 ****
(generic-make-keywords-list
'("for"
"if")
! 'font-lock-keyword-face "^[@ \t]*")
;; These keywords can be anywhere on a line
;; In `generic-bat-mode-setup-function' we make the keywords
;; case-insensitive
--- 324,330 ----
(generic-make-keywords-list
'("for"
"if")
! font-lock-keyword-face "^[@ \t]*")
;; These keywords can be anywhere on a line
;; In `generic-bat-mode-setup-function' we make the keywords
;; case-insensitive
***************
*** 334,340 ****
"errorlevel"
"goto"
"not")
! 'font-lock-keyword-face)
;; These are built-in commands. Only frequently-used ones are listed.
(generic-make-keywords-list
'("CALL" "call" "Call"
--- 334,340 ----
"errorlevel"
"goto"
"not")
! font-lock-keyword-face)
;; These are built-in commands. Only frequently-used ones are listed.
(generic-make-keywords-list
'("CALL" "call" "Call"
***************
*** 352,358 ****
"SET" "set" "Set"
"START" "start" "Start"
"SHIFT" "shift" "Shift")
! 'font-lock-builtin-face "[ \t|\n]")
'("^[ \t]*\\(:\\sw+\\)" 1 font-lock-function-name-face t)
'("\\(%\\sw+%\\)" 1 font-lock-variable-name-face t)
'("\\(%[0-9]\\)" 1 font-lock-variable-name-face t)
--- 352,358 ----
"SET" "set" "Set"
"START" "start" "Start"
"SHIFT" "shift" "Shift")
! font-lock-builtin-face "[ \t|\n]")
'("^[ \t]*\\(:\\sw+\\)" 1 font-lock-function-name-face t)
'("\\(%\\sw+%\\)" 1 font-lock-variable-name-face t)
'("\\(%[0-9]\\)" 1 font-lock-variable-name-face t)
***************
*** 410,420 ****
;; Make underscores count as words
(unless bat-generic-mode-syntax-table
(setq bat-generic-mode-syntax-table (make-syntax-table))
! (modify-syntax-entry ?_ "w" bat-generic-mode-syntax-table))
! ;; bat-generic-mode doesn't use the comment functionality of generic-mode
! ;; because it has a three-letter comment-string, so we do it
! ;; here manually instead
(defun generic-bat-mode-setup-function ()
(make-local-variable 'parse-sexp-ignore-comments)
(make-local-variable 'comment-start)
--- 410,420 ----
;; Make underscores count as words
(unless bat-generic-mode-syntax-table
(setq bat-generic-mode-syntax-table (make-syntax-table))
! (modify-syntax-entry ?_ "w" bat-generic-mode-syntax-table))
! ;; bat-generic-mode doesn't use the comment functionality of
! ;; define-generic-mode because it has a three-letter comment-string,
! ;; so we do it here manually instead
(defun generic-bat-mode-setup-function ()
(make-local-variable 'parse-sexp-ignore-comments)
(make-local-variable 'comment-start)
***************
*** 427,433 ****
comment-start-skip "[Rr][Ee][Mm] *")
(set-syntax-table bat-generic-mode-syntax-table)
;; Make keywords case-insensitive
! (setq font-lock-defaults '(generic-font-lock-defaults nil t))
(use-local-map bat-generic-mode-keymap)))
;;; Mailagent
--- 427,433 ----
comment-start-skip "[Rr][Ee][Mm] *")
(set-syntax-table bat-generic-mode-syntax-table)
;; Make keywords case-insensitive
! (setq font-lock-defaults '(generic-font-lock-keywords nil t))
(use-local-map bat-generic-mode-keymap)))
;;; Mailagent
***************
*** 441,453 ****
'(("^\\(\\sw+\\)\\s-*=" 1 font-lock-variable-name-face)
("\\s-/\\([^/]+\\)/[i, \t\n]" 1 font-lock-constant-face))
'("\\.rules\\'")
! '(mailagent-rules-setup-function)
! "Mode for Mailagent rules files.")
!
! (defun mailagent-rules-setup-function ()
! (make-local-variable 'imenu-generic-expression)
! (setq imenu-generic-expression
! '((nil "\\s-/\\([^/]+\\)/[i, \t\n]" 1)))))
;; Solaris/Sys V prototype files
(when (memq 'prototype-generic-mode generic-extras-enable-list)
--- 441,452 ----
'(("^\\(\\sw+\\)\\s-*=" 1 font-lock-variable-name-face)
("\\s-/\\([^/]+\\)/[i, \t\n]" 1 font-lock-constant-face))
'("\\.rules\\'")
! (list
! (function
! (lambda ()
! (setq imenu-generic-expression
! '((nil "\\s-/\\([^/]+\\)/[i, \t\n]" 1))))))
! "Mode for Mailagent rules files."))
;; Solaris/Sys V prototype files
(when (memq 'prototype-generic-mode generic-extras-enable-list)
***************
*** 752,764 ****
"FILETYPE"
"FILEVERSION"
"PRODUCTVERSION")
! 'font-lock-type-face)
(generic-make-keywords-list
'("BEGIN"
"BLOCK"
"END"
"VALUE")
! 'font-lock-function-name-face)
'("^#[ \t]*include[ \t]+\\(<[^>\"\n]+>\\)" 1 font-lock-string-face)
'("^#[ \t]*define[ \t]+\\(\\sw+\\)(" 1
font-lock-function-name-face)
'("^#[ \t]*\\(elif\\|if\\)\\>"
--- 751,763 ----
"FILETYPE"
"FILEVERSION"
"PRODUCTVERSION")
! font-lock-type-face)
(generic-make-keywords-list
'("BEGIN"
"BLOCK"
"END"
"VALUE")
! font-lock-function-name-face)
'("^#[ \t]*include[ \t]+\\(<[^>\"\n]+>\\)" 1 font-lock-string-face)
'("^#[ \t]*define[ \t]+\\(\\sw+\\)(" 1
font-lock-function-name-face)
'("^#[ \t]*\\(elif\\|if\\)\\>"
***************
*** 1375,1393 ****
;; system variables
(generic-make-keywords-list
installshield-system-variables-list
! 'font-lock-variable-name-face "[^_]" "[^_]")
;; system functions
(generic-make-keywords-list
installshield-system-functions-list
! 'font-lock-function-name-face "[^_]" "[^_]")
;; type keywords
(generic-make-keywords-list
installshield-types-list
! 'font-lock-type-face "[^_]" "[^_]")
;; function argument constants
(generic-make-keywords-list
installshield-funarg-constants-list
! 'font-lock-variable-name-face "[^_]" "[^_]"))) ; is this face the best
choice?
'("\\.[rR][uU][lL]$")
'(generic-rul-mode-setup-function)
"Generic mode for InstallShield RUL files.")
--- 1374,1392 ----
;; system variables
(generic-make-keywords-list
installshield-system-variables-list
! font-lock-variable-name-face "[^_]" "[^_]")
;; system functions
(generic-make-keywords-list
installshield-system-functions-list
! font-lock-function-name-face "[^_]" "[^_]")
;; type keywords
(generic-make-keywords-list
installshield-types-list
! font-lock-type-face "[^_]" "[^_]")
;; function argument constants
(generic-make-keywords-list
installshield-funarg-constants-list
! font-lock-variable-name-face "[^_]" "[^_]"))) ; is this face the best
choice?
'("\\.[rR][uU][lL]$")
'(generic-rul-mode-setup-function)
"Generic mode for InstallShield RUL files.")
***************
*** 1429,1437 ****
"source"
"unset")
'(("^\\s-*\\(alias\\|group\\)\\s-+\\([-A-Za-z0-9_]+\\)\\s-+\\([^\n\r#]*\\)\\(#.*\\)?$"
! (2 font-lock-constant-face) (3 font-lock-variable-name-face))
("^\\s-*\\(unset\\|set\\|ignore\\)\\s-+\\([-A-Za-z0-9_]+\\)=?\\([^\n\r#]*\\)\\(#.*\\)?$"
! (2 font-lock-constant-face) (3 font-lock-variable-name-face))
("^\\s-*\\(source\\)\\s-+\\([^\n\r#]*\\)\\(#.*\\)?$"
(2 font-lock-variable-name-face)))
'("\\.mailrc\\'")
--- 1428,1438 ----
"source"
"unset")
'(("^\\s-*\\(alias\\|group\\)\\s-+\\([-A-Za-z0-9_]+\\)\\s-+\\([^\n\r#]*\\)\\(#.*\\)?$"
! (2 font-lock-constant-face)
! (3 font-lock-variable-name-face))
("^\\s-*\\(unset\\|set\\|ignore\\)\\s-+\\([-A-Za-z0-9_]+\\)=?\\([^\n\r#]*\\)\\(#.*\\)?$"
! (2 font-lock-constant-face)
! (3 font-lock-variable-name-face))
("^\\s-*\\(source\\)\\s-+\\([^\n\r#]*\\)\\(#.*\\)?$"
(2 font-lock-variable-name-face)))
'("\\.mailrc\\'")
***************
*** 1569,1600 ****
'((nil "^\\([/-A-Za-z0-9_]+\\)\\s-+" 1))))))))
;; From Jacques Duthen <address@hidden>
! (defvar show-tabs-generic-mode-font-lock-defaults-1
'(;; trailing spaces must come before...
! ("[ \t]+$" . show-tabs-space-face)
;; ...embedded tabs
! ("[^\n\t]\\(\t+\\)" (1 show-tabs-tab-face))))
! (defvar show-tabs-generic-mode-font-lock-defaults-2
'(;; trailing spaces must come before...
! ("[ \t]+$" . show-tabs-space-face)
;; ...tabs
! ("\t+" . show-tabs-tab-face)))
(defface show-tabs-tab-face
! '((((class grayscale) (background light)) (:foreground "LightGray" :weight
bold))
! (((class grayscale) (background dark)) (:foreground "DimGray" :weight
bold))
! (((class color) (background light)) (:foreground "red"))
! (((class color) (background dark)) (:foreground "red"))
(t (:weight bold)))
"Font Lock mode face used to highlight TABs."
:group 'show-tabs)
(defface show-tabs-space-face
! '((((class grayscale) (background light)) (:foreground "LightGray" :weight
bold))
! (((class grayscale) (background dark)) (:foreground "DimGray" :weight
bold))
! (((class color) (background light)) (:foreground "yellow"))
! (((class color) (background dark)) (:foreground "yellow"))
(t (:weight bold)))
"Font Lock mode face used to highlight spaces."
:group 'show-tabs)
--- 1570,1603 ----
'((nil "^\\([/-A-Za-z0-9_]+\\)\\s-+" 1))))))))
;; From Jacques Duthen <address@hidden>
! (eval-when-compile
!
! (defconst show-tabs-generic-mode-font-lock-defaults-1
'(;; trailing spaces must come before...
! ("[ \t]+$" . 'show-tabs-space-face)
;; ...embedded tabs
! ("[^\n\t]\\(\t+\\)" (1 'show-tabs-tab-face))))
! (defconst show-tabs-generic-mode-font-lock-defaults-2
'(;; trailing spaces must come before...
! ("[ \t]+$" . 'show-tabs-space-face)
;; ...tabs
! ("\t+" . 'show-tabs-tab-face))))
(defface show-tabs-tab-face
! '((((class grayscale) (background light)) (:background "DimGray" :weight
bold))
! (((class grayscale) (background dark)) (:background "LightGray" :weight
bold))
! (((class color) (background light)) (:background "red"))
! (((class color) (background dark)) (:background "red"))
(t (:weight bold)))
"Font Lock mode face used to highlight TABs."
:group 'show-tabs)
(defface show-tabs-space-face
! '((((class grayscale) (background light)) (:background "DimGray" :weight
bold))
! (((class grayscale) (background dark)) (:background "LightGray" :weight
bold))
! (((class color) (background light)) (:background "yellow"))
! (((class color) (background dark)) (:background "yellow"))
(t (:weight bold)))
"Font Lock mode face used to highlight spaces."
:group 'show-tabs)
***************
*** 1602,1608 ****
(define-generic-mode show-tabs-generic-mode
nil ;; no comment char
nil ;; no keywords
! show-tabs-generic-mode-font-lock-defaults-1
nil ;; no auto-mode-alist
;; '(show-tabs-generic-mode-hook-fun)
nil
--- 1605,1611 ----
(define-generic-mode show-tabs-generic-mode
nil ;; no comment char
nil ;; no keywords
! (eval-when-compile show-tabs-generic-mode-font-lock-defaults-1)
nil ;; no auto-mode-alist
;; '(show-tabs-generic-mode-hook-fun)
nil
***************
*** 1701,1707 ****
;; Make keywords case-insensitive
(function
(lambda()
! (setq font-lock-defaults '(generic-font-lock-defaults nil t)))))
"Generic mode for SPICE circuit netlist files.")
(define-generic-mode ibis-generic-mode
--- 1704,1710 ----
;; Make keywords case-insensitive
(function
(lambda()
! (setq font-lock-defaults '(generic-font-lock-keywords nil t)))))
"Generic mode for SPICE circuit netlist files.")
(define-generic-mode ibis-generic-mode
***************
*** 1745,1751 ****
;; Make keywords case-insensitive
(function
(lambda()
! (setq font-lock-defaults '(generic-font-lock-defaults nil t)))))
"Generic mode for ASTAP circuit netlist files.")
(define-generic-mode etc-modules-conf-generic-mode
--- 1748,1754 ----
;; Make keywords case-insensitive
(function
(lambda()
! (setq font-lock-defaults '(generic-font-lock-keywords nil t)))))
"Generic mode for ASTAP circuit netlist files.")
(define-generic-mode etc-modules-conf-generic-mode