diff options
| author | Glenn Morris | 2007-11-02 07:57:19 +0000 |
|---|---|---|
| committer | Glenn Morris | 2007-11-02 07:57:19 +0000 |
| commit | 05db920d6f6a99f0ae84a35d3cf09b2a4f1ce264 (patch) | |
| tree | 63c06a5f889ed9f2887ec8f61be628b7dd2a06d6 | |
| parent | 8b1e0dff4ef87ba9ff115adb268f573f0cb8c6e8 (diff) | |
| download | emacs-05db920d6f6a99f0ae84a35d3cf09b2a4f1ce264.tar.gz emacs-05db920d6f6a99f0ae84a35d3cf09b2a4f1ce264.zip | |
(bad-packages-alist): Revert previous change.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/simple.el | 10 |
2 files changed, 5 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 94d2f803b1c..e1a30beccd1 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2007-11-02 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * simple.el (bad-packages-alist): Revert previous change. | ||
| 4 | |||
| 1 | 2007-11-02 Dan Nicolaescu <dann@ics.uci.edu> | 5 | 2007-11-02 Dan Nicolaescu <dann@ics.uci.edu> |
| 2 | 6 | ||
| 3 | * emacs-lisp/lselect.el: Move to obsolete/lselect.el. | 7 | * emacs-lisp/lselect.el: Move to obsolete/lselect.el. |
diff --git a/lisp/simple.el b/lisp/simple.el index 23075823eff..317acdaff31 100644 --- 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'. | |||
| 5855 | 5855 | ||
| 5856 | You have loaded an older version of CUA-mode which does not work | 5856 | You have loaded an older version of CUA-mode which does not work |
| 5857 | correctly with this version of Emacs. You should remove the old | 5857 | correctly with this version of Emacs. You should remove the old |
| 5858 | version and use the one distributed with Emacs.") | 5858 | version and use the one distributed with Emacs.")) |
| 5859 | ;; vc-svn doesn't have a version variable (do we see the limitations | ||
| 5860 | ;; of this approach now?), but the Emacs version uses `vc-svn-program', | ||
| 5861 | ;; rather than `vc-svn-program-name', hence this hack should work. | ||
| 5862 | (vc-svn-program-name t nil | ||
| 5863 | "`vc-svn' is now part of the standard GNU Emacs distribution. | ||
| 5864 | You have tried to load an older version which does not work as well with Emacs. | ||
| 5865 | You should remove the old version and use the one distributed with Emacs.")) | ||
| 5866 | |||
| 5867 | "Alist of packages known to cause problems in this version of Emacs. | 5859 | "Alist of packages known to cause problems in this version of Emacs. |
| 5868 | Each element has the form (PACKAGE SYMBOL REGEXP STRING). | 5860 | Each element has the form (PACKAGE SYMBOL REGEXP STRING). |
| 5869 | PACKAGE is either a regular expression to match file names, or a | 5861 | PACKAGE is either a regular expression to match file names, or a |