summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBarry Warsaw <barry@python.org>1997-12-02 21:51:57 (GMT)
committerBarry Warsaw <barry@python.org>1997-12-02 21:51:57 (GMT)
commit673d05f0ee0afd043e27e2694eb0e14352ce9772 (patch)
tree4c1afaccfcb8ca2ca906e3a2d8623a6a953266e6
parent08052c7bb6ef674782ccef7dc11d71cbe398b5a5 (diff)
downloadcpython-673d05f0ee0afd043e27e2694eb0e14352ce9772.zip
cpython-673d05f0ee0afd043e27e2694eb0e14352ce9772.tar.gz
cpython-673d05f0ee0afd043e27e2694eb0e14352ce9772.tar.bz2
Test for an up-to-date Custom library when byte-compiling, and issue
an informative message when one cannot be found, as is the case with a vanilla Emacs 19.34 (and NTEmacs 19.34).
-rw-r--r--Misc/python-mode.el21
1 files changed, 20 insertions, 1 deletions
diff --git a/Misc/python-mode.el b/Misc/python-mode.el
index f878576..140d3c0 100644
--- a/Misc/python-mode.el
+++ b/Misc/python-mode.el
@@ -30,6 +30,8 @@
;; you may need to acquire the Custom library. Please see
;; <http://www.python.org/ftp/emacs/> for details.
+;; You will want to byte-compile this file.
+
;; python-mode.el is currently distributed with XEmacs 19 and XEmacs
;; 20. Since this file is not GPL'd it is not distributed with Emacs,
;; but it is compatible with 19.34 and the current 20 series Emacsen.
@@ -80,7 +82,24 @@
(require 'custom)
(eval-when-compile
- (require 'cl))
+ (require 'cl)
+ (require 'custom)
+ ;; Stock Emacs 19.34 has a broken/old Custom library that does more
+ ;; harm than good
+ (or (fboundp 'defcustom)
+ (error "STOP! STOP! STOP! STOP!
+
+The Custom library was not found or is out of date. A more current
+version is required. Please download and install the latest version
+of the Custom library from:
+
+ <http://www.dina.kvl.dk/~abraham/custom/>
+
+See the Python Mode home page for details:
+
+ <http://www.python.org/ftp/emacs/>
+")))
+
;; user definable variables