# HG changeset patch
# User Richard M. Stallman <rms@gnu.org>
# Date 1039002550 0
# Node ID 546d8af61357948f6512dbf8aa257e0c7e86a843
# Parent  06a337e05b08192e60cd224325f2c61b3645f2c0
Simply require wid-edit and custom in eval-when-compile.

diff -r 06a337e05b08 -r 546d8af61357 lisp/progmodes/cc-vars.el
--- a/lisp/progmodes/cc-vars.el	Wed Dec 04 11:48:12 2002 +0000
+++ b/lisp/progmodes/cc-vars.el	Wed Dec 04 11:49:10 2002 +0000
@@ -50,26 +50,9 @@
 
 ;; Pull in custom if it exists and is recent enough (the one in Emacs
 ;; 19.34 isn't).
-(eval
- (cc-eval-when-compile
-   (condition-case nil
-       (progn
-	 (require 'custom)
-	 (or (fboundp 'defcustom) (error ""))
-	 (require 'wid-edit)
-	 '(progn			; Compile in the require's.
-	    (require 'custom)
-	    (require 'wid-edit)))
-     (error
-      (message "Warning: Compiling without Customize support \
-since a (good enough) custom library wasn't found")
-      (cc-bytecomp-defmacro define-widget (name class doc &rest args))
-      (cc-bytecomp-defmacro defcustom (symbol value doc &rest args)
-	`(defvar ,symbol ,value ,doc))
-      (cc-bytecomp-defmacro custom-declare-variable (symbol value doc
-						     &rest args)
-	`(defvar ,(eval symbol) ,(eval value) ,doc))
-      nil))))
+(eval-when-compile
+  (require 'custom)
+  (require 'wid-edit))
 
 (cc-eval-when-compile
   ;; Need the function form of `backquote', which isn't standardized