2 files changed, 9 insertions, 15 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 8ca7d5c4879..782a2638ed4 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2003-07-04  Martin Stjernholm  <mast@lysator.liu.se>
+
+        * generic-x.el: Did away with the dependency on `c-emacs-features'
+        when populating `rul-generic-mode-syntax-table'; we already know
+        this isn't XEmacs.
+
 2003-07-03  Martin Stjernholm  <bug-cc-mode@gnu.org>
 
         * progmodes/cc-menus.el (cc-imenu-init): Do not set
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index bb2d3513f89..03ef7a5113b 100644
--- 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 ()