* term/mac-win.el (encoding-vector, mac-font-encoder-list)

[gnu-emacs] / lisp / generic-x.el

diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index bb2d3513f891e05b4007b2ac18901b8bb3179a05..88703af799f4c3e7de54c2cf390089319961b9e0 100644 (file)
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -1,6 +1,6 @@
 ;;; generic-x.el --- Extra Modes for generic-mode -*- no-byte-compile: t -*-
 
-;; Copyright (C) 1997, 1998 Free Software Foundation, Inc.
+;; Copyright (C) 1997, 1998, 2003 Free Software Foundation, Inc.
 
 ;; Author:  Peter Breton <pbreton@cs.umb.edu>
 ;; Created: Tue Oct 08 1996
@@ -1411,20 +1411,8 @@ you must reload generic-x to enable the specified modes."
    (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"))
-    )
+   (modify-syntax-entry ?/  ". 124b" rul-generic-mode-syntax-table)
+   (modify-syntax-entry ?*  ". 23"   rul-generic-mode-syntax-table)
 
    ;; here manually instead
    (defun generic-rul-mode-setup-function ()
@@ -1880,7 +1868,38 @@ you must reload generic-x to enable the specified modes."
   ;;List of comment characters
   (list ?#)
   ;;List of keywords
-  (list "alias" "pre-install" "post-install" "options" "probeall")
+  (list
+   "above"
+   "alias"
+   "below"
+   "define"
+   "depfile"
+   "else"
+   "elseif"
+   "endif"
+   "if"
+   "include"
+   "insmod_opt"
+   "install"
+   "keep"
+   "options"
+   "path"
+   "generic_stringfile"
+   "pcimapfile"
+   "isapnpmapfile"
+   "usbmapfile"
+   "parportmapfile"
+   "ieee1394mapfile"
+   "pnpbiosmapfile"
+   "probe"
+   "probeall"
+   "prune"
+   "post-install"
+   "post-remove"
+   "pre-install"
+   "pre-remove"
+   "remove"
+   "persistdir")
   ;;List of additional font-lock-expressions
   nil
   ;;List of additional automode-alist expressions
@@ -1891,4 +1910,5 @@ you must reload generic-x to enable the specified modes."
 
 (provide 'generic-x)
 
+;;; arch-tag: cde692a5-9ff6-4506-9999-c67999c2bdb5
 ;;; generic-x.el ends here