This commit was generated by cvs2svn to compensate for changes in r50, which

[chise/xemacs-chise.git.1] / lisp / subr.el

diff --git a/lisp/subr.el b/lisp/subr.el
index d07033b..e1a2a29 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -88,9 +88,6 @@ Used for compatibility among different emacs variants."
 ;; XEmacs: not used.
 
 ;; XEmacs:
-(define-function 'not 'null)
-(define-function-when-void 'numberp 'integerp) ; different when floats
-
 (defun local-variable-if-set-p (sym buffer)
   "Return t if SYM would be local to BUFFER after it is set.
 A nil value for BUFFER is *not* the same as (current-buffer), but
@@ -540,11 +537,12 @@ yourself.]"
 
 ;;;; Miscellanea.
 
-(defun buffer-substring-no-properties (beg end)
-  "Return the text from BEG to END, without text properties, as a string."
-  (let ((string (buffer-substring beg end)))
-    (set-text-properties 0 (length string) nil string)
-    string))
+;; This is now in C.
+;(defun buffer-substring-no-properties (beg end)
+;  "Return the text from BEG to END, without text properties, as a string."
+;  (let ((string (buffer-substring beg end)))
+;    (set-text-properties 0 (length string) nil string)
+;    string))
 
 (defun get-buffer-window-list (&optional buffer minibuf frame)
   "Return windows currently displaying BUFFER, or nil if none.
@@ -585,12 +583,14 @@ This function accepts any number of arguments, but ignores them."
                                          (cons (cons name defs)
                                                abbrev-table-name-list)))))))
 
-(defun functionp (object)
-  "Non-nil if OBJECT can be called as a function."
-  (or (and (symbolp object) (fboundp object))
-      (subrp object)
-      (compiled-function-p object)
-      (eq (car-safe object) 'lambda)))
+;;; `functionp' has been moved into C.
+
+;;(defun functionp (object)
+;;  "Non-nil if OBJECT can be called as a function."
+;;  (or (and (symbolp object) (fboundp object))
+;;      (subrp object)
+;;      (compiled-function-p object)
+;;      (eq (car-safe object) 'lambda)))