2 files changed, 14 insertions, 21 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 3bdba1e7eb6..d0c4ba6836b 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2000-10-08  Peter Breton  <pbreton@ne.mediaone.net>
+
+        * generic-x.el (rul-generic-mode): Remove eval-when-compile
+        statements. Suggested by Stefan Monnier  <monnier@cs.yale.edu>.
+
 2000-10-08  Eli Zaretskii  <eliz@is.elta.co.il>
 
         * international/titdic-cnv.el (quail-cxterm-package-ext-info): Fix
@@ -36,15 +41,6 @@
         (browse-url-browser-function): Use it.
         Suggested by Colin Walters <walters@cis.ohio-state.edu>.
 
-2000-10-07  Peter Breton  <pbreton@ne.mediaone.net>
-
-        * net/net-utils.el (nslookup-font-lock-keywords)
-        (ftp-font-lock-keywords, smbclient-font-lock-keywords): Do not
-        require font-lock.  Doc cleanups throughout (incorporate changes
-        by Dave Love).
-        (network-connection-mode-setup): Comment out network-abbrev-table
-        variable.  Incorporate doc cleanups throughout.
-        
 2000-10-07  Stefan Monnier  <monnier@cs.yale.edu>
 
         * indent.el (tab-always-indent): New var.
diff --git a/lisp/generic-x.el b/lisp/generic-x.el
index ccb441b61d0..8335cf038f0 100644
--- a/lisp/generic-x.el
+++ b/lisp/generic-x.el
@@ -1419,24 +1419,21 @@ you must reload generic-x to enable the specified modes."
      (1 font-lock-keyword-face)
      (2 font-lock-constant-face nil t))
    ;; system variables
-   (eval-when-compile
-     (generic-make-keywords-list
-      installshield-system-variables-list
-      'font-lock-variable-name-face "[^_]" "[^_]"))
+   (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
-   (eval-when-compile
-     (generic-make-keywords-list
-      installshield-types-list
-      'font-lock-type-face "[^_]" "[^_]"))
+   (generic-make-keywords-list
+    installshield-types-list
+    'font-lock-type-face "[^_]" "[^_]")
    ;; function argument constants
-   (eval-when-compile
-     (generic-make-keywords-list
-      installshield-funarg-constants-list
-      'font-lock-variable-name-face "[^_]" "[^_]")) ; is this face the best choice?
+   (generic-make-keywords-list
+    installshield-funarg-constants-list
+    'font-lock-variable-name-face "[^_]" "[^_]") ; is this face the best choice?
    )
   (list "\\.[rR][uU][lL]$")
   (list