#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).

diff --git a/Misc/python-mode.el b/Misc/python-mode.el
index 2e560999ee759b838b3954a1dde8ad23875c2d30..29286e405d7d7225932c82b325dde85e3e5d8607 100644 (file)
--- 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