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

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 94d2f803b1c936ca19c9da42aaa3436c91b3d1ed..e1a30beccd1eccd2d50c822f87a66df747ecb78f 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-02  Dan Nicolaescu  <dann@ics.uci.edu>
 
        * emacs-lisp/lselect.el: Move to obsolete/lselect.el.

diff --git a/lisp/simple.el b/lisp/simple.el
index 23075823effb94f7de0758aab89976fc2798e004..317acdaff312ee0c4df48955d08da87071fef2f7 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -5855,15 +5855,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