(list-colors-display): Use with-help-window instead of with-output-to-temp-buffer.

[bpt/emacs.git] / lisp / simple.el

diff --git a/lisp/simple.el b/lisp/simple.el
index 2307582..572d7d6 100644 (file)
--- a/lisp/simple.el
+++ b/lisp/simple.el
@@ -2561,8 +2561,6 @@ the text which should be made available.
 The second, optional, argument PUSH, has the same meaning as the
 similar argument to `x-set-cut-buffer', which see.")
 
-(make-variable-frame-local 'interprogram-cut-function)
-
 (defvar interprogram-paste-function nil
   "Function to call to get text cut from other programs.
 
@@ -2588,8 +2586,6 @@ most recent string, the function should return nil.  If it is
 difficult to tell whether Emacs or some other program provided the
 current string, it is probably good enough to return nil if the string
 is equal (according to `string=') to the last text Emacs provided.")
-
-(make-variable-frame-local 'interprogram-paste-function)
 \f
 
 
@@ -5841,7 +5837,7 @@ works by saving the value of `buffer-invisibility-spec' and setting it to nil."
 (defconst bad-packages-alist
   ;; Not sure exactly which semantic versions have problems.
   ;; Definitely 2.0pre3, probably all 2.0pre's before this.
-  '((semantic semantic-version "2\\.0pre[1-3]"
+  '((semantic semantic-version "\\`2\\.0pre[1-3]\\'"
               "The version of `semantic' loaded does not work in Emacs 22.
 It can cause constant high CPU load.
 Upgrade to at least Semantic 2.0pre4 (distributed with CEDET 1.0pre4).")
@@ -5855,15 +5851,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