Add run-time check to catch users trying

to use older versions of CUA-mode, rather than the version
distributed with Emacs.  Use autoload cookies and eval-after-load.

2 files changed, 27 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 27e13540d13..89cb57f8727 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,14 @@
+2003-02-21  Kim F. Storm  <storm@cua.dk>
+
+        * emulation/cua-base.el: Add run-time check to catch users trying
+        to use older versions of CUA-mode, rather than the version
+        distributed with Emacs.  Use autoload cookies and eval-after-load.
+
+        * startup.el (command-line): Clarify and tidy up the message
+        printed when there are errors in the user-init-file.
+        Do not encapsulate the error data; it's read by humans here.
+        Do not split windows when displaying the *Message* buffer.
+
 2003-02-20  Ehud Karni  <ehud@unix.mvs.co.il>  (tiny change)
 
         * mail/rmail.el (rmail-insert-inbox-text): Make the pop3 mechanism
diff --git a/lisp/emulation/cua-base.el b/lisp/emulation/cua-base.el
index 24f4e5e946a..de337d9fb82 100644
--- a/lisp/emulation/cua-base.el
+++ b/lisp/emulation/cua-base.el
@@ -1249,4 +1249,20 @@ paste (in addition to the normal emacs bindings)."
   (interactive)
   (setq cua--debug (not cua--debug)))
 
+;; Install run-time check for older versions of CUA-mode which does not
+;; work with GNU Emacs version 21.4 and newer.
+;;
+;; Except for version 1.2, all of the 1.x and 2.x version of cua-mode
+;; provided the `CUA-mode' feature.  Since this is no longer true,
+;; we can warn the user if the `CUA-mode' feature is ever provided.
+
+;;;###autoload (eval-after-load 'CUA-mode
+;;;###autoload  '(error (concat "\n\n"
+;;;###autoload  "CUA-mode is now part of the standard GNU Emacs distribution,\n"
+;;;###autoload  "so you may now enable and customize CUA via the Options menu.\n\n"
+;;;###autoload  "Your " (file-name-nondirectory user-init-file) " loads an older version of CUA-mode which does\n"
+;;;###autoload  "not work correctly with this version of GNU Emacs.\n"
+;;;###autoload  "To correct this, remove the loading and customization of the\n"
+;;;###autoload  "old version from the " user-init-file " file.\n\n")))
+
 ;;; cua-base.el ends here