[elpa] externals/org 4aa4ae8 08/11: Backport commit bbe88cd82 from Emacs

[ELPA Syncer]

branch: externals/org
commit 4aa4ae8cf0cff433ce5cd851f599c8ba0d6db7f7
Author: Stefan Kangas <stefan@marxist.se>
Commit: Kyle Meyer <kyle@kyleam.com>

    Backport commit bbe88cd82 from Emacs
    
    * lisp/org-table.el (org-table-edit-field):
    * lisp/org.el (org-restart-font-lock): Assume font-lock-mode variable
    is not void; it is preloaded.
    
    Assume font-lock-mode variable is not void
    bbe88cd82e4bbfd76df06223614ab74d1022c119
    Stefan Kangas
    Fri Feb 5 01:15:02 2021 +0100
---
 lisp/org-table.el | 2 +-
 lisp/org.el       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/lisp/org-table.el b/lisp/org-table.el
index ef4672e..1248efa 100644
--- a/lisp/org-table.el
+++ b/lisp/org-table.el
@@ -2008,7 +2008,7 @@ toggle `org-table-follow-field-mode'."
     (let ((b (save-excursion (skip-chars-backward "^|") (point)))
          (e (save-excursion (skip-chars-forward "^|\r\n") (point))))
       (remove-text-properties b e '(invisible t intangible t))
-      (if (and (boundp 'font-lock-mode) font-lock-mode)
+      (if font-lock-mode
          (font-lock-fontify-block))))
    (t
     (let ((pos (point-marker))
diff --git a/lisp/org.el b/lisp/org.el
index 2d21a44..e6a5cca 100644
--- a/lisp/org.el
+++ b/lisp/org.el
@@ -5520,7 +5520,7 @@ highlighting was done, nil otherwise."
 
 (defun org-restart-font-lock ()
   "Restart `font-lock-mode', to force refontification."
-  (when (and (boundp 'font-lock-mode) font-lock-mode)
+  (when font-lock-mode
     (font-lock-mode -1)
     (font-lock-mode 1)))