mirror of https://github.com/python/cpython.git
#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).
This commit is contained in:
parent
0d2805b771
commit
b6c1f1f927
|
@ -108,10 +108,13 @@
|
||||||
(require 'custom)
|
(require 'custom)
|
||||||
(eval-when-compile
|
(eval-when-compile
|
||||||
(require 'cl)
|
(require 'cl)
|
||||||
(require 'custom)
|
(if (not (and (condition-case nil
|
||||||
;; Stock Emacs 19.34 has a broken/old Custom library that does more
|
(require 'custom)
|
||||||
;; harm than good
|
(error nil))
|
||||||
(or (fboundp 'defcustom)
|
;; 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!
|
(error "STOP! STOP! STOP! STOP!
|
||||||
|
|
||||||
The Custom library was not found or is out of date. A more current
|
The Custom library was not found or is out of date. A more current
|
||||||
|
|
Loading…
Reference in New Issue