[slime-cvs] CVS update: slime/slime.el

[Helmut Eller]

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

Modified Files:
	slime.el 
Log Message:
(slime-net-coding-system): More fixes for non-mule-XEmacsen.
Date: Thu Apr  7 08:54:42 2005
Author: heller

Index: slime/slime.el
diff -u slime/slime.el:1.479 slime/slime.el:1.480
--- slime/slime.el:1.479	Mon Apr  4 01:26:50 2005
+++ slime/slime.el	Thu Apr  7 08:54:42 2005
@@ -63,7 +63,6 @@
 (when (featurep 'xemacs)
   (require 'overlay))
 (require 'easymenu)
-(require 'tree-widget)
 
 (defvar slime-use-autodoc-mode nil
   "When non-nil always enabled slime-autodoc-mode in slime-mode.")
@@ -1490,7 +1489,9 @@
 The functions are called with the process as their argument.")
 
 (defvar slime-net-coding-system
-  (find-if (if (featurep 'xemacs) #'find-coding-system #'coding-system-p)
+  (find-if (cond ((fboundp 'coding-system-p) #'coding-system-p)
+                 ((fboundp 'find-coding-system) #'find-coding-system)
+                 (t (lambda (x) (eq x 'binary))))
            '(iso-latin-1-unix iso-8859-1-unix binary))
   "*Coding system used for network connections.
 See also `slime-net-valid-coding-systems'.")
@@ -7483,6 +7484,7 @@
                     :has-echildren t))))
 
 (defun slime-call-with-browser-setup (buffer package title fn)
+  (require 'tree-widget)
   (switch-to-buffer buffer)
   (kill-all-local-variables)
   (setq slime-buffer-package package)
@@ -8893,12 +8895,8 @@
           (t 
            (error "Not a directory: %s" file)))))
 
-(slime-defun-if-undefined find-coding-system (coding-system)
-  (if (eq coding-system 'binary)
-      'binary))
-
 (slime-defun-if-undefined check-coding-system (coding-system)
-  (or (find-coding-system coding-system)
+  (or (eq coding-system 'binary)
       (error "No such coding system: %S" coding-system)))
 
 (slime-defun-if-undefined process-coding-system (process)