X-Git-Url: http://git.chise.org/gitweb/?a=blobdiff_plain;f=lisp%2Fobsolete.el;h=2cb80438f05c91a6df9b914376f37aaf206e4f1d;hb=93b4859ea602158208485a5b1253e46be6da4e53;hp=335a0164103edc4d23c09987e8a13b1cdd27472c;hpb=716cfba952c1dc0d2cf5c968971f3780ba728a89;p=chise%2Fxemacs-chise.git.1

diff --git a/lisp/obsolete.el b/lisp/obsolete.el
index 335a016..2cb8043 100644
--- 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)
@@ -106,6 +106,8 @@ setting NEWVAR and marks OLDVAR as provided for compatibility only."
 (make-obsolete 'set-window-dot 'set-window-point)
 
 (define-obsolete-function-alias 'extent-buffer 'extent-object)
+(define-compatible-variable-alias 'parse-sexp-lookup-properties
+  'lookup-syntax-properties)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;; frames
 (defun frame-first-window (frame)
@@ -175,6 +177,8 @@ set Info-directory-list.")
   "This used to be the name of the user whose init file was read at startup.")
 (make-obsolete-variable 'init-file-user 'load-user-init-file-p)
 
+(define-obsolete-function-alias 'pui-add-install-directory
+  'pui-set-local-package-get-directory) ; misleading name
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;; hooks
 
 (make-compatible-variable 'lisp-indent-hook 'lisp-indent-function)
@@ -219,12 +223,15 @@ set Info-directory-list.")
 
 (defun add-menu (menu-path menu-name menu-items &optional before)
   "See the function `add-submenu'."
-  (or menu-name (error (gettext "must specify a menu name")))
-  (or menu-items (error (gettext "must specify some menu items")))
+  (or menu-name (error "must specify a menu name"))
+  (or menu-items (error "must specify some menu items"))
   (add-submenu menu-path (cons menu-name menu-items) before))
 ;; Can't make this obsolete.  easymenu depends on it.
 (make-compatible 'add-menu 'add-submenu)
 
+(define-obsolete-function-alias 'package-get-download-menu 
+  'package-ui-download-menu)
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;; minibuffer
 
 (define-compatible-function-alias 'read-minibuffer
@@ -257,6 +264,14 @@ 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
+
+(define-compatible-function-alias 'line-beginning-position 'point-at-bol)
+(define-compatible-function-alias 'line-end-position 'point-at-eol)
+
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;; modeline
 
 (define-compatible-function-alias 'redraw-mode-line 'redraw-modeline)
@@ -338,13 +353,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))
@@ -386,5 +401,8 @@ the resulting string may be narrower than END-COLUMN."
 
 (make-obsolete 'function-called-at-point 'function-at-point)
 
+(when (featurep 'utf-2000)
+  (make-obsolete-variable 'utf-2000-version 'xemacs-chise-version))
+
 (provide 'obsolete)
 ;;; obsolete.el ends here