(Finsert_file_contents): Give a more appropriate error

[bpt/emacs.git] / lisp / generic-x.el

diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index 8335cf0..3b56320 100644 (file)
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -1,4 +1,4 @@
-;;; generic-x.el --- Extra Modes for generic-mode
+;;; generic-x.el --- Extra Modes for generic-mode -*- no-byte-compile: t -*-
 
 ;; Copyright (C) 1997, 1998 Free Software Foundation, Inc.
 
@@ -164,7 +164,7 @@ you must reload generic-x to enable the specified modes."
    (list ?#)
    nil
    '(("^\\s-*\\(<.*>\\)"       1 'font-lock-constant-face)
-     ("^\\(\\sw+\\)\\s-"  1 'font-lock-variable-name-face))
+     ("^\\s-*\\(\\sw+\\)\\s-"  1 'font-lock-variable-name-face))
    (list "srm\\.conf\\'" "httpd\\.conf\\'" "access\\.conf\\'")
    (list
     (function
@@ -1482,12 +1482,15 @@ you must reload generic-x to enable the specified modes."
    "if"
    "ignore"
    "set"
+   "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)))
+     (2 font-lock-constant-face) (3 font-lock-variable-name-face))
+    ("^\\s-*\\(source\\)\\s-+\\([^\n\r#]*\\)\\(#.*\\)?$"
+     (2 font-lock-variable-name-face)))
   (list "\\.mailrc\\'")
   nil
   "Mode for mailrc files.")
@@ -1643,20 +1646,20 @@ you must reload generic-x to enable the specified modes."
        ("\t+" . 'show-tabs-tab-face)))
 
 (defface show-tabs-tab-face
-  '((((class grayscale) (background light)) (:foreground "LightGray" :bold t))
-    (((class grayscale) (background dark))  (:foreground "DimGray"   :bold t))
+  '((((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 (:bold t)))
+    (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" :bold t))
-    (((class grayscale) (background dark))  (:foreground "DimGray"   :bold t))
+  '((((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 (:bold t)))
+    (t (:weight bold)))
   "Font Lock mode face used to highlight spaces."
   :group 'show-tabs)