--- a/lisp/prim/obsolete.el	Mon Aug 13 09:00:04 2007 +0200
+++ b/lisp/prim/obsolete.el	Mon Aug 13 09:02:59 2007 +0200
@@ -21,7 +21,7 @@
 
 ;; You should have received a copy of the GNU General Public License
 ;; along with XEmacs; see the file COPYING.  If not, write to the 
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+;; Free Software Foundation, 59 Temple Place - Suite 330,
 ;; Boston, MA 02111-1307, USA.
 
 ;;; The obsoleteness support used to be scattered throughout various
@@ -38,13 +38,6 @@
   (define-function oldfun newfun)
   (make-obsolete oldfun newfun))
 
-(defsubst define-compatible-function-alias (oldfun newfun)
-  "Define OLDFUN as a compatible alias for function NEWFUN.
-This makes calling OLDFUN equivalent to calling NEWFUN and marks OLDFUN
-as provided for compatibility only."
-  (define-function oldfun newfun)
-  (make-compatible oldfun newfun))
-
 (defsubst define-obsolete-variable-alias (oldvar newvar)
   "Define OLDVAR as an obsolete alias for varction NEWVAR.
 This makes referencing or setting OLDVAR equivalent to referencing or
@@ -52,40 +45,33 @@
   (defvaralias oldvar newvar)
   (make-obsolete-variable oldvar newvar))
 
-(defsubst define-compatible-variable-alias (oldvar newvar)
-  "Define OLDVAR as a compatible alias for varction NEWVAR.
-This makes referencing or setting OLDVAR equivalent to referencing or
-setting NEWVAR and marks OLDVAR as provided for compatibility only."
-  (defvaralias oldvar newvar)
-  (make-compatible-variable oldvar newvar))
-
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;; device stuff
 
