From: Lars Ingebrigtsen <larsi@gnus.org>
Date: Sun, 17 Nov 2019 09:06:28 +0000 (+0100)
Subject: Make tables more resistant to major mode changes
X-Git-Tag: emacs-27.0.90~590
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ca3eb85495e61b7255c2c5466fd1cdae7c9fa8d4;p=emacs.git

Make tables more resistant to major mode changes

* lisp/textmodes/table.el (table--put-cell-face-property)
(table--remove-cell-properties): Ensure that we don't lose the
table face when switching from buffers with font locking to ones
without (or vice versa) (bug#35481).
---

diff --git a/lisp/textmodes/table.el b/lisp/textmodes/table.el
index 839df035d27..92aaa46ad6d 100644
--- a/lisp/textmodes/table.el
+++ b/lisp/textmodes/table.el
@@ -5151,7 +5151,7 @@ and the right cell border character."
 
 (defun table--put-cell-face-property (beg end &optional object)
   "Put cell face property."
-  (put-text-property beg end 'face 'table-cell object))
+  (put-text-property beg end 'font-lock-face 'table-cell object))
 
 (defun table--put-cell-keymap-property (beg end &optional object)
   "Put cell keymap property."
@@ -5178,7 +5178,7 @@ instead of the current buffer and returns the OBJECT."
 				   'table-cell nil
 				   'table-justify nil
 				   'table-valign nil
-				   'face nil
+				   'font-lock-face nil
 				   'rear-nonsticky nil
 				   'cursor-sensor-functions nil
 				   'keymap nil)