(font-lock-fontify-anchored-keywords): Use line-beginning-position.

(font-lock-support-mode) <defgroup>: Add :version.
(global-font-lock-mode): Use mapc.

2 files changed, 13 insertions, 5 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 86e476993ec..791d4c6ecb9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
+2000-06-23  Dave Love  <fx@gnu.org>
+
+        * font-lock.el (font-lock-support-mode) <defgroup>: Add :version.
+        (font-lock-fontify-anchored-keywords): Use
+        line-beginning-position.
+        (global-font-lock-mode): Use mapc.
+
 2000-06-23  Stefan Monnier  <monnier@cs.yale.edu>
 
         * eshell/esh-module.el: Require CL when compiling.
diff --git a/lisp/font-lock.el b/lisp/font-lock.el
index 9bf9f8e0810..adaa514574a 100644
--- a/lisp/font-lock.el
+++ b/lisp/font-lock.el
@@ -954,10 +954,10 @@ turned on in a buffer if its major mode is one of `font-lock-global-modes'."
            (setq font-lock-buffers (buffer-list)))
           (t
            (remove-hook 'find-file-hooks 'turn-on-font-lock-if-enabled)
-           (mapcar (function (lambda (buffer)
-                               (with-current-buffer buffer
-                                 (when font-lock-mode
-                                   (font-lock-mode)))))
+           (mapc (function (lambda (buffer)
+                             (with-current-buffer buffer
+                               (when font-lock-mode
+                                 (font-lock-mode)))))
                    (buffer-list))))
     (when message
       (message "Global Font Lock mode %s." (if on-p "enabled" "disabled")))
@@ -1072,6 +1072,7 @@ The value of this variable is used when Font Lock mode is turned on."
                                       (const :tag "lazy lock" lazy-lock-mode)
                                       (const :tag "JIT lock" jit-lock-mode)))
                          ))
+  :version "21.1"
   :group 'font-lock)
 
 (defvar fast-lock-mode nil)
@@ -1582,7 +1583,7 @@ LIMIT can be modified by the value of its PRE-MATCH-FORM."
       (when (and font-lock-multiline
                  (funcall (if (eq font-lock-multiline t) '>= '>)
                           pre-match-value
-                          (save-excursion (forward-line 1) (point))))
+                          (line-beginning-position 2)))
         ;; this is a multiline anchored match
         (setq font-lock-multiline t)
         (put-text-property (point) limit 'font-lock-multiline t)))