diff options
| author | Barry Warsaw <barry@python.org> | 1998-03-19 22:33:06 (GMT) |
|---|---|---|
| committer | Barry Warsaw <barry@python.org> | 1998-03-19 22:33:06 (GMT) |
| commit | b6c1f1f92779dec4f906b439882f9575de3b0595 (patch) | |
| tree | 699ba8296694e2e001ad696eba82c33ce57516e0 /Misc | |
| parent | 0d2805b771edf6c62efc268dc9c6499b99abe1d0 (diff) | |
| download | cpython-b6c1f1f92779dec4f906b439882f9575de3b0595.zip cpython-b6c1f1f92779dec4f906b439882f9575de3b0595.tar.gz cpython-b6c1f1f92779dec4f906b439882f9575de3b0595.tar.bz2 | |
#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).
Diffstat (limited to 'Misc')
| -rw-r--r-- | Misc/python-mode.el | 11 |
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 |