From b271ee8d1521f0d480fff2da774da2ca29060f8e Mon Sep 17 00:00:00 2001 From: "Richard M. Stallman" Date: Wed, 4 Dec 2002 11:49:10 +0000 Subject: [PATCH] Simply require wid-edit and custom in eval-when-compile. --- lisp/progmodes/cc-vars.el | 23 +++-------------------- 1 file changed, 3 insertions(+), 20 deletions(-) diff --git a/lisp/progmodes/cc-vars.el b/lisp/progmodes/cc-vars.el index 4a17f442b62..2b88a131776 100644 --- a/lisp/progmodes/cc-vars.el +++ b/lisp/progmodes/cc-vars.el @@ -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 -- 2.39.2