(hi-lock-line-face-buffer): Wrap the regexp in a group

so ^, $, *, ? and + are interpreted correctly.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 2818191aec69409e68a608036f703dc9dd9ae5e6..29fa58fde3827bca0737f3b91b4fdb34aaf88a72 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2001-03-09  Stefan Monnier  <monnier@cs.yale.edu>
+
+       * hi-lock.el (hi-lock-line-face-buffer): Wrap the regexp in a group
+       so ^, $, *, ? and + are interpreted correctly.
+
 2001-03-09  Gerd Moellmann  <gerd@gnu.org>
 
        * help.el (string-key-binding): Renamed from

diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index 610a217916f2665991e326a926d92e9a608c0f08..e37cb94d1a96d35b5928b0ead11223ae9aadb1da 100644 (file)
--- a/lisp/hi-lock.el
+++ b/lisp/hi-lock.el
@@ -334,7 +334,9 @@ list maintained for regexps, global history maintained for faces.
   (unless hi-lock-mode (hi-lock-mode))
   (or (facep face) (setq face 'rwl-yellow))
   (hi-lock-set-pattern
-   (list (concat "^.*" regexp ".*$") (list 0 (list 'quote face) t))))
+   ;; The \\(?:...\\) grouping construct ensures that a leading ^, +, * or ?
+   ;; or a trailing $ in REGEXP will be interpreted correctly.
+   (list (concat "^.*\\(?:" regexp "\\).*$") (list 0 (list 'quote face) t))))
 
 
 ;;;###autoload