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

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

diff --git a/lisp/obsolete.el b/lisp/obsolete.el
index 8e8571f..a205c6b 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.
 
 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)
   (let ((needs-setting (and (boundp oldvar) (not (boundp newvar))))
         (value (and (boundp oldvar) (symbol-value oldvar))))
      (defvaralias oldvar newvar)

@@ -171,10 +171,6 @@ If you want to change the locations where XEmacs looks for info files,
 set Info-directory-list.")
 (make-obsolete-variable 'Info-default-directory-list 'Info-directory-list)
 
 set Info-directory-list.")
 (make-obsolete-variable 'Info-default-directory-list 'Info-directory-list)
 

-(defvar init-file-user nil
-  "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)
-

 ;;;;;;;;;;;;;;;;;;;;;;;;;;;; hooks
 
 (make-compatible-variable 'lisp-indent-hook 'lisp-indent-function)
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;; hooks
 
 (make-compatible-variable 'lisp-indent-hook 'lisp-indent-function)

@@ -219,8 +215,8 @@ set Info-directory-list.")
 
 (defun add-menu (menu-path menu-name menu-items &optional before)
   "See the function `add-submenu'."
 
 (defun add-menu (menu-path menu-name menu-items &optional before)
   "See the function `add-submenu'."

-  (or menu-name (error "must specify a menu name"))
-  (or menu-items (error "must specify some menu items"))
+  (or menu-name (error (gettext "must specify a menu name")))
+  (or menu-items (error (gettext "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)
   (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)

@@ -246,11 +242,6 @@ set Info-directory-list.")
 (define-compatible-function-alias 'byte-code-function-p
   'compiled-function-p) ;FSFmacs
 
 (define-compatible-function-alias 'byte-code-function-p
   'compiled-function-p) ;FSFmacs
 

-(define-obsolete-function-alias 'isearch-yank-x-selection
-  'isearch-yank-selection)
-(define-obsolete-function-alias 'isearch-yank-x-clipboard
-  'isearch-yank-clipboard)
-

 ;; too bad there's not a way to check for aref, assq, and nconc
 ;; being called on the values of functions known to return keymaps,
 ;; or known to return vectors of events instead of strings...
 ;; too bad there's not a way to check for aref, assq, and nconc
 ;; being called on the values of functions known to return keymaps,
 ;; or known to return vectors of events instead of strings...

@@ -338,13 +329,13 @@ Multibyte characters are concerned."
   "Return a vector of characters in STRING."
   (mapvector #'identity string))
 
   "Return a vector of characters in STRING."
   (mapvector #'identity string))
 

-(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))
+(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))

                    (t (error
                        "Invalid argument (should be string or character): %s"
                    (t (error
                        "Invalid argument (should be string or character): %s"

-                       object))))
+                       obj))))

         (string-len (length string))
         (len (length str))
         (i 0))
         (string-len (length string))
         (len (length str))
         (i 0))

@@ -353,9 +344,9 @@ Multibyte characters are concerned."
       (setq idx (1+ idx) i (1+ i)))
     string))
 
       (setq idx (1+ idx) i (1+ i)))
     string))
 

-;; #### This function is not compatible with FSF in some cases.  Hard
+;; ### This function is not compatible with FSF in some cases.  Hard

 ;; to fix, because it is hard to trace the logic of the FSF function.
 ;; to fix, because it is hard to trace the logic of the FSF function.

-;; In case we need the exact behavior, we can always copy the FSF
+;; In case we need the exact behaviour, we can always copy the FSF

 ;; version, which is very long and does lots of unnecessary stuff.
 (defun truncate-string-to-width (str end-column &optional start-column padding)
   "Truncate string STR to end at column END-COLUMN.
 ;; version, which is very long and does lots of unnecessary stuff.
 (defun truncate-string-to-width (str end-column &optional start-column padding)
   "Truncate string STR to end at column END-COLUMN.

@@ -386,5 +377,4 @@ the resulting string may be narrower than END-COLUMN."
 
 (make-obsolete 'function-called-at-point 'function-at-point)
 
 
 (make-obsolete 'function-called-at-point 'function-at-point)
 

-(provide 'obsolete)

 ;;; obsolete.el ends here
 ;;; obsolete.el ends here