XEmacs 21.4.7 "Economic Science".

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

diff --git a/lisp/obsolete.el b/lisp/obsolete.el
index 635f368..3f83e0a 100644 (file)
--- a/lisp/obsolete.el
+++ b/lisp/obsolete.el
@@ -57,7 +57,7 @@ This makes referencing or setting OLDVAR equivalent to referencing or
 setting NEWVAR and marks OLDVAR as obsolete.
 If OLDVAR was bound and NEWVAR was not, Set NEWVAR to OLDVAR.
 
-Note: Use this before any other references (defvar/defcustom) to NEWVAR"
+Note: Use this before any other references (defvar/defcustom) to NEWVAR."
   (let ((needs-setting (and (boundp oldvar) (not (boundp newvar))))
         (value (and (boundp oldvar) (symbol-value oldvar))))
      (defvaralias oldvar newvar)
@@ -257,6 +257,11 @@ set Info-directory-list.")
 
 (make-obsolete-variable 'executing-macro 'executing-kbd-macro)
 
+(define-compatible-function-alias 'interactive-form 
+  'function-interactive) ;GNU 21.1
+(define-compatible-function-alias 'assq-delete-all
+  'remassq) ;GNU 21.1
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;; modeline
 
 (define-compatible-function-alias 'redraw-mode-line 'redraw-modeline)
@@ -338,13 +343,13 @@ Multibyte characters are concerned."
   "Return a vector of characters in STRING."
   (mapvector #'identity string))
 
-(defun store-substring (string idx obj)
-  "Embed OBJ (string or character) at index IDX of STRING."
-  (let* ((str (cond ((stringp obj) obj)
-                   ((characterp obj) (char-to-string obj))
+(defun store-substring (string idx object)
+  "Embed OBJECT (string or character) at index IDX of STRING."
+  (let* ((str (cond ((stringp object) object)
+                   ((characterp object) (char-to-string object))
                    (t (error
                        "Invalid argument (should be string or character): %s"
-                       obj))))
+                       object))))
         (string-len (length string))
         (len (length str))
         (i 0))