[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: |
Sun, 03 Apr 2005 16:52:03 -0400 |
Index: emacs/lisp/generic-x.el
diff -c emacs/lisp/generic-x.el:1.27 emacs/lisp/generic-x.el:1.28
*** emacs/lisp/generic-x.el:1.27 Thu Mar 24 09:14:33 2005
--- emacs/lisp/generic-x.el Sun Apr 3 20:52:03 2005
***************
*** 170,176 ****
'((nil "^\\([-A-Za-z0-9_]+\\)" 1)
("*Directories*" "^\\s-*<Directory\\s-*\\([^>]+\\)>" 1)
("*Locations*" "^\\s-*<Location\\s-*\\([^>]+\\)>" 1))))))
! "Generic mode for Apache or HTTPD configuration files."))
(when (memq 'apache-log-generic-mode generic-extras-enable-list)
--- 170,177 ----
'((nil "^\\([-A-Za-z0-9_]+\\)" 1)
("*Directories*" "^\\s-*<Directory\\s-*\\([^>]+\\)>" 1)
("*Locations*" "^\\s-*<Location\\s-*\\([^>]+\\)>" 1))))))
! "Generic mode for Apache or HTTPD configuration files."
! :group 'generic-x))
(when (memq 'apache-log-generic-mode generic-extras-enable-list)
***************
*** 183,189 ****
(2 font-lock-variable-name-face)))
'("access_log\\'")
nil
! "Mode for Apache log files"))
;;; Samba
(when (memq 'samba-generic-mode generic-extras-enable-list)
--- 184,191 ----
(2 font-lock-variable-name-face)))
'("access_log\\'")
nil
! "Mode for Apache log files"
! :group 'generic-x))
;;; Samba
(when (memq 'samba-generic-mode generic-extras-enable-list)
***************
*** 197,203 ****
(2 font-lock-type-face)))
'("smb\\.conf\\'")
'(generic-bracket-support)
! "Generic mode for Samba configuration files."))
;;; Fvwm
;; This is pretty basic. Also, modes for other window managers could
--- 199,206 ----
(2 font-lock-type-face)))
'("smb\\.conf\\'")
'(generic-bracket-support)
! "Generic mode for Samba configuration files."
! :group 'generic-x))
;;; Fvwm
;; This is pretty basic. Also, modes for other window managers could
***************
*** 222,228 ****
nil
'("\\.fvwmrc\\'" "\\.fvwm2rc\\'")
nil
! "Generic mode for FVWM configuration files."))
;;; X Resource
;; I'm pretty sure I've seen an actual mode to do this, but I don't
--- 225,232 ----
nil
'("\\.fvwmrc\\'" "\\.fvwm2rc\\'")
nil
! "Generic mode for FVWM configuration files."
! :group 'generic-x))
;;; X Resource
;; I'm pretty sure I've seen an actual mode to do this, but I don't
***************
*** 235,241 ****
'(("^\\([^:\n]+:\\)" 1 font-lock-variable-name-face))
'("\\.Xdefaults\\'" "\\.Xresources\\'" "\\.Xenvironment\\'" "\\.ad\\'")
nil
! "Generic mode for X Resource configuration files."))
;;; Hosts
(when (memq 'hosts-generic-mode generic-extras-enable-list)
--- 239,246 ----
'(("^\\([^:\n]+:\\)" 1 font-lock-variable-name-face))
'("\\.Xdefaults\\'" "\\.Xresources\\'" "\\.Xenvironment\\'" "\\.ad\\'")
nil
! "Generic mode for X Resource configuration files."
! :group 'generic-x))
;;; Hosts
(when (memq 'hosts-generic-mode generic-extras-enable-list)
***************
*** 246,252 ****
'(("\\([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+\\)" 1 font-lock-constant-face))
'("[hH][oO][sS][tT][sS]\\'")
nil
! "Generic mode for HOSTS files."))
;;; Windows INF files
(when (memq 'inf-generic-mode generic-extras-enable-list)
--- 251,258 ----
'(("\\([0-9]+\.[0-9]+\.[0-9]+\.[0-9]+\\)" 1 font-lock-constant-face))
'("[hH][oO][sS][tT][sS]\\'")
nil
! "Generic mode for HOSTS files."
! :group 'generic-x))
;;; Windows INF files
(when (memq 'inf-generic-mode generic-extras-enable-list)
***************
*** 257,263 ****
'(("^\\(\\[.*\\]\\)" 1 font-lock-constant-face))
'("\\.[iI][nN][fF]\\'")
'(generic-bracket-support)
! "Generic mode for MS-Windows INF files."))
;;; Windows INI files
;; Should define escape character as well!
--- 263,270 ----
'(("^\\(\\[.*\\]\\)" 1 font-lock-constant-face))
'("\\.[iI][nN][fF]\\'")
'(generic-bracket-support)
! "Generic mode for MS-Windows INF files."
! :group 'generic-x))
;;; Windows INI files
;; Should define escape character as well!
***************
*** 277,283 ****
(setq imenu-generic-expression
'((nil "^\\[\\(.*\\)\\]" 1)
("*Variables*" "^\\s-*\\([^=]+\\)\\s-*=" 1))))))
! "Generic mode for MS-Windows INI files."))
;;; Windows REG files
;;; Unfortunately, Windows 95 and Windows NT have different REG file syntax!
--- 284,291 ----
(setq imenu-generic-expression
'((nil "^\\[\\(.*\\)\\]" 1)
("*Variables*" "^\\s-*\\([^=]+\\)\\s-*=" 1))))))
! "Generic mode for MS-Windows INI files."
! :group 'generic-x))
;;; Windows REG files
;;; Unfortunately, Windows 95 and Windows NT have different REG file syntax!
***************
*** 294,300 ****
(lambda ()
(setq imenu-generic-expression
'((nil "^\\s-*\\(.*\\)\\s-*=" 1))))))
! "Generic mode for MS-Windows Registry files."))
;;; DOS/Windows BAT files
(when (memq 'bat-generic-mode generic-extras-enable-list)
--- 302,309 ----
(lambda ()
(setq imenu-generic-expression
'((nil "^\\s-*\\(.*\\)\\s-*=" 1))))))
! "Generic mode for MS-Windows Registry files."
! :group 'generic-x))
;;; DOS/Windows BAT files
(when (memq 'bat-generic-mode generic-extras-enable-list)
***************
*** 368,374 ****
"\\`[cC][oO][nN][fF][iI][gG]\\."
"\\`[aA][uU][tT][oO][eE][xX][eE][cC]\\.")
'(generic-bat-mode-setup-function)
! "Generic mode for MS-Windows BAT files.")
(defvar bat-generic-mode-syntax-table nil
"Syntax table in use in bat-generic-mode buffers.")
--- 377,384 ----
"\\`[cC][oO][nN][fF][iI][gG]\\."
"\\`[aA][uU][tT][oO][eE][xX][eE][cC]\\.")
'(generic-bat-mode-setup-function)
! "Generic mode for MS-Windows BAT files."
! :group 'generic-x)
(defvar bat-generic-mode-syntax-table nil
"Syntax table in use in bat-generic-mode buffers.")
***************
*** 446,452 ****
(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)
--- 456,463 ----
(lambda ()
(setq imenu-generic-expression
'((nil "\\s-/\\([^/]+\\)/[i, \t\n]" 1))))))
! "Mode for Mailagent rules files."
! :group 'generic-x))
;; Solaris/Sys V prototype files
(when (memq 'prototype-generic-mode generic-extras-enable-list)
***************
*** 469,475 ****
(2 font-lock-variable-name-face)))
'("prototype\\'")
nil
! "Mode for Sys V prototype files."))
;; Solaris/Sys V pkginfo files
(when (memq 'pkginfo-generic-mode generic-extras-enable-list)
--- 480,487 ----
(2 font-lock-variable-name-face)))
'("prototype\\'")
nil
! "Mode for Sys V prototype files."
! :group 'generic-x))
;; Solaris/Sys V pkginfo files
(when (memq 'pkginfo-generic-mode generic-extras-enable-list)
***************
*** 482,488 ****
(2 font-lock-variable-name-face)))
'("pkginfo\\'")
nil
! "Mode for Sys V pkginfo files."))
;; Javascript mode
;; Includes extra keywords from Armando Singer address@hidden
--- 494,501 ----
(2 font-lock-variable-name-face)))
'("pkginfo\\'")
nil
! "Mode for Sys V pkginfo files."
! :group 'generic-x))
;; Javascript mode
;; Includes extra keywords from Armando Singer address@hidden
***************
*** 559,565 ****
(setq imenu-generic-expression
'((nil "^function\\s-+\\([A-Za-z0-9_]+\\)" 1)
("*Variables*" "^var\\s-+\\([A-Za-z0-9_]+\\)" 1))))))
! "Mode for JavaScript files.")
;; VRML files
(define-generic-mode vrml-generic-mode
--- 572,579 ----
(setq imenu-generic-expression
'((nil "^function\\s-+\\([A-Za-z0-9_]+\\)" 1)
("*Variables*" "^var\\s-+\\([A-Za-z0-9_]+\\)" 1))))))
! "Mode for JavaScript files."
! :group 'generic-x)
;; VRML files
(define-generic-mode vrml-generic-mode
***************
*** 610,616 ****
("*Definitions*"
"DEF\\s-+\\([-A-Za-z0-9_]+\\)\\s-+\\([A-Za-z0-9]+\\)\\s-*{"
1))))))
! "Generic Mode for VRML files.")
;; Java Manifests
(define-generic-mode java-manifest-generic-mode
--- 624,631 ----
("*Definitions*"
"DEF\\s-+\\([-A-Za-z0-9_]+\\)\\s-+\\([A-Za-z0-9]+\\)\\s-*{"
1))))))
! "Generic Mode for VRML files."
! :group 'generic-x)
;; Java Manifests
(define-generic-mode java-manifest-generic-mode
***************
*** 629,635 ****
(2 font-lock-constant-face)))
'("[mM][aA][nN][iI][fF][eE][sS][tT]\\.[mM][fF]\\'")
nil
! "Mode for Java Manifest files")
;; Java properties files
(define-generic-mode java-properties-generic-mode
--- 644,651 ----
(2 font-lock-constant-face)))
'("[mM][aA][nN][iI][fF][eE][sS][tT]\\.[mM][fF]\\'")
nil
! "Mode for Java Manifest files"
! :group 'generic-x)
;; Java properties files
(define-generic-mode java-properties-generic-mode
***************
*** 659,665 ****
(lambda ()
(setq imenu-generic-expression
'((nil "^\\([^#! \t\n\r=:]+\\)" 1))))))
! "Mode for Java properties files.")
;; C shell alias definitions
(when (memq 'alias-generic-mode generic-extras-enable-list)
--- 675,682 ----
(lambda ()
(setq imenu-generic-expression
'((nil "^\\([^#! \t\n\r=:]+\\)" 1))))))
! "Mode for Java properties files."
! :group 'generic-x)
;; C shell alias definitions
(when (memq 'alias-generic-mode generic-extras-enable-list)
***************
*** 677,683 ****
(lambda ()
(setq imenu-generic-expression
'((nil "^\\(alias\\|unalias\\)\\s-+\\([-a-zA-Z0-9_]+\\)" 2))))))
! "Mode for C Shell alias files."))
;;; Windows RC files
;; Contributed by address@hidden (Alfred Correira)
--- 694,701 ----
(lambda ()
(setq imenu-generic-expression
'((nil "^\\(alias\\|unalias\\)\\s-+\\([-a-zA-Z0-9_]+\\)" 2))))))
! "Mode for C Shell alias files."
! :group 'generic-x))
;;; Windows RC files
;; Contributed by address@hidden (Alfred Correira)
***************
*** 769,775 ****
(2 font-lock-variable-name-face nil t))))
'("\\.[rR][cC]$")
nil
! "Generic mode for MS-Windows Resource files."))
;; InstallShield RUL files
;; Contributed by address@hidden
--- 787,794 ----
(2 font-lock-variable-name-face nil t))))
'("\\.[rR][cC]$")
nil
! "Generic mode for MS-Windows Resource files."
! :group 'generic-x))
;; InstallShield RUL files
;; Contributed by address@hidden
***************
*** 1389,1395 ****
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.")
(define-skeleton rul-if
"Insert an if statement."
--- 1408,1415 ----
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."
! :group 'generic-x)
(define-skeleton rul-if
"Insert an if statement."
***************
*** 1437,1443 ****
(2 font-lock-variable-name-face)))
'("\\.mailrc\\'")
nil
! "Mode for mailrc files.")
;; Inetd.conf
(when (memq 'inetd-conf-generic-mode generic-extras-enable-list)
--- 1457,1464 ----
(2 font-lock-variable-name-face)))
'("\\.mailrc\\'")
nil
! "Mode for mailrc files."
! :group 'generic-x)
;; Inetd.conf
(when (memq 'inetd-conf-generic-mode generic-extras-enable-list)
***************
*** 1457,1463 ****
(function
(lambda ()
(setq imenu-generic-expression
! '((nil "^\\([-A-Za-z0-9_]+\\)" 1))))))))
;; Services
(when (memq 'etc-services-generic-mode generic-extras-enable-list)
--- 1478,1485 ----
(function
(lambda ()
(setq imenu-generic-expression
! '((nil "^\\([-A-Za-z0-9_]+\\)" 1))))))
! :group 'generic-x))
;; Services
(when (memq 'etc-services-generic-mode generic-extras-enable-list)
***************
*** 1475,1481 ****
(function
(lambda ()
(setq imenu-generic-expression
! '((nil "^\\([-A-Za-z0-9_]+\\)" 1))))))))
;; Password and Group files
(when (memq 'etc-passwd-generic-mode generic-extras-enable-list)
--- 1497,1504 ----
(function
(lambda ()
(setq imenu-generic-expression
! '((nil "^\\([-A-Za-z0-9_]+\\)" 1))))))
! :group 'generic-x))
;; Password and Group files
(when (memq 'etc-passwd-generic-mode generic-extras-enable-list)
***************
*** 1517,1523 ****
(function
(lambda ()
(setq imenu-generic-expression
! '((nil "^\\([-A-Za-z0-9_]+\\):" 1))))))))
;; Fstab
(when (memq 'etc-fstab-generic-mode generic-extras-enable-list)
--- 1540,1547 ----
(function
(lambda ()
(setq imenu-generic-expression
! '((nil "^\\([-A-Za-z0-9_]+\\):" 1))))))
! :group 'generic-x))
;; Fstab
(when (memq 'etc-fstab-generic-mode generic-extras-enable-list)
***************
*** 1567,1573 ****
(function
(lambda ()
(setq imenu-generic-expression
! '((nil "^\\([/-A-Za-z0-9_]+\\)\\s-+" 1))))))))
;; From Jacques Duthen <address@hidden>
(eval-when-compile
--- 1591,1598 ----
(function
(lambda ()
(setq imenu-generic-expression
! '((nil "^\\([/-A-Za-z0-9_]+\\)\\s-+" 1))))))
! :group 'generic-x))
;; From Jacques Duthen <address@hidden>
(eval-when-compile
***************
*** 1609,1615 ****
nil ;; no auto-mode-alist
;; '(show-tabs-generic-mode-hook-fun)
nil
! "Generic mode to show tabs and trailing spaces")
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; DNS modes
--- 1634,1641 ----
nil ;; no auto-mode-alist
;; '(show-tabs-generic-mode-hook-fun)
nil
! "Generic mode to show tabs and trailing spaces"
! :group 'generic-x)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; DNS modes
***************
*** 1630,1636 ****
;; List of additional automode-alist expressions
'("/etc/named.boot\\'")
;; List of set up functions to call
! nil)
(define-generic-mode named-database-generic-mode
;; List of comment characters
--- 1656,1663 ----
;; List of additional automode-alist expressions
'("/etc/named.boot\\'")
;; List of set up functions to call
! nil
! :group 'generic-x)
(define-generic-mode named-database-generic-mode
;; List of comment characters
***************
*** 1643,1649 ****
;; List of additional automode-alist expressions
nil
;; List of set up functions to call
! nil)
(defvar named-database-time-string "%Y%m%d%H"
"Timestring for named serial numbers.")
--- 1670,1677 ----
;; List of additional automode-alist expressions
nil
;; List of set up functions to call
! nil
! :group 'generic-x)
(defvar named-database-time-string "%Y%m%d%H"
"Timestring for named serial numbers.")
***************
*** 1663,1669 ****
;; List of additional automode-alist expressions
'("/etc/resolv[e]?.conf\\'")
;; List of set up functions to call
! nil)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Modes for spice and common electrical engineering circuit netlist formats
--- 1691,1698 ----
;; List of additional automode-alist expressions
'("/etc/resolv[e]?.conf\\'")
;; List of set up functions to call
! nil
! :group 'generic-x)
;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
;; Modes for spice and common electrical engineering circuit netlist formats
***************
*** 1705,1711 ****
(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
'(?|)
--- 1734,1741 ----
(function
(lambda()
(setq font-lock-defaults '(generic-font-lock-keywords nil t)))))
! "Generic mode for SPICE circuit netlist files."
! :group 'generic-x)
(define-generic-mode ibis-generic-mode
'(?|)
***************
*** 1714,1720 ****
("\\(\\(_\\|\\w\\)+\\)\\s-*=" 1 font-lock-variable-name-face))
'("\\.[iI][bB][sS]\\'")
'(generic-bracket-support)
! "Generic mode for IBIS circuit netlist files.")
(define-generic-mode astap-generic-mode
nil
--- 1744,1751 ----
("\\(\\(_\\|\\w\\)+\\)\\s-*=" 1 font-lock-variable-name-face))
'("\\.[iI][bB][sS]\\'")
'(generic-bracket-support)
! "Generic mode for IBIS circuit netlist files."
! :group 'generic-x)
(define-generic-mode astap-generic-mode
nil
***************
*** 1749,1755 ****
(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
;; List of comment characters
--- 1780,1787 ----
(function
(lambda()
(setq font-lock-defaults '(generic-font-lock-keywords nil t)))))
! "Generic mode for ASTAP circuit netlist files."
! :group 'generic-x)
(define-generic-mode etc-modules-conf-generic-mode
;; List of comment characters
***************
*** 1791,1797 ****
;; List of additional automode-alist expressions
'("/etc/modules.conf" "/etc/conf.modules")
;; List of set up functions to call
! nil)
(provide 'generic-x)
--- 1823,1830 ----
;; List of additional automode-alist expressions
'("/etc/modules.conf" "/etc/conf.modules")
;; List of set up functions to call
! nil
! :group 'generic-x)
(provide 'generic-x)
- [Emacs-diffs] Changes to emacs/lisp/generic-x.el,
Lute Kamstra <=
- [Emacs-diffs] Changes to emacs/lisp/generic-x.el, Lute Kamstra, 2005/04/05
- [Emacs-diffs] Changes to emacs/lisp/generic-x.el, Dan Nicolaescu, 2005/04/08
- [Emacs-diffs] Changes to emacs/lisp/generic-x.el, Lute Kamstra, 2005/04/11
- [Emacs-diffs] Changes to emacs/lisp/generic-x.el, Lute Kamstra, 2005/04/11
- [Emacs-diffs] Changes to emacs/lisp/generic-x.el, Lute Kamstra, 2005/04/13
- [Emacs-diffs] Changes to emacs/lisp/generic-x.el, Lute Kamstra, 2005/04/29