[slime-cvs] CVS slime

[CVS User heller]

Update of /project/slime/cvsroot/slime
In directory tiger.common-lisp.net:/tmp/cvs-serv29305

Modified Files:
	ChangeLog slime.el 
Log Message:
* slime.el ([xemacs]): Don't require 'un-define in XEmacs 21.5 and
later. Mule-UCS is not needed anymore because of internal Unicode
support (and conflicts with it).

--- /project/slime/cvsroot/slime/ChangeLog	2011/12/06 15:09:04	1.2270
+++ /project/slime/cvsroot/slime/ChangeLog	2011/12/06 18:57:34	1.2271
@@ -1,3 +1,9 @@
+2011-12-05  Didier Verna  <didier at xemacs.org>
+
+	* slime.el ([xemacs]): Don't require 'un-define in XEmacs 21.5 and
+	later. Mule-UCS is not needed anymore because of internal Unicode
+	support (and conflicts with it).
+
 2011-12-06  Stas Boukarev  <stassats at gmail.com>
 
 	* slime.el (slime-compile-region): Check connection before running
--- /project/slime/cvsroot/slime/slime.el	2011/12/06 15:09:04	1.1384
+++ /project/slime/cvsroot/slime/slime.el	2011/12/06 18:57:34	1.1385
@@ -68,7 +68,10 @@
 (require 'font-lock)
 (when (featurep 'xemacs)
   (require 'overlay)
-  (require 'un-define))
+  (when (or (< emacs-major-version 21)
+            (and (= emacs-major-version 21)
+                 (< emacs-minor-version 5)))
+    (require 'un-define)))
 (require 'easymenu)
 (eval-when (compile)
   (require 'arc-mode)