From b6c1f1f92779dec4f906b439882f9575de3b0595 Mon Sep 17 00:00:00 2001 From: Barry Warsaw Date: Thu, 19 Mar 1998 22:33:06 +0000 Subject: [PATCH] #minor change to eval-while-compile so that it must both find #custom.el and have an up-to-date version (i.e. one that defines #defcustom -- which Emacs 19.34's by default does not). --- Misc/python-mode.el | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/Misc/python-mode.el b/Misc/python-mode.el index 2e560999ee7..29286e405d7 100644 --- a/Misc/python-mode.el +++ b/Misc/python-mode.el @@ -108,10 +108,13 @@ (require 'custom) (eval-when-compile (require 'cl) - (require 'custom) - ;; Stock Emacs 19.34 has a broken/old Custom library that does more - ;; harm than good - (or (fboundp 'defcustom) + (if (not (and (condition-case nil + (require 'custom) + (error nil)) + ;; Stock Emacs 19.34 has a broken/old Custom library + ;; that does more harm than good. Fortunately, it is + ;; missing defcustom + (fboundp 'defcustom))) (error "STOP! STOP! STOP! STOP! The Custom library was not found or is out of date. A more current