aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGlenn Morris2007-11-02 07:56:02 +0000
committerGlenn Morris2007-11-02 07:56:02 +0000
commitc1cf6983a5e7870ad895dedb9baaeeed6ed9cc8a (patch)
tree84ff3f040e9c27256f0c7a342e01861261d65ebf
parent32ef39ff0b625213098f41ac471d020ddd7fc1fb (diff)
downloademacs-c1cf6983a5e7870ad895dedb9baaeeed6ed9cc8a.tar.gz
emacs-c1cf6983a5e7870ad895dedb9baaeeed6ed9cc8a.zip
(bad-packages-alist): Revert previous change.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/simple.el9
2 files changed, 5 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 871d799da88..7bc6a68bbf0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
12007-11-02 Glenn Morris <rgm@gnu.org>
2
3 * simple.el (bad-packages-alist): Revert previous change.
4
12007-11-01 Dan Nicolaescu <dann@ics.uci.edu> 52007-11-01 Dan Nicolaescu <dann@ics.uci.edu>
2 6
3 * printing.el (printing): Fix :version, printing.el was included 7 * printing.el (printing): Fix :version, printing.el was included
diff --git a/lisp/simple.el b/lisp/simple.el
index ebb200aa25d..e1cf249f01c 100644
--- 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'.
5647 5647
5648You have loaded an older version of CUA-mode which does not work 5648You have loaded an older version of CUA-mode which does not work
5649correctly with this version of Emacs. You should remove the old 5649correctly with this version of Emacs. You should remove the old
5650version and use the one distributed with Emacs.") 5650version and use the one distributed with Emacs."))
5651 ;; vc-svn doesn't have a version variable (do we see the limitations
5652 ;; of this approach now?), but the Emacs version uses `vc-svn-program',
5653 ;; rather than `vc-svn-program-name', hence this hack should work.
5654 (vc-svn-program-name t nil
5655"`vc-svn' is now part of the standard GNU Emacs distribution.
5656You have tried to load an older version which does not work as well with Emacs.
5657You should remove the old version and use the one distributed with Emacs."))
5658 "Alist of packages known to cause problems in this version of Emacs. 5651 "Alist of packages known to cause problems in this version of Emacs.
5659Each element has the form (PACKAGE SYMBOL REGEXP STRING). 5652Each element has the form (PACKAGE SYMBOL REGEXP STRING).
5660PACKAGE is either a regular expression to match file names, or a 5653PACKAGE is either a regular expression to match file names, or a