(bad-packages-alist): Revert previous change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 871d799da887f811e275f993dc1a3a819121d5e6..7bc6a68bbf02a2378ac1ab5f280d45264cd5dfc2 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2007-11-02  Glenn Morris  <rgm@gnu.org>
+
+       * simple.el (bad-packages-alist): Revert previous change.
+
 2007-11-01  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * printing.el (printing): Fix :version, printing.el was included

diff --git a/lisp/simple.el b/lisp/simple.el
index ebb200aa25df375475d7bdd03d4be51d9c205d2f..e1cf249f01c67c0ca8d5862a0f8f28f73c194e1b 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -5647,14 +5647,7 @@ so you can now enable CUA via the Options menu or by customizing `cua-mode'.
 
 You have loaded an older version of CUA-mode which does not work
 correctly with this version of Emacs.  You should remove the old
-version and use the one distributed with Emacs.")
-    ;; vc-svn doesn't have a version variable (do we see the limitations
-    ;; of this approach now?), but the Emacs version uses `vc-svn-program',
-    ;; rather than `vc-svn-program-name', hence this hack should work.
-    (vc-svn-program-name t nil
-"`vc-svn' is now part of the standard GNU Emacs distribution.
-You have tried to load an older version which does not work as well with Emacs.
-You should remove the old version and use the one distributed with Emacs."))
+version and use the one distributed with Emacs."))
   "Alist of packages known to cause problems in this version of Emacs.
 Each element has the form (PACKAGE SYMBOL REGEXP STRING).
 PACKAGE is either a regular expression to match file names, or a