summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Misc/python-mode.el11
1 files changed, 7 insertions, 4 deletions
diff --git a/Misc/python-mode.el b/Misc/python-mode.el
index 2e56099..29286e4 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