# HG changeset patch # User Gerd Moellmann # Date 980953834 0 # Node ID 1619fb3fdfa46cd7661a9d880aed2a9d01d37925 # Parent 08937734f6277e0cda0f2bb8379e1c7571a9340d (hi-lock-mode, hi-lock-line-face-buffer): Doc fix. (hi-lock-find-patterns): Turn on font-lock-mode, if it is not on already. diff -r 08937734f627 -r 1619fb3fdfa4 lisp/hi-lock.el --- a/lisp/hi-lock.el Wed Jan 31 15:06:28 2001 +0000 +++ b/lisp/hi-lock.el Wed Jan 31 15:10:34 2001 +0000 @@ -1,6 +1,6 @@ ;;; hi-lock.el --- Minor mode for interactive automatic highlighting. -;; Copyright (C) 2000 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001 Free Software Foundation, Inc. ;; Author: David M. Koppelman, koppel@ee.lsu.edu ;; Keywords: faces, minor-mode, matching, display @@ -243,7 +243,7 @@ "Toggle minor mode for interactively adding font-lock highlighting patterns. If ARG positive turn hi-lock on. Issuing a hi-lock command will also -turn hi-lock on. When hi-lock turned on an \"Automatic Highlighting\" +turn hi-lock on. When hi-lock is turned on an \"Automatic Highlighting\" submenu is added to the \"Edit\" menu. The commands in the submenu, which can be called interactively, are: @@ -308,7 +308,7 @@ Interactively, prompt for REGEXP then FACE. Buffer-local history list maintained for regexps, global history maintained for faces. \\Use \\[next-history-element] and \\[previous-history-element] to retrieve next or previous history item. -(See info node `Minibuffer History')" +\(See info node `Minibuffer History')" (interactive (list (hi-lock-regexp-okay @@ -330,7 +330,7 @@ Interactively, prompt for REGEXP then FACE. Buffer-local history list maintained for regexps, global history maintained for faces. \\Use \\[next-history-element] and \\[previous-history-element] to retrieve next or previous history item. -(See info node `Minibuffer History')" +\(See info node `Minibuffer History')" (interactive (list (hi-lock-regexp-okay @@ -514,6 +514,7 @@ (setq all-patterns (append patterns all-patterns)))))) (if (and (not hi-lock-mode) all-patterns) (hi-lock-mode 1)) + (unless font-lock-mode (font-lock-mode)) (if hi-lock-mode (hi-lock-set-file-patterns all-patterns)) (if (interactive-p) (message (format "Hi-lock added %d patterns." (length all-patterns)))))))