diff options
| author | Gerd Moellmann | 2001-02-13 09:02:36 +0000 |
|---|---|---|
| committer | Gerd Moellmann | 2001-02-13 09:02:36 +0000 |
| commit | e9fcba3d594a4cc5f3b59ed88011c1d74529cce3 (patch) | |
| tree | 0c87ecaaf55d74e94095ff156a28a9693f67ca76 | |
| parent | 78ad1cd532c8da14bb582a56221eb0e17c052855 (diff) | |
| download | emacs-e9fcba3d594a4cc5f3b59ed88011c1d74529cce3.tar.gz emacs-e9fcba3d594a4cc5f3b59ed88011c1d74529cce3.zip | |
(hi-lock-find-patterns): Don't activate font-lock-mode.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/hi-lock.el | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index ed9ea59cdbd..f4e08229246 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2001-02-13 David M. Koppelman <koppel@ee.lsu.edu> | ||
| 2 | |||
| 3 | * hi-lock.el (hi-lock-find-patterns): Don't activate font-lock-mode. | ||
| 4 | |||
| 1 | 2001-02-13 Miles Bader <miles@gnu.org> | 5 | 2001-02-13 Miles Bader <miles@gnu.org> |
| 2 | 6 | ||
| 3 | * faces.el (set-face-background, set-face-foreground) | 7 | * faces.el (set-face-background, set-face-foreground) |
diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el index 0ae3dbddce6..20961226cb5 100644 --- a/lisp/hi-lock.el +++ b/lisp/hi-lock.el | |||
| @@ -550,7 +550,6 @@ Optional argument END is maximum excursion." | |||
| 550 | (hi-lock-current-line))) nil)))) | 550 | (hi-lock-current-line))) nil)))) |
| 551 | (if patterns | 551 | (if patterns |
| 552 | (setq all-patterns (append patterns all-patterns)))))) | 552 | (setq all-patterns (append patterns all-patterns)))))) |
| 553 | (unless font-lock-mode (font-lock-mode)) | ||
| 554 | (when hi-lock-mode (hi-lock-set-file-patterns all-patterns)) | 553 | (when hi-lock-mode (hi-lock-set-file-patterns all-patterns)) |
| 555 | (if (interactive-p) | 554 | (if (interactive-p) |
| 556 | (message (format "Hi-lock added %d patterns." (length all-patterns))))))) | 555 | (message (format "Hi-lock added %d patterns." (length all-patterns))))))) |