Sync to HEAD

1 files changed, 7 insertions, 2 deletions

diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index 2edf604ecbf..93ea3cc0c14 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -5,7 +5,7 @@
 ;; Keywords: wp, convenience
 ;; Author: Takaaki Ota <Takaaki.Ota@am.sony.com>
 ;; Created: Sat Jul 08 2000 13:28:45 (PST)
-;; Revised: jue jun 05 2003 22:00:02 (Hora de verano romance)
+;; Revised: Tue Dec 09 2003 14:36:50 (PST)
 
 ;; This file is part of GNU Emacs.
 
@@ -837,6 +837,9 @@ simply by any key input."
   :type 'hook
   :group 'table-hooks)
 
+(defcustom table-yank-handler '(nil nil t nil)
+  "*yank-handler for table.")
+
 (setplist 'table-disable-incompatibility-warning nil)
 
 (defvar table-disable-menu (null (and (locate-library "easymenu")
@@ -5228,7 +5231,8 @@ and the right cell border character."
 
 (defun table--put-cell-indicator-property (beg end &optional object)
   "Put cell property which indicates that the location is within a table cell."
-  (put-text-property beg end 'table-cell t object))
+  (put-text-property beg end 'table-cell t object)
+  (put-text-property beg end 'yank-handler table-yank-handler object))
 
 (defun table--put-cell-face-property (beg end &optional object)
   "Put cell face property."
@@ -5587,4 +5591,5 @@ It returns COLUMN unless STR contains some wide characters."
 ;; End: ***
 ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 
+;;; arch-tag: 0d69b03e-aa5f-4e72-8806-5727217617e0
 ;;; table.el ends here