Mercurial > emacs
diff lisp/font-lock.el @ 83231:549734260e34
Merged in changes from CVS trunk.
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-714
Update from CVS
git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-271
| author | Karoly Lorentey <lorentey@elte.hu> |
|---|---|
| date | Wed, 08 Dec 2004 22:20:27 +0000 |
| parents | 2a3f27a45698 8d1a39cde5e3 |
| children | c7d2b6ee3a80 |
line wrap: on
line diff
--- a/lisp/font-lock.el Sun Nov 28 14:39:06 2004 +0000 +++ b/lisp/font-lock.el Wed Dec 08 22:20:27 2004 +0000 @@ -958,7 +958,8 @@ (funcall font-lock-fontify-region-function beg end loudly)) (defun font-lock-unfontify-region (beg end) - (funcall font-lock-unfontify-region-function beg end)) + (save-buffer-state nil + (funcall font-lock-unfontify-region-function beg end))) (defun font-lock-default-fontify-buffer () (let ((verbose (if (numberp font-lock-verbose) @@ -1046,13 +1047,12 @@ what properties to clear before refontifying a region.") (defun font-lock-default-unfontify-region (beg end) - (save-buffer-state nil - (remove-list-of-text-properties - beg end (append - font-lock-extra-managed-props - (if font-lock-syntactic-keywords - '(syntax-table face font-lock-multiline) - '(face font-lock-multiline)))))) + (remove-list-of-text-properties + beg end (append + font-lock-extra-managed-props + (if font-lock-syntactic-keywords + '(syntax-table face font-lock-multiline) + '(face font-lock-multiline))))) ;; Called when any modification is made to buffer text. (defun font-lock-after-change-function (beg end old-len) @@ -1456,7 +1456,7 @@ (concat "^\\(?:" defun-prompt-regexp "\\)?\\s(") "^\\s(") (0 - (if (memq (get-text-property (1- (point)) 'face) + (if (memq (get-text-property (match-beginning 0) 'face) '(font-lock-string-face font-lock-doc-face font-lock-comment-face)) font-lock-warning-face)