*** emacs-22.0.91/lisp/textmodes/table.el	Wed Jan  3 13:29:35 2007
--- ../../../emacs/emacs-22.0.91/lisp/textmodes/table.el	Wed Jan  3 13:23:46 2007
***************
*** 6,12 ****
  ;; Keywords: wp, convenience
  ;; Author: Takaaki Ota <Takaaki.Ota@am.sony.com>
  ;; Created: Sat Jul 08 2000 13:28:45 (PST)
! ;; Revised: Thu Jul 20 2006 17:30:09 (PDT)
  
  ;; This file is part of GNU Emacs.
  
--- 6,12 ----
  ;; Keywords: wp, convenience
  ;; Author: Takaaki Ota <Takaaki.Ota@am.sony.com>
  ;; Created: Sat Jul 08 2000 13:28:45 (PST)
! ;; Revised: Wed Jan 03 2007 13:23:46 (PST)
  
  ;; This file is part of GNU Emacs.
  
***************
*** 5358,5364 ****
      (cond ((and (featurep 'xemacs)
  		(not (get 'table-disable-incompatibility-warning 'xemacs)))
  	   (put 'table-disable-incompatibility-warning 'xemacs t)
! 	   (momentary-string-display
  	    "
  *** Warning ***
  
--- 5358,5364 ----
      (cond ((and (featurep 'xemacs)
  		(not (get 'table-disable-incompatibility-warning 'xemacs)))
  	   (put 'table-disable-incompatibility-warning 'xemacs t)
! 	   (display-warning 'table
  	    "
  *** Warning ***
  
***************
*** 5369,5380 ****
  aware of this.
  
  "
! 	    (save-excursion (forward-line 1) (point))))
  	  ((and (boundp 'flyspell-mode)
  		flyspell-mode
  		(not (get 'table-disable-incompatibility-warning 'flyspell)))
  	   (put 'table-disable-incompatibility-warning 'flyspell t)
! 	   (momentary-string-display
  	    "
  *** Warning ***
  
--- 5369,5380 ----
  aware of this.
  
  "
! 	    :warning))
  	  ((and (boundp 'flyspell-mode)
  		flyspell-mode
  		(not (get 'table-disable-incompatibility-warning 'flyspell)))
  	   (put 'table-disable-incompatibility-warning 'flyspell t)
! 	   (display-warning 'table
  	    "
  *** Warning ***
  
***************
*** 5383,5389 ****
  works better than the previous versions however not fully compatible.
  
  "
! 	    (save-excursion (forward-line 1) (point))))
  	  )))
  
  (defun table--cell-blank-str (&optional n)
--- 5383,5389 ----
  works better than the previous versions however not fully compatible.
  
  "
! 	    :warning))
  	  )))
  
  (defun table--cell-blank-str (&optional n)