[Emacs-diffs] Changes to emacs/lisp/font-lock.el

[Stefan Monnier]

Index: emacs/lisp/font-lock.el
diff -c emacs/lisp/font-lock.el:1.274 emacs/lisp/font-lock.el:1.275
*** emacs/lisp/font-lock.el:1.274       Mon Sep 12 15:36:10 2005
--- emacs/lisp/font-lock.el     Mon Sep 19 12:08:07 2005
***************
*** 1061,1067 ****
                                             'font-lock-multiline nil)
                          (point-max))))
          (goto-char end)
!         (setq end (line-beginning-position 2))
          ;; Now do the fontification.
          (font-lock-unfontify-region beg end)
          (when font-lock-syntactic-keywords
--- 1061,1068 ----
                                             'font-lock-multiline nil)
                          (point-max))))
          (goto-char end)
!         ;; Round up to a whole line.
!           (unless (bolp) (setq end (line-beginning-position 2)))
          ;; Now do the fontification.
          (font-lock-unfontify-region beg end)
          (when font-lock-syntactic-keywords
***************
*** 1073,1084 ****
        (set-syntax-table old-syntax-table))))
  
  ;; The following must be rethought, since keywords can override fontification.
! ;      ;; Now scan for keywords, but not if we are inside a comment now.
! ;      (or (and (not font-lock-keywords-only)
! ;            (let ((state (parse-partial-sexp beg end nil nil
! ;                                             font-lock-cache-state)))
! ;              (or (nth 4 state) (nth 7 state))))
! ;       (font-lock-fontify-keywords-region beg end))
  
  (defvar font-lock-extra-managed-props nil
    "Additional text properties managed by font-lock.
--- 1074,1085 ----
        (set-syntax-table old-syntax-table))))
  
  ;; The following must be rethought, since keywords can override fontification.
! ;;    ;; Now scan for keywords, but not if we are inside a comment now.
! ;;    (or (and (not font-lock-keywords-only)
! ;;             (let ((state (parse-partial-sexp beg end nil nil
! ;;                                              font-lock-cache-state)))
! ;;               (or (nth 4 state) (nth 7 state))))
! ;;        (font-lock-fontify-keywords-region beg end))
  
  (defvar font-lock-extra-managed-props nil
    "Additional text properties managed by font-lock.