From ed6f2cd47f126b38f81ab0f45b7da42a8ae1985f Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Mon, 10 Dec 2012 16:26:13 -0500 Subject: [PATCH] * lisp/hi-lock.el (hi-lock--regexps-at-point): Fix boundary case for font-lock as well as when there's no text-property. --- lisp/ChangeLog | 5 +++++ lisp/hi-lock.el | 40 +++++++++++++++++++++++++++------------- 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/lisp/ChangeLog b/lisp/ChangeLog index c75a6a9719f..aa870591e23 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,8 @@ +2012-12-10 Stefan Monnier + + * hi-lock.el (hi-lock--regexps-at-point): Fix boundary case for + font-lock as well as when there's no text-property. + 2012-12-10 Jambunathan K * hi-lock.el: Refine the choice of default face. diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el index a6ad4dd26e0..2ae328a09e8 100644 --- a/lisp/hi-lock.el +++ b/lisp/hi-lock.el @@ -474,19 +474,33 @@ updated as you type." (let ((regexp (get-char-property (point) 'hi-lock-overlay-regexp))) (when regexp (push regexp regexps))) ;; With font-locking on, check if the cursor is on a highlighted text. - (and (memq (face-at-point) - (mapcar #'hi-lock-keyword->face hi-lock-interactive-patterns)) - (let* ((hi-text - (buffer-substring-no-properties - (previous-single-property-change (point) 'face) - (next-single-property-change (point) 'face)))) - ;; Compute hi-lock patterns that match the - ;; highlighted text at point. Use this later in - ;; during completing-read. - (dolist (hi-lock-pattern hi-lock-interactive-patterns) - (let ((regexp (car hi-lock-pattern))) - (if (string-match regexp hi-text) - (push regexp regexps)))))) + (let ((face-after (get-text-property (point) 'face)) + (face-before + (unless (bobp) (get-text-property (1- (point)) 'face))) + (faces (mapcar #'hi-lock-keyword->face + hi-lock-interactive-patterns))) + (unless (memq face-before faces) (setq face-before nil)) + (unless (memq face-after faces) (setq face-after nil)) + (when (and face-before face-after (not (eq face-before face-after))) + (setq face-before nil)) + (when (or face-after face-before) + (let* ((hi-text + (buffer-substring-no-properties + (if face-before + (or (previous-single-property-change (point) 'face) + (point-min)) + (point)) + (if face-after + (or (next-single-property-change (point) 'face) + (point-max)) + (point))))) + ;; Compute hi-lock patterns that match the + ;; highlighted text at point. Use this later in + ;; during completing-read. + (dolist (hi-lock-pattern hi-lock-interactive-patterns) + (let ((regexp (car hi-lock-pattern))) + (if (string-match regexp hi-text) + (push regexp regexps))))))) regexps)) (defvar-local hi-lock--unused-faces nil -- 2.39.5