-(make-compatible-variable 'window-system "use (console-type)")
+(make-obsolete-variable 'window-system "use (console-type)")
 (make-obsolete-variable 'meta-flag
 			"use the `set-input-mode' function instead.")
 
 (defun x-display-color-p (&optional device)
   "Returns non-nil if DEVICE is a color device."
   (eq 'color (device-class device)))
-(make-compatible 'x-display-color-p 'device-class)
+(make-obsolete 'x-display-color-p 'device-class)
 
 (define-function 'x-color-display-p 'x-display-color-p)
-(make-compatible 'x-display-color-p 'device-class)
+(make-obsolete 'x-display-color-p 'device-class)
 
 (defun x-display-grayscale-p (&optional device)
   "Returns non-nil if DEVICE is a grayscale device."
   (eq 'grayscale (device-class device)))
-(make-compatible 'x-display-grayscale-p 'device-class)
+(make-obsolete 'x-display-grayscale-p 'device-class)
 
 (define-function 'x-grayscale-display-p 'x-display-grayscale-p)
-(make-compatible 'x-display-grayscale-p 'device-class)
+(make-obsolete 'x-display-grayscale-p 'device-class)
 
-(define-compatible-function-alias 'x-display-pixel-width 'device-pixel-width)
-(define-compatible-function-alias 'x-display-pixel-height
+(define-obsolete-function-alias 'x-display-pixel-width 'device-pixel-width)
+(define-obsolete-function-alias 'x-display-pixel-height
   'device-pixel-height)
-(define-compatible-function-alias 'x-display-planes 'device-bitplanes)
-(define-compatible-function-alias 'x-display-color-cells 'device-color-cells)
+(define-obsolete-function-alias 'x-display-planes 'device-bitplanes)
+(define-obsolete-function-alias 'x-display-color-cells 'device-color-cells)
 
 (define-obsolete-function-alias 'baud-rate 'device-baud-rate)
 
@@ -260,7 +246,7 @@
 (define-obsolete-variable-alias 'default-tty-frame-alist
   'default-tty-frame-plist)
 
-(make-compatible 'frame-parameters 'frame-property)
+(make-obsolete 'frame-parameters 'frame-property)
 (defun frame-parameters (&optional frame)
   "Return the parameters-alist of frame FRAME.
 It is a list of elements of the form (PARM . VALUE), where PARM is a symbol.
@@ -279,7 +265,7 @@
   ;; future.
   (destructive-plist-to-alist (frame-properties frame)))
 
-(make-compatible 'modify-frame-parameters 'set-frame-properties)
+(make-obsolete 'modify-frame-parameters 'set-frame-properties)
 (defun modify-frame-parameters (frame alist)
   "Modify the properties of frame FRAME according to ALIST.
 ALIST is an alist of properties to change and their new values.
@@ -322,7 +308,7 @@
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;; insertion and deletion
 
 (define-obsolete-function-alias 'insert-and-inherit 'insert)
-(define-obsolete-function-alias 'insert-before-markers-and-inherit
+(define-obsolete-function-alias 'insert-before-markers-and-inerhit
   'insert-before-markers)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;; keymaps
@@ -330,13 +316,13 @@
 (defun keymap-parent (keymap)
   "Returns the first parent of the given keymap."
   (car (keymap-parents keymap)))
-(make-compatible 'keymap-parent 'keymap-parents)
+(make-obsolete 'keymap-parent 'keymap-parents)
 
 (defun set-keymap-parent (keymap parent)
   "Makes the given keymap have (only) the given parent."
   (set-keymap-parents keymap (if parent (list parent) '()))
   parent)
-(make-compatible 'set-keymap-parent 'set-keymap-parents)
+(make-obsolete 'set-keymap-parent 'set-keymap-parents)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;; menu stuff
 
@@ -393,20 +379,20 @@
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;; modeline
 
-(define-compatible-function-alias 'redraw-mode-line 'redraw-modeline)
-(define-compatible-function-alias 'force-mode-line-update
+(define-obsolete-function-alias 'redraw-mode-line 'redraw-modeline)
+(define-obsolete-function-alias 'force-mode-line-update
   'redraw-modeline) ;; FSF compatibility
-(define-compatible-variable-alias 'mode-line-map 'modeline-map)
-(define-compatible-variable-alias 'mode-line-buffer-identification
+(define-obsolete-variable-alias 'mode-line-map 'modeline-map)
+(define-obsolete-variable-alias 'mode-line-buffer-identification
   'modeline-buffer-identification)
-(define-compatible-variable-alias 'mode-line-process 'modeline-process)
-(define-compatible-variable-alias 'mode-line-modified 'modeline-modified)
-(make-compatible-variable 'mode-line-inverse-video
+(define-obsolete-variable-alias 'mode-line-process 'modeline-process)
+(define-obsolete-variable-alias 'mode-line-modified 'modeline-modified)
+(make-obsolete-variable 'mode-line-inverse-video
 			"use set-face-highlight-p and set-face-reverse-p")
-(define-compatible-variable-alias 'default-mode-line-format
+(define-obsolete-variable-alias 'default-mode-line-format
   'default-modeline-format)
-(define-compatible-variable-alias 'mode-line-format 'modeline-format)
-(define-compatible-variable-alias 'mode-line-menu 'modeline-menu)
+(define-obsolete-variable-alias 'mode-line-format 'modeline-format)
+(define-obsolete-variable-alias 'mode-line-menu 'modeline-menu)
 
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;; mouse
 
@@ -595,20 +581,3 @@
 (define-obsolete-function-alias 'set-pixmap-contributes-to-line-height
   'set-glyph-contrib-p)
 
-;; the functionality of column.el has been moved into C
-(defalias 'display-column-mode 'column-number-mode)
-
-(defun x-color-values  (color &optional frame)
-  "Return a description of the color named COLOR on frame FRAME.
-The value is a list of integer RGB values--(RED GREEN BLUE).
-These values appear to range from 0 to 65280 or 65535, depending
-on the system; white is (65280 65280 65280) or (65535 65535 65535).
-If FRAME is omitted or nil, use the selected frame."
-  (color-instance-rgb-components (make-color-instance color)))
-(make-compatible 'x-color-values 'color-instance-rgb-components)
-
-;; Two loser functions which shouldn't be used.
-(make-obsolete 'following-char 'char-after)
-(make-obsolete 'preceding-char 'char-after)
-
-;;; obsoloete.el ends here