[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: |
Peter Breton |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/generic-x.el |
Date: |
Sat, 22 Mar 2003 08:00:38 -0500 |
Index: emacs/lisp/generic-x.el
diff -c emacs/lisp/generic-x.el:1.18 emacs/lisp/generic-x.el:1.19
*** emacs/lisp/generic-x.el:1.18 Tue Dec 10 11:57:48 2002
--- emacs/lisp/generic-x.el Sat Mar 22 08:00:38 2003
***************
*** 845,850 ****
--- 845,851 ----
;; InstallShield RUL files
;; Contributed by address@hidden
+ ;; Bugfixes by "Rolf Sandau" <address@hidden>
(and
(memq 'rul-generic-mode generic-extras-enable-list)
;;; build the regexp strings using regexp-opt
***************
*** 1400,1449 ****
)
"Function argument constants used in InstallShield 3 and 5.")
! (define-generic-mode 'rul-generic-mode
! ;; Using "/*" and "*/" doesn't seem to be working right
! (list "//")
! installshield-statement-keyword-list
! (list
! ;; preprocessor constructs
! '("#[ \t]*include[ \t]+\\(<[^>\"\n]+>\\)"
! 1 font-lock-string-face)
! '("#[ \t]*\\(\\sw+\\)\\>[ \t]*\\(\\sw+\\)?"
! (1 font-lock-constant-face)
! (2 font-lock-variable-name-face nil t))
! ;; indirect string constants
! '("\\(@[A-Za-z][A-Za-z0-9_]+\\)" 1 font-lock-builtin-face)
! ;; gotos
! '("[ \t]*\\(\\sw+:\\)" 1 font-lock-constant-face)
! '("\\<\\(goto\\)\\>[ \t]*\\(\\sw+\\)?"
! (1 font-lock-keyword-face)
! (2 font-lock-constant-face nil t))
! ;; 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?
! )
! (list "\\.[rR][uU][lL]$")
! (list
! (function
! (lambda ()
! (setq imenu-generic-expression
! '((nil "^function\\s-+\\([A-Za-z0-9_]+\\)" 1)))
! )))
! "Generic mode for InstallShield RUL files.")
(define-skeleton rul-if
"Insert an if statement."
"condition: "
--- 1401,1490 ----
)
"Function argument constants used in InstallShield 3 and 5.")
! (progn
! (defvar rul-generic-mode-syntax-table nil
! "Syntax table to use in rul-generic-mode buffers.")
!
! (setq rul-generic-mode-syntax-table
! (make-syntax-table c++-mode-syntax-table))
!
! (modify-syntax-entry ?\r "> b" rul-generic-mode-syntax-table)
! (modify-syntax-entry ?\n "> b" rul-generic-mode-syntax-table)
!
! (cond
! ;; XEmacs 19 & 20 & 21
! ((memq '8-bit c-emacs-features)
! (modify-syntax-entry ?/ ". 1456" rul-generic-mode-syntax-table)
! (modify-syntax-entry ?* ". 23" rul-generic-mode-syntax-table)
! )
! ;; Emacs 19 & 20
! ((memq '1-bit c-emacs-features)
! (modify-syntax-entry ?/ ". 124b" rul-generic-mode-syntax-table)
! (modify-syntax-entry ?* ". 23" rul-generic-mode-syntax-table)
! )
! ;; incompatible
! (t (error "Run Mode is incompatible with this version of Emacs"))
! )
!
! ;; here manually instead
! (defun generic-rul-mode-setup-function ()
! (make-local-variable 'parse-sexp-ignore-comments)
! (make-local-variable 'comment-start)
! (make-local-variable 'comment-start-skip)
! (make-local-variable 'comment-end)
! (setq imenu-generic-expression
! '((nil "^function\\s-+\\([A-Za-z0-9_]+\\)" 1))
! parse-sexp-ignore-comments t
! comment-end "*/"
! comment-start "/*"
! ;; comment-end ""
! ;; comment-start "//"
! ;; comment-start-skip ""
! )
! ;; (set-syntax-table rul-generic-mode-syntax-table)
! (setq font-lock-syntax-table rul-generic-mode-syntax-table)
! )
+ ;; moved mode-definition behind defun-definition to be warning-free -
15.11.02/RSan
+ (define-generic-mode 'rul-generic-mode
+ ;; Using "/*" and "*/" doesn't seem to be working right
+ (list "//" '("/*" . "*/" ))
+ installshield-statement-keyword-list
+ (list
+ ;; preprocessor constructs
+ '("#[ \t]*include[ \t]+\\(<[^>\"\n]+>\\)"
+ 1 font-lock-string-face)
+ '("#[ \t]*\\(\\sw+\\)\\>[ \t]*\\(\\sw+\\)?"
+ (1 font-lock-reference-face)
+ (2 font-lock-variable-name-face nil t))
+ ;; indirect string constants
+ '("\\(@[A-Za-z][A-Za-z0-9_]+\\)" 1 font-lock-builtin-face)
+ ;; gotos
+ '("[ \t]*\\(\\sw+:\\)" 1 font-lock-reference-face)
+ '("\\<\\(goto\\)\\>[ \t]*\\(\\sw+\\)?"
+ (1 font-lock-keyword-face)
+ (2 font-lock-reference-face nil t))
+ ;; 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?
+ )
+ (list "\\.[rR][uU][lL]$")
+ (list 'generic-rul-mode-setup-function)
+ "Generic mode for InstallShield RUL files.")
+ )
(define-skeleton rul-if
"Insert an if statement."
"condition: "
***************
*** 1835,1840 ****
--- 1876,1893 ----
"Generic mode for ASTAP circuit netlist files."
)
+ (define-generic-mode 'etc-modules-conf-generic-mode
+ ;;List of comment characters
+ (list ?#)
+ ;;List of keywords
+ (list "alias" "pre-install" "post-install" "options" "probeall")
+ ;;List of additional font-lock-expressions
+ nil
+ ;;List of additional automode-alist expressions
+ (list "/etc/modules.conf" "/etc/conf.modules")
+ ;;List of set up functions to call
+ nil
+ )
(provide 'generic-x)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/generic-x.el,
Peter Breton <=