/[emacs]/emacs/lisp/font-lock.el
ViewVC logotype

Diff of /emacs/lisp/font-lock.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.274 by rms, Mon Sep 12 15:36:10 2005 UTC revision 1.275 by monnier, Mon Sep 19 12:08:07 2005 UTC
# Line 1061  a very meaningful entity to highlight.") Line 1061  a very meaningful entity to highlight.")
1061                                               'font-lock-multiline nil)                                               'font-lock-multiline nil)
1062                            (point-max))))                            (point-max))))
1063            (goto-char end)            (goto-char end)
1064            (setq end (line-beginning-position 2))            ;; Round up to a whole line.
1065              (unless (bolp) (setq end (line-beginning-position 2)))
1066            ;; Now do the fontification.            ;; Now do the fontification.
1067            (font-lock-unfontify-region beg end)            (font-lock-unfontify-region beg end)
1068            (when font-lock-syntactic-keywords            (when font-lock-syntactic-keywords
# Line 1073  a very meaningful entity to highlight.") Line 1074  a very meaningful entity to highlight.")
1074        (set-syntax-table old-syntax-table))))        (set-syntax-table old-syntax-table))))
1075    
1076  ;; The following must be rethought, since keywords can override fontification.  ;; The following must be rethought, since keywords can override fontification.
1077  ;      ;; Now scan for keywords, but not if we are inside a comment now.  ;;    ;; Now scan for keywords, but not if we are inside a comment now.
1078  ;      (or (and (not font-lock-keywords-only)  ;;    (or (and (not font-lock-keywords-only)
1079  ;              (let ((state (parse-partial-sexp beg end nil nil  ;;             (let ((state (parse-partial-sexp beg end nil nil
1080  ;                                               font-lock-cache-state)))  ;;                                              font-lock-cache-state)))
1081  ;                (or (nth 4 state) (nth 7 state))))  ;;               (or (nth 4 state) (nth 7 state))))
1082  ;         (font-lock-fontify-keywords-region beg end))  ;;        (font-lock-fontify-keywords-region beg end))
1083    
1084  (defvar font-lock-extra-managed-props nil  (defvar font-lock-extra-managed-props nil
1085    "Additional text properties managed by font-lock.    "Additional text properties managed by font-lock.

Legend:
Removed from v.1.274  
changed lines
  Added in v.1.275

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26