Revert "Remove font-lock toggle from font-lock-update"

This reverts commit 23995414fec483287e7fb9c9a279483319f9fc54.

The subject is under discussion.

diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 3105242a1f8aa20e94a80067f86545be7ee2a4b5..82915d8c8b0777b016ba6b6181b1045d7b27dadc 100644 (file)
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -1120,13 +1120,17 @@ portion of the buffer."
     (funcall font-lock-ensure-function
              (or beg (point-min)) (or end (point-max)))))
 
-(defun font-lock-update ()
-  "Refontify the accessible portion of the buffer.
-Unconditionally activate `font-lock-mode'."
-  (interactive)
-  (unless font-lock-mode (font-lock-mode 1))
+(defun font-lock-update (&optional arg)
+  "Updates the syntax highlighting in this buffer.
+Refontify the accessible portion of this buffer, or enable Font Lock mode
+in this buffer if it is currently disabled.  With prefix ARG, toggle Font
+Lock mode."
+  (interactive "P")
   (save-excursion
-    (font-lock-fontify-region (point-min) (point-max))))
+    (if (and (not arg) font-lock-mode)
+        (font-lock-fontify-region (point-min) (point-max))
+      (font-lock-unfontify-region (point-min) (point-max))
+      (font-lock-mode 'toggle))))
 
 (defun font-lock-default-fontify-buffer ()
   "Fontify the whole buffer using `font-lock-fontify-region-function'."