[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#40337: 28.0.50; Enable case-fold-search in hi-lock
From: |
Juri Linkov |
Subject: |
bug#40337: 28.0.50; Enable case-fold-search in hi-lock |
Date: |
Tue, 31 Mar 2020 01:32:55 +0300 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/28.0.50 (x86_64-pc-linux-gnu) |
X-Debbugs-Cc: Stefan Monnier <monnier@iro.umontreal.ca>
A new defcustom hi-lock-case-fold-search is intended to fix
the long-standing deficiency in hi-lock.el to avoid such
ugly hacks as in hi-lock-process-phrase:
;; FIXME fragile; better to just bind case-fold-search? (Bug#7161)
(setq mod-phrase
(replace-regexp-in-string
"\\(^\\|\\s-\\)\\([a-z]\\)"
(lambda (m) (format "%s[%s%s]"
(match-string 1 m)
(upcase (match-string 2 m))
(match-string 2 m))) phrase))
and in isearch--highlight-regexp-or-lines:
;; Turn isearch-string into a case-insensitive
;; regexp.
(mapconcat
(lambda (c)
(let ((s (string c)))
(if (string-match "[[:alpha:]]" s)
(format "[%s%s]" (upcase s) (downcase s))
(regexp-quote s))))
isearch-string "")
Also these hacks fail when hi-lock is called from isearch by
isearch-highlight-regexp when regexp-based char-fold is enabled -
hi-lock highlights less matches than are lazy-highlighted in isearch,
it doesn't take into account the value of isearch-case-fold-search
and these hacks are unable to change the regexp generated by char-fold.
But when a new option hi-lock-case-fold-search is enabled, it updates
font-lock-keywords-case-fold-search that makes hi-lock matches
case-insensitive:
diff --git a/lisp/hi-lock.el b/lisp/hi-lock.el
index de258935e1..9394e2e157 100644
--- a/lisp/hi-lock.el
+++ b/lisp/hi-lock.el
@@ -135,6 +135,11 @@ hi-lock-file-patterns-policy
;; It can have a function value.
(put 'hi-lock-file-patterns-policy 'risky-local-variable t)
+(defcustom hi-lock-case-fold-search t
+ "Non-nil means the patterns for `font-lock' are case-insensitive."
+ :type 'boolean
+ :version "28.1")
+
(defcustom hi-lock-auto-select-face nil
"Non-nil means highlighting commands do not prompt for the face to use.
Instead, each hi-lock command will cycle through the faces in
@@ -394,6 +399,7 @@ hi-lock-mode
(progn
(define-key-after menu-bar-edit-menu [hi-lock]
(cons "Regexp Highlighting" hi-lock-menu))
+ (setq-local font-lock-keywords-case-fold-search
hi-lock-case-fold-search)
(hi-lock-find-patterns)
(add-hook 'font-lock-mode-hook 'hi-lock-font-lock-hook nil t)
;; Remove regexps from font-lock-keywords (bug#13891).
- bug#40337: 28.0.50; Enable case-fold-search in hi-lock,
Juri Linkov <=