(bad-packages-alist): Add an entry for standalone vc-svn.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f01bd38226576a9d9e99124b260391e68919c9a2..3fe6f30b2c8914e0eefb9a78b8633d3f8c0e6505 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -17,6 +17,8 @@
 
        * doc-view.el (doc-view-cache-directory): Remove superfluous concat.
 
+       * simple.el (bad-packages-alist): Add an entry for standalone vc-svn.
+
        * emacs-lisp/authors.el (authors-scan-change-log)
        (authors-scan-el): Don't enable local eval; enable only safe local
        variables, without querying.

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