mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-24 10:38:38 +00:00
Code Issues Releases Activity

* lisp/hi-lock.el (hi-lock--regexps-at-point): Fix boundary case for

Browse Source 
font-lock as well as when there's no text-property.
This commit is contained in:
Stefan Monnier 2012-12-10 16:26:13 -05:00
parent 5b55e0b70f
commit ed6f2cd47f
2 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2012-12-10 Stefan Monnier <monnier@iro.umontreal.ca>
* 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 <kjambunathan@gmail.com>
* hi-lock.el: Refine the choice of default face.

40
lisp/hi-lock.el
View File

@ -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