2012-12-06 16:17:11 +00:00
|
|
|
;;; hi-lock.el --- minor mode for interactive automatic highlighting -*- lexical-binding: t -*-
|
2000-08-02 21:29:36 +00:00
|
|
|
|
2021-01-01 09:13:56 +00:00
|
|
|
;; Copyright (C) 2000-2021 Free Software Foundation, Inc.
|
2000-08-02 21:29:36 +00:00
|
|
|
|
2008-12-19 05:29:04 +00:00
|
|
|
;; Author: David M. Koppelman <koppel@ece.lsu.edu>
|
2000-08-02 21:29:36 +00:00
|
|
|
;; Keywords: faces, minor-mode, matching, display
|
|
|
|
|
|
|
|
;; This file is part of GNU Emacs.
|
|
|
|
|
2008-05-06 08:06:51 +00:00
|
|
|
;; GNU Emacs is free software: you can redistribute it and/or modify
|
2000-08-02 21:29:36 +00:00
|
|
|
;; it under the terms of the GNU General Public License as published by
|
2008-05-06 08:06:51 +00:00
|
|
|
;; the Free Software Foundation, either version 3 of the License, or
|
|
|
|
;; (at your option) any later version.
|
2000-08-02 21:29:36 +00:00
|
|
|
|
|
|
|
;; GNU Emacs is distributed in the hope that it will be useful,
|
|
|
|
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
;; GNU General Public License for more details.
|
|
|
|
|
|
|
|
;; You should have received a copy of the GNU General Public License
|
2017-09-13 22:52:52 +00:00
|
|
|
;; along with GNU Emacs. If not, see <https://www.gnu.org/licenses/>.
|
2000-08-02 21:29:36 +00:00
|
|
|
|
2001-07-16 12:23:00 +00:00
|
|
|
;;; Commentary:
|
2003-02-04 11:26:42 +00:00
|
|
|
;;
|
2000-08-02 21:29:36 +00:00
|
|
|
;; With the hi-lock commands text matching interactively entered
|
|
|
|
;; regexp's can be highlighted. For example, `M-x highlight-regexp
|
|
|
|
;; RET clearly RET RET' will highlight all occurrences of `clearly'
|
|
|
|
;; using a yellow background face. New occurrences of `clearly' will
|
|
|
|
;; be highlighted as they are typed. `M-x unhighlight-regexp RET'
|
|
|
|
;; will remove the highlighting. Any existing face can be used for
|
|
|
|
;; highlighting and a set of appropriate faces is provided. The
|
|
|
|
;; regexps can be written into the current buffer in a form that will
|
2007-04-20 19:24:19 +00:00
|
|
|
;; be recognized the next time the corresponding file is read (when
|
|
|
|
;; file patterns is turned on).
|
2000-08-02 21:29:36 +00:00
|
|
|
;;
|
|
|
|
;; Applications:
|
|
|
|
;;
|
|
|
|
;; In program source code highlight a variable to quickly see all
|
|
|
|
;; places it is modified or referenced:
|
2013-06-03 08:51:50 +00:00
|
|
|
;; M-x highlight-regexp RET ground_contact_switches_closed RET RET
|
2000-08-02 21:29:36 +00:00
|
|
|
;;
|
|
|
|
;; In a shell or other buffer that is showing lots of program
|
|
|
|
;; output, highlight the parts of the output you're interested in:
|
2013-06-03 08:51:50 +00:00
|
|
|
;; M-x highlight-regexp RET Total execution time [0-9]+ RET hi-blue-b RET
|
2000-08-02 21:29:36 +00:00
|
|
|
;;
|
|
|
|
;; In buffers displaying tables, highlight the lines you're interested in:
|
2013-06-03 08:51:50 +00:00
|
|
|
;; M-x highlight-lines-matching-regexp RET January 2000 RET hi-black-b RET
|
2000-08-02 21:29:36 +00:00
|
|
|
;;
|
|
|
|
;; When writing text, highlight personal cliches. This can be
|
|
|
|
;; amusing.
|
2013-06-03 08:51:50 +00:00
|
|
|
;; M-x highlight-phrase RET as can be seen RET RET
|
2000-08-02 21:29:36 +00:00
|
|
|
;;
|
2001-02-06 15:43:37 +00:00
|
|
|
;; Setup:
|
2000-08-02 21:29:36 +00:00
|
|
|
;;
|
2012-09-17 05:41:04 +00:00
|
|
|
;; Put the following code in your init file. This turns on
|
2001-02-06 15:43:37 +00:00
|
|
|
;; hi-lock mode and adds a "Regexp Highlighting" entry
|
2000-08-02 21:29:36 +00:00
|
|
|
;; to the edit menu.
|
|
|
|
;;
|
2005-12-10 11:48:21 +00:00
|
|
|
;; (global-hi-lock-mode 1)
|
2003-02-04 11:26:42 +00:00
|
|
|
;;
|
2007-04-20 19:24:19 +00:00
|
|
|
;; To enable the use of patterns found in files (presumably placed
|
2012-09-17 05:41:04 +00:00
|
|
|
;; there by hi-lock) include the following in your init file:
|
2007-04-20 19:24:19 +00:00
|
|
|
;;
|
|
|
|
;; (setq hi-lock-file-patterns-policy 'ask)
|
|
|
|
;;
|
|
|
|
;; If you get tired of being asked each time a file is loaded replace
|
2007-04-22 16:52:29 +00:00
|
|
|
;; `ask' with a function that returns t if patterns should be read.
|
2007-04-20 19:24:19 +00:00
|
|
|
;;
|
2000-08-02 21:29:36 +00:00
|
|
|
;; You might also want to bind the hi-lock commands to more
|
|
|
|
;; finger-friendly sequences:
|
|
|
|
|
|
|
|
;; (define-key hi-lock-map "\C-z\C-h" 'highlight-lines-matching-regexp)
|
|
|
|
;; (define-key hi-lock-map "\C-zi" 'hi-lock-find-patterns)
|
|
|
|
;; (define-key hi-lock-map "\C-zh" 'highlight-regexp)
|
2001-02-06 15:43:37 +00:00
|
|
|
;; (define-key hi-lock-map "\C-zp" 'highlight-phrase)
|
2000-08-02 21:29:36 +00:00
|
|
|
;; (define-key hi-lock-map "\C-zr" 'unhighlight-regexp)
|
|
|
|
;; (define-key hi-lock-map "\C-zb" 'hi-lock-write-interactive-patterns))
|
|
|
|
|
|
|
|
;; See the documentation for hi-lock-mode `C-h f hi-lock-mode' for
|
|
|
|
;; additional instructions.
|
|
|
|
|
|
|
|
;; Sample file patterns:
|
|
|
|
|
|
|
|
; Hi-lock: (("^;;; .*" (0 (quote hi-black-hb) t)))
|
|
|
|
; Hi-lock: ( ("make-variable-buffer-\\(local\\)" (0 font-lock-keyword-face)(1 'italic append)))))
|
|
|
|
; Hi-lock: end
|
|
|
|
|
|
|
|
;;; Code:
|
|
|
|
|
2005-11-17 07:21:54 +00:00
|
|
|
(defgroup hi-lock nil
|
2000-08-02 21:29:36 +00:00
|
|
|
"Interactively add and remove font-lock patterns for highlighting text."
|
2005-11-17 07:21:54 +00:00
|
|
|
:link '(custom-manual "(emacs)Highlight Interactively")
|
|
|
|
:group 'font-lock)
|
2000-08-02 21:29:36 +00:00
|
|
|
|
|
|
|
(defcustom hi-lock-file-patterns-range 10000
|
|
|
|
"Limit of search in a buffer for hi-lock patterns.
|
2006-02-02 10:43:18 +00:00
|
|
|
When a file is visited and hi-lock mode is on, patterns starting
|
2000-08-02 21:29:36 +00:00
|
|
|
up to this limit are added to font-lock's patterns. See documentation
|
|
|
|
of functions `hi-lock-mode' and `hi-lock-find-patterns'."
|
|
|
|
:type 'integer
|
2005-11-17 07:21:54 +00:00
|
|
|
:group 'hi-lock)
|
2000-08-02 21:29:36 +00:00
|
|
|
|
2020-04-11 23:49:55 +00:00
|
|
|
(defcustom hi-lock-highlight-range 2000000
|
2005-12-23 16:20:58 +00:00
|
|
|
"Size of area highlighted by hi-lock when font-lock not active.
|
|
|
|
Font-lock is not active in buffers that do their own highlighting,
|
|
|
|
such as the buffer created by `list-colors-display'. In those buffers
|
|
|
|
hi-lock patterns will only be applied over a range of
|
|
|
|
`hi-lock-highlight-range' characters. If font-lock is active then
|
|
|
|
highlighting will be applied throughout the buffer."
|
|
|
|
:type 'integer
|
|
|
|
:group 'hi-lock)
|
|
|
|
|
2000-08-02 21:29:36 +00:00
|
|
|
(defcustom hi-lock-exclude-modes
|
2021-07-08 01:23:46 +00:00
|
|
|
'(rmail-mode mime/viewer-mode gnus-article-mode term-mode)
|
2000-08-02 21:29:36 +00:00
|
|
|
"List of major modes in which hi-lock will not run.
|
|
|
|
For security reasons since font lock patterns can specify function
|
|
|
|
calls."
|
2001-01-10 17:29:33 +00:00
|
|
|
:type '(repeat symbol)
|
2005-11-17 07:21:54 +00:00
|
|
|
:group 'hi-lock)
|
2000-08-02 21:29:36 +00:00
|
|
|
|
2007-04-25 14:01:26 +00:00
|
|
|
(defcustom hi-lock-file-patterns-policy 'ask
|
2007-04-20 19:24:19 +00:00
|
|
|
"Specify when hi-lock should use patterns found in file.
|
2007-04-22 16:52:29 +00:00
|
|
|
If `ask', prompt when patterns found in buffer; if bound to a function,
|
2007-04-20 19:24:19 +00:00
|
|
|
use patterns when function returns t (function is called with patterns
|
2007-04-22 16:52:29 +00:00
|
|
|
as first argument); if nil or `never' or anything else, don't use file
|
2007-04-22 01:49:46 +00:00
|
|
|
patterns."
|
|
|
|
:type '(choice (const :tag "Do not use file patterns" never)
|
|
|
|
(const :tag "Ask about file patterns" ask)
|
|
|
|
(function :tag "Function to check file patterns"))
|
|
|
|
:group 'hi-lock
|
|
|
|
:version "22.1")
|
|
|
|
|
|
|
|
;; It can have a function value.
|
|
|
|
(put 'hi-lock-file-patterns-policy 'risky-local-variable t)
|
2000-08-02 21:29:36 +00:00
|
|
|
|
2012-12-04 21:13:47 +00:00
|
|
|
(defcustom hi-lock-auto-select-face nil
|
2020-09-25 09:41:54 +00:00
|
|
|
"When nil, highlighting commands prompt for the face to use.
|
|
|
|
When non-nil, highlighting command determine the faces to use
|
|
|
|
by cycling through the faces in `hi-lock-face-defaults'."
|
2012-12-04 21:13:47 +00:00
|
|
|
:type 'boolean
|
|
|
|
:version "24.4")
|
|
|
|
|
2000-08-02 21:29:36 +00:00
|
|
|
(defgroup hi-lock-faces nil
|
|
|
|
"Faces for hi-lock."
|
2005-11-17 07:21:54 +00:00
|
|
|
:group 'hi-lock
|
|
|
|
:group 'faces)
|
2000-08-02 21:29:36 +00:00
|
|
|
|
|
|
|
(defface hi-yellow
|
2005-04-08 22:03:42 +00:00
|
|
|
'((((min-colors 88) (background dark))
|
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
high number of colors displays.
* textmodes/table.el (table-cell-face): Add special case for
displays supporting a high number of colors.
* progmodes/vhdl-mode.el (vhdl-font-lock-prompt-face)
(vhdl-font-lock-reserved-words-face)
(vhdl-speedbar-architecture-face)
(vhdl-speedbar-instantiation-face)
(vhdl-speedbar-architecture-selected-face)
(vhdl-speedbar-instantiation-selected-face): Likewise.
* progmodes/sh-script.el (sh-heredoc-face): Likewise.
* progmodes/idlw-help.el (idlwave-help-link-face): Likewise.
* progmodes/ebrowse.el (ebrowse-tree-mark-face)
(ebrowse-root-class-face, ebrowse-member-attribute-face)
(ebrowse-progress-face): Likewise.
* progmodes/compile.el (compilation-info-face): Likewise.
* progmodes/cc-fonts.el (c-invalid-face): Likewise.
* emacs-lisp/re-builder.el (reb-match-3): Likewise.
* calendar/calendar.el (diary-face): Likewise.
* woman.el (woman-italic-face, woman-bold-face)
(woman-unknown-face): Likewise.
* wid-edit.el (widget-button-pressed-face): Likewise.
* whitespace.el (whitespace-highlight-face): Likewise.
* smerge-mode.el (smerge-mine-face, smerge-base-face): Likewise.
* pcvs-info.el (cvs-marked-face): Likewise.
* info.el (info-xref): Likewise.
* ido.el (ido-subdir-face, ido-indicator-face): Likewise.
* hilit-chg.el (highlight-changes-face)
(highlight-changes-delete-face): Likewise.
* hi-lock.el (hi-yellow, hi-green, hi-blue-b, hi-green-b)
(hi-red-b): Likewise.
* generic-x.el (show-tabs-tab-face, show-tabs-space-face): Likewise.
* font-lock.el (font-lock-keyword-face)
(font-lock-function-name-face, font-lock-warning-face): Likewise.
* cus-edit.el (custom-invalid-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-variable-tag-face)
(custom-group-tag-face-1, custom-group-tag-face): Likewise.
* comint.el (comint-highlight-prompt): Likewise.
2005-04-08 14:26:13 +00:00
|
|
|
(:background "yellow1" :foreground "black"))
|
|
|
|
(((background dark)) (:background "yellow" :foreground "black"))
|
|
|
|
(((min-colors 88)) (:background "yellow1"))
|
2000-08-17 00:51:39 +00:00
|
|
|
(t (:background "yellow")))
|
2000-08-02 21:29:36 +00:00
|
|
|
"Default face for hi-lock mode."
|
|
|
|
:group 'hi-lock-faces)
|
|
|
|
|
|
|
|
(defface hi-pink
|
2000-11-22 19:44:43 +00:00
|
|
|
'((((background dark)) (:background "pink" :foreground "black"))
|
2000-08-17 00:51:39 +00:00
|
|
|
(t (:background "pink")))
|
2000-08-02 21:29:36 +00:00
|
|
|
"Face for hi-lock mode."
|
|
|
|
:group 'hi-lock-faces)
|
|
|
|
|
|
|
|
(defface hi-green
|
2005-04-08 22:03:42 +00:00
|
|
|
'((((min-colors 88) (background dark))
|
2013-12-20 00:07:08 +00:00
|
|
|
(:background "light green" :foreground "black"))
|
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
high number of colors displays.
* textmodes/table.el (table-cell-face): Add special case for
displays supporting a high number of colors.
* progmodes/vhdl-mode.el (vhdl-font-lock-prompt-face)
(vhdl-font-lock-reserved-words-face)
(vhdl-speedbar-architecture-face)
(vhdl-speedbar-instantiation-face)
(vhdl-speedbar-architecture-selected-face)
(vhdl-speedbar-instantiation-selected-face): Likewise.
* progmodes/sh-script.el (sh-heredoc-face): Likewise.
* progmodes/idlw-help.el (idlwave-help-link-face): Likewise.
* progmodes/ebrowse.el (ebrowse-tree-mark-face)
(ebrowse-root-class-face, ebrowse-member-attribute-face)
(ebrowse-progress-face): Likewise.
* progmodes/compile.el (compilation-info-face): Likewise.
* progmodes/cc-fonts.el (c-invalid-face): Likewise.
* emacs-lisp/re-builder.el (reb-match-3): Likewise.
* calendar/calendar.el (diary-face): Likewise.
* woman.el (woman-italic-face, woman-bold-face)
(woman-unknown-face): Likewise.
* wid-edit.el (widget-button-pressed-face): Likewise.
* whitespace.el (whitespace-highlight-face): Likewise.
* smerge-mode.el (smerge-mine-face, smerge-base-face): Likewise.
* pcvs-info.el (cvs-marked-face): Likewise.
* info.el (info-xref): Likewise.
* ido.el (ido-subdir-face, ido-indicator-face): Likewise.
* hilit-chg.el (highlight-changes-face)
(highlight-changes-delete-face): Likewise.
* hi-lock.el (hi-yellow, hi-green, hi-blue-b, hi-green-b)
(hi-red-b): Likewise.
* generic-x.el (show-tabs-tab-face, show-tabs-space-face): Likewise.
* font-lock.el (font-lock-keyword-face)
(font-lock-function-name-face, font-lock-warning-face): Likewise.
* cus-edit.el (custom-invalid-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-variable-tag-face)
(custom-group-tag-face-1, custom-group-tag-face): Likewise.
* comint.el (comint-highlight-prompt): Likewise.
2005-04-08 14:26:13 +00:00
|
|
|
(((background dark)) (:background "green" :foreground "black"))
|
2013-12-20 00:07:08 +00:00
|
|
|
(((min-colors 88)) (:background "light green"))
|
2000-08-17 00:51:39 +00:00
|
|
|
(t (:background "green")))
|
2000-08-02 21:29:36 +00:00
|
|
|
"Face for hi-lock mode."
|
|
|
|
:group 'hi-lock-faces)
|
|
|
|
|
|
|
|
(defface hi-blue
|
2000-11-22 19:44:43 +00:00
|
|
|
'((((background dark)) (:background "light blue" :foreground "black"))
|
2000-08-17 00:51:39 +00:00
|
|
|
(t (:background "light blue")))
|
2000-08-02 21:29:36 +00:00
|
|
|
"Face for hi-lock mode."
|
|
|
|
:group 'hi-lock-faces)
|
|
|
|
|
2018-12-20 23:00:44 +00:00
|
|
|
(defface hi-salmon
|
|
|
|
'((((min-colors 88) (background dark))
|
|
|
|
(:background "light salmon" :foreground "black"))
|
|
|
|
(((background dark)) (:background "red" :foreground "black"))
|
|
|
|
(((min-colors 88)) (:background "light salmon"))
|
|
|
|
(t (:background "red")))
|
|
|
|
"Face for hi-lock mode."
|
|
|
|
:group 'hi-lock-faces
|
|
|
|
:version "27.1")
|
|
|
|
|
|
|
|
(defface hi-aquamarine
|
|
|
|
'((((min-colors 88) (background dark))
|
|
|
|
(:background "aquamarine" :foreground "black"))
|
|
|
|
(((background dark)) (:background "blue" :foreground "black"))
|
|
|
|
(((min-colors 88)) (:background "aquamarine"))
|
|
|
|
(t (:background "blue")))
|
|
|
|
"Face for hi-lock mode."
|
|
|
|
:group 'hi-lock-faces
|
|
|
|
:version "27.1")
|
|
|
|
|
2000-08-02 21:29:36 +00:00
|
|
|
(defface hi-black-b
|
|
|
|
'((t (:weight bold)))
|
|
|
|
"Face for hi-lock mode."
|
|
|
|
:group 'hi-lock-faces)
|
|
|
|
|
|
|
|
(defface hi-blue-b
|
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
high number of colors displays.
* textmodes/table.el (table-cell-face): Add special case for
displays supporting a high number of colors.
* progmodes/vhdl-mode.el (vhdl-font-lock-prompt-face)
(vhdl-font-lock-reserved-words-face)
(vhdl-speedbar-architecture-face)
(vhdl-speedbar-instantiation-face)
(vhdl-speedbar-architecture-selected-face)
(vhdl-speedbar-instantiation-selected-face): Likewise.
* progmodes/sh-script.el (sh-heredoc-face): Likewise.
* progmodes/idlw-help.el (idlwave-help-link-face): Likewise.
* progmodes/ebrowse.el (ebrowse-tree-mark-face)
(ebrowse-root-class-face, ebrowse-member-attribute-face)
(ebrowse-progress-face): Likewise.
* progmodes/compile.el (compilation-info-face): Likewise.
* progmodes/cc-fonts.el (c-invalid-face): Likewise.
* emacs-lisp/re-builder.el (reb-match-3): Likewise.
* calendar/calendar.el (diary-face): Likewise.
* woman.el (woman-italic-face, woman-bold-face)
(woman-unknown-face): Likewise.
* wid-edit.el (widget-button-pressed-face): Likewise.
* whitespace.el (whitespace-highlight-face): Likewise.
* smerge-mode.el (smerge-mine-face, smerge-base-face): Likewise.
* pcvs-info.el (cvs-marked-face): Likewise.
* info.el (info-xref): Likewise.
* ido.el (ido-subdir-face, ido-indicator-face): Likewise.
* hilit-chg.el (highlight-changes-face)
(highlight-changes-delete-face): Likewise.
* hi-lock.el (hi-yellow, hi-green, hi-blue-b, hi-green-b)
(hi-red-b): Likewise.
* generic-x.el (show-tabs-tab-face, show-tabs-space-face): Likewise.
* font-lock.el (font-lock-keyword-face)
(font-lock-function-name-face, font-lock-warning-face): Likewise.
* cus-edit.el (custom-invalid-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-variable-tag-face)
(custom-group-tag-face-1, custom-group-tag-face): Likewise.
* comint.el (comint-highlight-prompt): Likewise.
2005-04-08 14:26:13 +00:00
|
|
|
'((((min-colors 88)) (:weight bold :foreground "blue1"))
|
|
|
|
(t (:weight bold :foreground "blue")))
|
2000-08-02 21:29:36 +00:00
|
|
|
"Face for hi-lock mode."
|
|
|
|
:group 'hi-lock-faces)
|
|
|
|
|
|
|
|
(defface hi-green-b
|
2018-12-20 23:00:44 +00:00
|
|
|
'((((min-colors 88)) (:weight bold :foreground "green3"))
|
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
high number of colors displays.
* textmodes/table.el (table-cell-face): Add special case for
displays supporting a high number of colors.
* progmodes/vhdl-mode.el (vhdl-font-lock-prompt-face)
(vhdl-font-lock-reserved-words-face)
(vhdl-speedbar-architecture-face)
(vhdl-speedbar-instantiation-face)
(vhdl-speedbar-architecture-selected-face)
(vhdl-speedbar-instantiation-selected-face): Likewise.
* progmodes/sh-script.el (sh-heredoc-face): Likewise.
* progmodes/idlw-help.el (idlwave-help-link-face): Likewise.
* progmodes/ebrowse.el (ebrowse-tree-mark-face)
(ebrowse-root-class-face, ebrowse-member-attribute-face)
(ebrowse-progress-face): Likewise.
* progmodes/compile.el (compilation-info-face): Likewise.
* progmodes/cc-fonts.el (c-invalid-face): Likewise.
* emacs-lisp/re-builder.el (reb-match-3): Likewise.
* calendar/calendar.el (diary-face): Likewise.
* woman.el (woman-italic-face, woman-bold-face)
(woman-unknown-face): Likewise.
* wid-edit.el (widget-button-pressed-face): Likewise.
* whitespace.el (whitespace-highlight-face): Likewise.
* smerge-mode.el (smerge-mine-face, smerge-base-face): Likewise.
* pcvs-info.el (cvs-marked-face): Likewise.
* info.el (info-xref): Likewise.
* ido.el (ido-subdir-face, ido-indicator-face): Likewise.
* hilit-chg.el (highlight-changes-face)
(highlight-changes-delete-face): Likewise.
* hi-lock.el (hi-yellow, hi-green, hi-blue-b, hi-green-b)
(hi-red-b): Likewise.
* generic-x.el (show-tabs-tab-face, show-tabs-space-face): Likewise.
* font-lock.el (font-lock-keyword-face)
(font-lock-function-name-face, font-lock-warning-face): Likewise.
* cus-edit.el (custom-invalid-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-variable-tag-face)
(custom-group-tag-face-1, custom-group-tag-face): Likewise.
* comint.el (comint-highlight-prompt): Likewise.
2005-04-08 14:26:13 +00:00
|
|
|
(t (:weight bold :foreground "green")))
|
2000-08-02 21:29:36 +00:00
|
|
|
"Face for hi-lock mode."
|
|
|
|
:group 'hi-lock-faces)
|
|
|
|
|
|
|
|
(defface hi-red-b
|
2018-12-20 23:00:44 +00:00
|
|
|
'((((min-colors 88)) (:weight bold :foreground "firebrick2"))
|
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
high number of colors displays.
* textmodes/table.el (table-cell-face): Add special case for
displays supporting a high number of colors.
* progmodes/vhdl-mode.el (vhdl-font-lock-prompt-face)
(vhdl-font-lock-reserved-words-face)
(vhdl-speedbar-architecture-face)
(vhdl-speedbar-instantiation-face)
(vhdl-speedbar-architecture-selected-face)
(vhdl-speedbar-instantiation-selected-face): Likewise.
* progmodes/sh-script.el (sh-heredoc-face): Likewise.
* progmodes/idlw-help.el (idlwave-help-link-face): Likewise.
* progmodes/ebrowse.el (ebrowse-tree-mark-face)
(ebrowse-root-class-face, ebrowse-member-attribute-face)
(ebrowse-progress-face): Likewise.
* progmodes/compile.el (compilation-info-face): Likewise.
* progmodes/cc-fonts.el (c-invalid-face): Likewise.
* emacs-lisp/re-builder.el (reb-match-3): Likewise.
* calendar/calendar.el (diary-face): Likewise.
* woman.el (woman-italic-face, woman-bold-face)
(woman-unknown-face): Likewise.
* wid-edit.el (widget-button-pressed-face): Likewise.
* whitespace.el (whitespace-highlight-face): Likewise.
* smerge-mode.el (smerge-mine-face, smerge-base-face): Likewise.
* pcvs-info.el (cvs-marked-face): Likewise.
* info.el (info-xref): Likewise.
* ido.el (ido-subdir-face, ido-indicator-face): Likewise.
* hilit-chg.el (highlight-changes-face)
(highlight-changes-delete-face): Likewise.
* hi-lock.el (hi-yellow, hi-green, hi-blue-b, hi-green-b)
(hi-red-b): Likewise.
* generic-x.el (show-tabs-tab-face, show-tabs-space-face): Likewise.
* font-lock.el (font-lock-keyword-face)
(font-lock-function-name-face, font-lock-warning-face): Likewise.
* cus-edit.el (custom-invalid-face, custom-modified-face)
(custom-set-face, custom-changed-face, custom-variable-tag-face)
(custom-group-tag-face-1, custom-group-tag-face): Likewise.
* comint.el (comint-highlight-prompt): Likewise.
2005-04-08 14:26:13 +00:00
|
|
|
(t (:weight bold :foreground "red")))
|
2000-08-02 21:29:36 +00:00
|
|
|
"Face for hi-lock mode."
|
|
|
|
:group 'hi-lock-faces)
|
|
|
|
|
|
|
|
(defface hi-black-hb
|
2000-09-20 02:07:56 +00:00
|
|
|
'((t (:weight bold :height 1.67 :inherit variable-pitch)))
|
2000-08-02 21:29:36 +00:00
|
|
|
"Face for hi-lock mode."
|
|
|
|
:group 'hi-lock-faces)
|
|
|
|
|
2012-12-07 16:48:42 +00:00
|
|
|
(defvar-local hi-lock-file-patterns nil
|
2000-08-02 21:29:36 +00:00
|
|
|
"Patterns found in file for hi-lock. Should not be changed.")
|
2012-12-07 16:48:42 +00:00
|
|
|
(put 'hi-lock-file-patterns 'permanent-local t)
|
2000-08-02 21:29:36 +00:00
|
|
|
|
2012-12-07 16:48:42 +00:00
|
|
|
(defvar-local hi-lock-interactive-patterns nil
|
2000-08-02 21:29:36 +00:00
|
|
|
"Patterns provided to hi-lock by user. Should not be changed.")
|
2012-12-07 16:48:42 +00:00
|
|
|
(put 'hi-lock-interactive-patterns 'permanent-local t)
|
2000-08-02 21:29:36 +00:00
|
|
|
|
2020-04-11 23:45:02 +00:00
|
|
|
(defvar-local hi-lock-interactive-lighters nil
|
|
|
|
"Human-readable lighters for `hi-lock-interactive-patterns'.")
|
|
|
|
(put 'hi-lock-interactive-lighters 'permanent-local t)
|
|
|
|
|
2008-06-30 19:36:38 +00:00
|
|
|
(defvar hi-lock-face-defaults
|
2018-12-20 23:00:44 +00:00
|
|
|
'("hi-yellow" "hi-pink" "hi-green" "hi-blue" "hi-salmon" "hi-aquamarine"
|
|
|
|
"hi-black-b" "hi-blue-b" "hi-red-b" "hi-green-b" "hi-black-hb")
|
2008-06-30 19:36:38 +00:00
|
|
|
"Default faces for hi-lock interactive functions.")
|
2000-08-02 21:29:36 +00:00
|
|
|
|
|
|
|
(defvar hi-lock-file-patterns-prefix "Hi-lock"
|
2019-08-03 20:35:17 +00:00
|
|
|
"String used to identify hi-lock patterns at the start of files.")
|
2000-08-02 21:29:36 +00:00
|
|
|
|
2005-12-10 11:48:21 +00:00
|
|
|
(defvar hi-lock-archaic-interface-message-used nil
|
2005-12-23 16:45:05 +00:00
|
|
|
"True if user alerted that `global-hi-lock-mode' is now the global switch.
|
2006-02-02 10:43:18 +00:00
|
|
|
Earlier versions of hi-lock used `hi-lock-mode' as the global switch;
|
2005-12-23 16:45:05 +00:00
|
|
|
the message is issued if it appears that `hi-lock-mode' is used assuming
|
2005-12-10 11:48:21 +00:00
|
|
|
that older functionality. This variable avoids multiple reminders.")
|
|
|
|
|
|
|
|
(defvar hi-lock-archaic-interface-deduce nil
|
2005-12-23 16:45:05 +00:00
|
|
|
"If non-nil, sometimes assume that `hi-lock-mode' means `global-hi-lock-mode'.
|
|
|
|
Assumption is made if `hi-lock-mode' used in the *scratch* buffer while
|
2005-12-10 11:48:21 +00:00
|
|
|
a library is being loaded.")
|
|
|
|
|
2021-02-28 21:21:39 +00:00
|
|
|
(easy-menu-define hi-lock-menu nil
|
|
|
|
"Menu for hi-lock mode."
|
|
|
|
'("Hi Lock"
|
|
|
|
["Highlight Regexp..." highlight-regexp
|
|
|
|
:help "Highlight text matching PATTERN (a regexp)."]
|
|
|
|
["Highlight Phrase..." highlight-phrase
|
|
|
|
:help "Highlight text matching PATTERN (a regexp processed to match phrases)."]
|
|
|
|
["Highlight Lines..." highlight-lines-matching-regexp
|
|
|
|
:help "Highlight lines containing match of PATTERN (a regexp)."]
|
|
|
|
["Highlight Symbol at Point" highlight-symbol-at-point
|
|
|
|
:help "Highlight symbol found near point without prompting."]
|
|
|
|
["Remove Highlighting..." unhighlight-regexp
|
|
|
|
:help "Remove previously entered highlighting pattern."
|
|
|
|
:enable hi-lock-interactive-patterns]
|
|
|
|
["Patterns to Buffer" hi-lock-write-interactive-patterns
|
|
|
|
:help "Insert interactively added REGEXPs into buffer at point."
|
|
|
|
:enable hi-lock-interactive-patterns]
|
|
|
|
["Patterns from Buffer" hi-lock-find-patterns
|
|
|
|
:help "Use patterns (if any) near top of buffer."]))
|
2000-08-02 21:29:36 +00:00
|
|
|
|
Move keymap initialization into declaration.
* lisp/textmodes/enriched.el (enriched-mode-map):
* lisp/textmodes/bib-mode.el (bib-mode-map):
* lisp/term/lk201.el (lk201-function-map):
* lisp/tar-mode.el (tar-mode-map):
* lisp/replace.el (occur-mode-map):
* lisp/progmodes/idlwave.el (idlwave-rinfo-mouse-map, idlwave-rinfo-map):
* lisp/progmodes/idlw-help.el (idlwave-help-mode-map):
* lisp/progmodes/gdb-mi.el (gdb-memory-format-menu, gdb-memory-unit-menu):
* lisp/play/solitaire.el (solitaire-mode-map):
* lisp/play/snake.el (snake-mode-map, snake-null-map):
* lisp/play/pong.el (pong-mode-map):
* lisp/play/handwrite.el (menu-bar-handwrite-map):
* lisp/play/gametree.el (gametree-mode-map):
* lisp/net/rcirc.el (rcirc-mode-map, rcirc-browse-url-map
(rcirc-multiline-minor-mode-map, rcirc-track-minor-mode-map):
* lisp/net/newst-plainview.el (newsticker-menu, newsticker-mode-map)
(newsticker--url-keymap):
* lisp/net/net-utils.el (nslookup-mode-map, ftp-mode-map):
* lisp/menu-bar.el (menu-bar-file-menu, menu-bar-i-search-menu)
(menu-bar-search-menu, menu-bar-replace-menu, menu-bar-goto-menu)
(menu-bar-edit-menu, menu-bar-custom-menu)
(menu-bar-showhide-fringe-ind-menu, menu-bar-showhide-fringe-menu)
(menu-bar-showhide-scroll-bar-menu, menu-bar-showhide-menu)
(menu-bar-line-wrapping-menu, menu-bar-options-menu)
(menu-bar-games-menu, menu-bar-encryption-decryption-menu)
(menu-bar-tools-menu, menu-bar-describe-menu)
(menu-bar-search-documentation-menu, menu-bar-manuals-menu)
(menu-bar-help-menu):
* lisp/mail/rmailsum.el (rmail-summary-mode-map):
* lisp/kmacro.el (kmacro-step-edit-map):
* lisp/ibuffer.el (ibuffer-mode-groups-popup, ibuffer-mode-map)
(ibuffer-mode-operate-map):
* lisp/hi-lock.el (hi-lock-menu, hi-lock-map):
* lisp/emulation/vip.el (vip-mode-map):
* lisp/emacs-lisp/re-builder.el (reb-lisp-mode-map):
* lisp/bookmark.el (bookmark-bmenu-mode-map):
* lisp/help-mode.el (help-mode-map):
* lisp/erc/erc-list.el (erc-list-menu-mode-map):
* lisp/org/org-remember.el (org-remember-mode-map):
* lisp/org/org-src.el (org-src-mode-map): Move initialization into declaration.
2011-02-10 16:56:00 +00:00
|
|
|
(defvar hi-lock-map
|
|
|
|
(let ((map (make-sparse-keymap "Hi Lock")))
|
|
|
|
(define-key map "\C-xwi" 'hi-lock-find-patterns)
|
|
|
|
(define-key map "\C-xwl" 'highlight-lines-matching-regexp)
|
|
|
|
(define-key map "\C-xwp" 'highlight-phrase)
|
|
|
|
(define-key map "\C-xwh" 'highlight-regexp)
|
2013-06-03 08:51:50 +00:00
|
|
|
(define-key map "\C-xw." 'highlight-symbol-at-point)
|
Move keymap initialization into declaration.
* lisp/textmodes/enriched.el (enriched-mode-map):
* lisp/textmodes/bib-mode.el (bib-mode-map):
* lisp/term/lk201.el (lk201-function-map):
* lisp/tar-mode.el (tar-mode-map):
* lisp/replace.el (occur-mode-map):
* lisp/progmodes/idlwave.el (idlwave-rinfo-mouse-map, idlwave-rinfo-map):
* lisp/progmodes/idlw-help.el (idlwave-help-mode-map):
* lisp/progmodes/gdb-mi.el (gdb-memory-format-menu, gdb-memory-unit-menu):
* lisp/play/solitaire.el (solitaire-mode-map):
* lisp/play/snake.el (snake-mode-map, snake-null-map):
* lisp/play/pong.el (pong-mode-map):
* lisp/play/handwrite.el (menu-bar-handwrite-map):
* lisp/play/gametree.el (gametree-mode-map):
* lisp/net/rcirc.el (rcirc-mode-map, rcirc-browse-url-map
(rcirc-multiline-minor-mode-map, rcirc-track-minor-mode-map):
* lisp/net/newst-plainview.el (newsticker-menu, newsticker-mode-map)
(newsticker--url-keymap):
* lisp/net/net-utils.el (nslookup-mode-map, ftp-mode-map):
* lisp/menu-bar.el (menu-bar-file-menu, menu-bar-i-search-menu)
(menu-bar-search-menu, menu-bar-replace-menu, menu-bar-goto-menu)
(menu-bar-edit-menu, menu-bar-custom-menu)
(menu-bar-showhide-fringe-ind-menu, menu-bar-showhide-fringe-menu)
(menu-bar-showhide-scroll-bar-menu, menu-bar-showhide-menu)
(menu-bar-line-wrapping-menu, menu-bar-options-menu)
(menu-bar-games-menu, menu-bar-encryption-decryption-menu)
(menu-bar-tools-menu, menu-bar-describe-menu)
(menu-bar-search-documentation-menu, menu-bar-manuals-menu)
(menu-bar-help-menu):
* lisp/mail/rmailsum.el (rmail-summary-mode-map):
* lisp/kmacro.el (kmacro-step-edit-map):
* lisp/ibuffer.el (ibuffer-mode-groups-popup, ibuffer-mode-map)
(ibuffer-mode-operate-map):
* lisp/hi-lock.el (hi-lock-menu, hi-lock-map):
* lisp/emulation/vip.el (vip-mode-map):
* lisp/emacs-lisp/re-builder.el (reb-lisp-mode-map):
* lisp/bookmark.el (bookmark-bmenu-mode-map):
* lisp/help-mode.el (help-mode-map):
* lisp/erc/erc-list.el (erc-list-menu-mode-map):
* lisp/org/org-remember.el (org-remember-mode-map):
* lisp/org/org-src.el (org-src-mode-map): Move initialization into declaration.
2011-02-10 16:56:00 +00:00
|
|
|
(define-key map "\C-xwr" 'unhighlight-regexp)
|
|
|
|
(define-key map "\C-xwb" 'hi-lock-write-interactive-patterns)
|
|
|
|
map)
|
2000-08-02 21:29:36 +00:00
|
|
|
"Key map for hi-lock.")
|
|
|
|
|
|
|
|
;; Visible Functions
|
|
|
|
|
|
|
|
;;;###autoload
|
2005-12-10 11:48:21 +00:00
|
|
|
(define-minor-mode hi-lock-mode
|
Fix minor mode docstrings for the new meaning of a nil ARG.
* abbrev.el (abbrev-mode):
* allout.el (allout-mode):
* autoinsert.el (auto-insert-mode):
* autoarg.el (autoarg-mode, autoarg-kp-mode):
* autorevert.el (auto-revert-mode, auto-revert-tail-mode)
(global-auto-revert-mode):
* battery.el (display-battery-mode):
* composite.el (global-auto-composition-mode)
(auto-composition-mode):
* delsel.el (delete-selection-mode):
* desktop.el (desktop-save-mode):
* dired-x.el (dired-omit-mode):
* dirtrack.el (dirtrack-mode):
* doc-view.el (doc-view-minor-mode):
* double.el (double-mode):
* electric.el (electric-indent-mode, electric-pair-mode):
* emacs-lock.el (emacs-lock-mode):
* epa-hook.el (auto-encryption-mode):
* follow.el (follow-mode):
* font-core.el (font-lock-mode):
* frame.el (auto-raise-mode, auto-lower-mode, blink-cursor-mode):
* help.el (temp-buffer-resize-mode):
* hilit-chg.el (highlight-changes-mode)
(highlight-changes-visible-mode):
* hi-lock.el (hi-lock-mode):
* hl-line.el (hl-line-mode, global-hl-line-mode):
* icomplete.el (icomplete-mode):
* ido.el (ido-everywhere):
* image-file.el (auto-image-file-mode):
* image-mode.el (image-minor-mode):
* iswitchb.el (iswitchb-mode):
* jka-cmpr-hook.el (auto-compression-mode):
* linum.el (linum-mode):
* longlines.el (longlines-mode):
* master.el (master-mode):
* mb-depth.el (minibuffer-depth-indicate-mode):
* menu-bar.el (menu-bar-mode):
* minibuf-eldef.el (minibuffer-electric-default-mode):
* mouse-sel.el (mouse-sel-mode):
* msb.el (msb-mode):
* mwheel.el (mouse-wheel-mode):
* outline.el (outline-minor-mode):
* paren.el (show-paren-mode):
* recentf.el (recentf-mode):
* reveal.el (reveal-mode, global-reveal-mode):
* rfn-eshadow.el (file-name-shadow-mode):
* ruler-mode.el (ruler-mode):
* savehist.el (savehist-mode):
* scroll-all.el (scroll-all-mode):
* scroll-bar.el (scroll-bar-mode):
* server.el (server-mode):
* shell.el (shell-dirtrack-mode):
* simple.el (auto-fill-mode, transient-mark-mode)
(visual-line-mode, overwrite-mode, binary-overwrite-mode)
(line-number-mode, column-number-mode, size-indication-mode)
(auto-save-mode, normal-erase-is-backspace-mode, visible-mode):
* strokes.el (strokes-mode):
* time.el (display-time-mode):
* t-mouse.el (gpm-mouse-mode):
* tool-bar.el (tool-bar-mode):
* tooltip.el (tooltip-mode):
* type-break.el (type-break-mode-line-message-mode)
(type-break-query-mode):
* view.el (view-mode):
* whitespace.el (whitespace-mode, whitespace-newline-mode)
(global-whitespace-mode, global-whitespace-newline-mode):
* xt-mouse.el (xterm-mouse-mode): Doc fix.
* emacs-lisp/easy-mmode.el (define-globalized-minor-mode): Fix
autogenerated docstring.
2011-10-19 12:54:24 +00:00
|
|
|
"Toggle selective highlighting of patterns (Hi Lock mode).
|
|
|
|
|
2012-08-14 06:52:59 +00:00
|
|
|
Hi Lock mode is automatically enabled when you invoke any of the
|
|
|
|
highlighting commands listed below, such as \\[highlight-regexp].
|
|
|
|
To enable Hi Lock mode in all buffers, use `global-hi-lock-mode'
|
|
|
|
or add (global-hi-lock-mode 1) to your init file.
|
|
|
|
|
|
|
|
In buffers where Font Lock mode is enabled, patterns are
|
|
|
|
highlighted using font lock. In buffers where Font Lock mode is
|
|
|
|
disabled, patterns are applied using overlays; in this case, the
|
2020-05-08 14:25:45 +00:00
|
|
|
highlighting will not be updated as you type. The Font Lock mode
|
|
|
|
is considered \"enabled\" in a buffer if its `major-mode'
|
|
|
|
causes `font-lock-specified-p' to return non-nil, which means
|
|
|
|
the major mode specifies support for Font Lock.
|
2012-08-14 06:52:59 +00:00
|
|
|
|
|
|
|
When Hi Lock mode is enabled, a \"Regexp Highlighting\" submenu
|
|
|
|
is added to the \"Edit\" menu. The commands in the submenu,
|
|
|
|
which can be called interactively, are:
|
2000-08-02 21:29:36 +00:00
|
|
|
|
|
|
|
\\[highlight-regexp] REGEXP FACE
|
|
|
|
Highlight matches of pattern REGEXP in current buffer with FACE.
|
|
|
|
|
2001-02-06 15:43:37 +00:00
|
|
|
\\[highlight-phrase] PHRASE FACE
|
|
|
|
Highlight matches of phrase PHRASE in current buffer with FACE.
|
|
|
|
(PHRASE can be any REGEXP, but spaces will be replaced by matches
|
|
|
|
to whitespace and initial lower-case letters will become case insensitive.)
|
2003-02-04 11:26:42 +00:00
|
|
|
|
2000-08-02 21:29:36 +00:00
|
|
|
\\[highlight-lines-matching-regexp] REGEXP FACE
|
|
|
|
Highlight lines containing matches of REGEXP in current buffer with FACE.
|
|
|
|
|
2013-06-03 08:51:50 +00:00
|
|
|
\\[highlight-symbol-at-point]
|
|
|
|
Highlight the symbol found near point without prompting, using the next
|
|
|
|
available face automatically.
|
|
|
|
|
2000-08-02 21:29:36 +00:00
|
|
|
\\[unhighlight-regexp] REGEXP
|
|
|
|
Remove highlighting on matches of REGEXP in current buffer.
|
|
|
|
|
|
|
|
\\[hi-lock-write-interactive-patterns]
|
2007-04-20 19:24:19 +00:00
|
|
|
Write active REGEXPs into buffer as comments (if possible). They may
|
2000-08-02 21:29:36 +00:00
|
|
|
be read the next time file is loaded or when the \\[hi-lock-find-patterns] command
|
|
|
|
is issued. The inserted regexps are in the form of font lock keywords.
|
2007-09-25 11:07:41 +00:00
|
|
|
(See `font-lock-keywords'.) They may be edited and re-loaded with \\[hi-lock-find-patterns],
|
2008-03-31 00:04:49 +00:00
|
|
|
any valid `font-lock-keywords' form is acceptable. When a file is
|
|
|
|
loaded the patterns are read if `hi-lock-file-patterns-policy' is
|
2015-11-17 23:28:50 +00:00
|
|
|
`ask' and the user responds y to the prompt, or if
|
2007-04-20 19:24:19 +00:00
|
|
|
`hi-lock-file-patterns-policy' is bound to a function and that
|
|
|
|
function returns t.
|
2000-08-02 21:29:36 +00:00
|
|
|
|
|
|
|
\\[hi-lock-find-patterns]
|
|
|
|
Re-read patterns stored in buffer (in the format produced by \\[hi-lock-write-interactive-patterns]).
|
|
|
|
|
2007-04-20 19:24:19 +00:00
|
|
|
When hi-lock is started and if the mode is not excluded or patterns
|
|
|
|
rejected, the beginning of the buffer is searched for lines of the
|
|
|
|
form:
|
2000-08-02 21:29:36 +00:00
|
|
|
Hi-lock: FOO
|
2012-08-14 06:52:59 +00:00
|
|
|
|
|
|
|
where FOO is a list of patterns. The patterns must start before
|
|
|
|
position \(number of characters into buffer)
|
|
|
|
`hi-lock-file-patterns-range'. Patterns will be read until
|
|
|
|
Hi-lock: end is found. A mode is excluded if it's in the list
|
|
|
|
`hi-lock-exclude-modes'."
|
2005-11-24 20:52:16 +00:00
|
|
|
:group 'hi-lock
|
2005-12-23 16:45:05 +00:00
|
|
|
:lighter (:eval (if (or hi-lock-interactive-patterns
|
|
|
|
hi-lock-file-patterns)
|
|
|
|
" Hi" ""))
|
2005-11-24 20:52:16 +00:00
|
|
|
:global nil
|
|
|
|
:keymap hi-lock-map
|
2005-12-10 11:48:21 +00:00
|
|
|
(when (and (equal (buffer-name) "*scratch*")
|
|
|
|
load-in-progress
|
2009-10-02 03:48:36 +00:00
|
|
|
(not (called-interactively-p 'interactive))
|
2005-12-10 11:48:21 +00:00
|
|
|
(not hi-lock-archaic-interface-message-used))
|
|
|
|
(setq hi-lock-archaic-interface-message-used t)
|
|
|
|
(if hi-lock-archaic-interface-deduce
|
|
|
|
(global-hi-lock-mode hi-lock-mode)
|
2015-09-03 22:31:12 +00:00
|
|
|
(warn "%s"
|
2005-12-10 11:48:21 +00:00
|
|
|
"Possible archaic use of (hi-lock-mode).
|
|
|
|
Use (global-hi-lock-mode 1) in .emacs to enable hi-lock for all buffers,
|
2021-02-01 04:46:13 +00:00
|
|
|
use (hi-lock-mode 1) for individual buffers.")))
|
2005-12-10 11:48:21 +00:00
|
|
|
(if hi-lock-mode
|
2005-11-24 20:52:16 +00:00
|
|
|
;; Turned on.
|
|
|
|
(progn
|
|
|
|
(define-key-after menu-bar-edit-menu [hi-lock]
|
|
|
|
(cons "Regexp Highlighting" hi-lock-menu))
|
|
|
|
(hi-lock-find-patterns)
|
2013-03-31 13:34:35 +00:00
|
|
|
(add-hook 'font-lock-mode-hook 'hi-lock-font-lock-hook nil t)
|
|
|
|
;; Remove regexps from font-lock-keywords (bug#13891).
|
|
|
|
(add-hook 'change-major-mode-hook (lambda () (hi-lock-mode -1)) nil t))
|
2000-08-02 21:29:36 +00:00
|
|
|
;; Turned off.
|
2005-11-25 05:32:56 +00:00
|
|
|
(when (or hi-lock-interactive-patterns
|
|
|
|
hi-lock-file-patterns)
|
2005-12-10 11:48:21 +00:00
|
|
|
(when hi-lock-interactive-patterns
|
2005-11-25 05:32:56 +00:00
|
|
|
(font-lock-remove-keywords nil hi-lock-interactive-patterns)
|
2020-04-11 23:45:02 +00:00
|
|
|
(setq hi-lock-interactive-patterns nil
|
|
|
|
hi-lock-interactive-lighters nil))
|
2005-11-25 05:32:56 +00:00
|
|
|
(when hi-lock-file-patterns
|
|
|
|
(font-lock-remove-keywords nil hi-lock-file-patterns)
|
|
|
|
(setq hi-lock-file-patterns nil))
|
2005-12-23 16:20:58 +00:00
|
|
|
(remove-overlays nil nil 'hi-lock-overlay t)
|
* lisp/font-lock.el (font-lock-flush, font-lock-ensure): New functions.
(font-lock-fontify-buffer): Mark interactive-only.
(font-lock-multiline, font-lock-fontified, font-lock-set-defaults):
Make buffer-local.
(font-lock-specified-p): Remove redundant boundp check.
(font-lock-flush-function, font-lock-ensure-function): New vars.
(font-lock-turn-on-thing-lock): Set them.
(font-lock-default-fontify-buffer): Obey font-lock-dont-widen.
(font-lock-after-change-function): Make `old-len' optional.
(font-lock-set-defaults): Remove redundant `set' of font-lock-defaults.
Call font-lock-flush, just in case.
* lisp/progmodes/verilog-mode.el (verilog-preprocess): Disable workaround in
recent Emacsen.
* lisp/progmodes/vera-mode.el (vera-fontify-buffer): Declare obsolete.
(vera-mode-map, vera-mode-menu): Remove bindings to it.
* lisp/progmodes/idlw-help.el (idlwave-help-fontify): Use font-lock-ensure
and with-syntax-table.
* lisp/textmodes/conf-mode.el (conf-quote-normal):
* lisp/progmodes/sh-script.el (sh-set-shell):
* lisp/progmodes/prog-mode.el (prettify-symbols-mode):
* lisp/progmodes/f90.el (f90-font-lock-n):
* lisp/progmodes/cwarn.el (cwarn-mode):
* lisp/nxml/nxml-mode.el (nxml-toggle-char-ref-extra-display):
* lisp/progmodes/compile.el (compilation-setup, compilation--unsetup):
* lisp/hi-lock.el (hi-lock-mode, hi-lock-unface-buffer)
(hi-lock-set-pattern, hi-lock-set-file-patterns): Use font-lock-flush.
* lisp/mail/rmail.el (rmail-variables): Set font-lock-dont-widen instead of
font-lock-fontify-buffer-function and
font-lock-unfontify-buffer-function.
(rmail-unfontify-buffer-function, rmail-fontify-message):
Use with-silent-modifications.
* lisp/htmlfontify.el (hfy-force-fontification): Use jit-lock-fontify-now
and font-lock-ensure.
* lisp/bs.el (bs-show-in-buffer): Use font-lock-ensure.
* lisp/gnus/mm-view.el (mm-display-inline-fontify): Use font-lock-ensure.
* lisp/gnus/gnus-cite.el (gnus-message-citation-mode): Use font-lock-flush.
* lisp/org/org-compat.el (org-font-lock-ensure): New function.
* lisp/org/ox-odt.el (org-odt-do-format-code):
* lisp/org/ox-html.el (org-html-fontify-code):
* lisp/org/org.el (org-fontify-like-in-org-mode):
* lisp/org/org-src.el (org-src-font-lock-fontify-block):
* lisp/org/org-clock.el (org-clock-get-clocktable): Use it.
* lisp/org/ox-org.el (org-org-publish-to-org): Use it. Avoid using find-file
from Elisp.
* test/automated/ruby-mode-tests.el (ruby-assert-face): Use font-lock-ensure.
(ruby-interpolation-keeps-non-quote-syntax): Use syntax-propertize.
2014-05-29 03:45:29 +00:00
|
|
|
(font-lock-flush))
|
2005-11-24 20:52:16 +00:00
|
|
|
(define-key-after menu-bar-edit-menu [hi-lock] nil)
|
|
|
|
(remove-hook 'font-lock-mode-hook 'hi-lock-font-lock-hook t)))
|
2000-08-02 21:29:36 +00:00
|
|
|
|
2005-11-24 20:52:16 +00:00
|
|
|
;;;###autoload
|
2007-02-03 17:26:01 +00:00
|
|
|
(define-globalized-minor-mode global-hi-lock-mode
|
2005-12-10 11:48:21 +00:00
|
|
|
hi-lock-mode turn-on-hi-lock-if-enabled
|
2005-11-24 21:11:42 +00:00
|
|
|
:group 'hi-lock)
|
2005-12-10 11:48:21 +00:00
|
|
|
|
2005-11-24 20:52:16 +00:00
|
|
|
(defun turn-on-hi-lock-if-enabled ()
|
2005-12-10 11:48:21 +00:00
|
|
|
(setq hi-lock-archaic-interface-message-used t)
|
2005-11-24 20:52:16 +00:00
|
|
|
(unless (memq major-mode hi-lock-exclude-modes)
|
2005-12-10 11:48:21 +00:00
|
|
|
(hi-lock-mode 1)))
|
2000-08-02 21:29:36 +00:00
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defalias 'highlight-lines-matching-regexp 'hi-lock-line-face-buffer)
|
|
|
|
;;;###autoload
|
|
|
|
(defun hi-lock-line-face-buffer (regexp &optional face)
|
2019-07-03 12:55:10 +00:00
|
|
|
"Highlight all lines that match REGEXP using FACE.
|
|
|
|
The lines that match REGEXP will be displayed by merging
|
|
|
|
the attributes of FACE with any other face attributes
|
|
|
|
of text in those lines.
|
|
|
|
|
2014-02-07 07:18:02 +00:00
|
|
|
Interactively, prompt for REGEXP using `read-regexp', then FACE.
|
|
|
|
Use the global history list for FACE.
|
2000-08-02 21:29:36 +00:00
|
|
|
|
2020-04-11 23:45:02 +00:00
|
|
|
If REGEXP contains upper case characters (excluding those preceded by `\\')
|
|
|
|
and `search-upper-case' is non-nil, the matching is case-sensitive.
|
|
|
|
|
2013-03-08 04:18:16 +00:00
|
|
|
Use Font lock mode, if enabled, to highlight REGEXP. Otherwise,
|
|
|
|
use overlays for highlighting. If overlays are used, the
|
|
|
|
highlighting will not update as you type."
|
2000-08-02 21:29:36 +00:00
|
|
|
(interactive
|
|
|
|
(list
|
2008-07-29 14:45:01 +00:00
|
|
|
(hi-lock-regexp-okay
|
2013-12-20 19:55:56 +00:00
|
|
|
(read-regexp "Regexp to highlight line" 'regexp-history-last))
|
2000-08-02 21:29:36 +00:00
|
|
|
(hi-lock-read-face-name)))
|
2005-11-29 22:28:59 +00:00
|
|
|
(or (facep face) (setq face 'hi-yellow))
|
2005-12-10 11:48:21 +00:00
|
|
|
(unless hi-lock-mode (hi-lock-mode 1))
|
2000-08-02 21:29:36 +00:00
|
|
|
(hi-lock-set-pattern
|
2001-03-09 21:16:24 +00:00
|
|
|
;; The \\(?:...\\) grouping construct ensures that a leading ^, +, * or ?
|
|
|
|
;; or a trailing $ in REGEXP will be interpreted correctly.
|
2020-04-11 23:45:02 +00:00
|
|
|
(concat "^.*\\(?:" regexp "\\).*\\(?:$\\)\n?") face nil nil
|
|
|
|
(if (and case-fold-search search-upper-case)
|
|
|
|
(isearch-no-upper-case-p regexp t)
|
|
|
|
case-fold-search)))
|
2000-08-02 21:29:36 +00:00
|
|
|
|
2001-02-06 15:43:37 +00:00
|
|
|
|
2000-08-02 21:29:36 +00:00
|
|
|
;;;###autoload
|
|
|
|
(defalias 'highlight-regexp 'hi-lock-face-buffer)
|
|
|
|
;;;###autoload
|
2020-04-11 23:45:02 +00:00
|
|
|
(defun hi-lock-face-buffer (regexp &optional face subexp lighter)
|
2001-02-06 15:43:37 +00:00
|
|
|
"Set face of each match of REGEXP to FACE.
|
2014-02-07 07:18:02 +00:00
|
|
|
Interactively, prompt for REGEXP using `read-regexp', then FACE.
|
2018-08-03 21:08:10 +00:00
|
|
|
Use the global history list for FACE. Limit face setting to the
|
2018-08-15 02:37:45 +00:00
|
|
|
corresponding SUBEXP (interactively, the prefix argument) of REGEXP.
|
|
|
|
If SUBEXP is omitted or nil, the entire REGEXP is highlighted.
|
2000-08-02 21:29:36 +00:00
|
|
|
|
2020-04-11 23:45:02 +00:00
|
|
|
LIGHTER is a human-readable string that can be used to select
|
|
|
|
a regexp to unhighlight by its name instead of selecting a possibly
|
|
|
|
complex regexp or closure.
|
|
|
|
|
|
|
|
If REGEXP contains upper case characters (excluding those preceded by `\\')
|
|
|
|
and `search-upper-case' is non-nil, the matching is case-sensitive.
|
|
|
|
|
2013-03-08 04:18:16 +00:00
|
|
|
Use Font lock mode, if enabled, to highlight REGEXP. Otherwise,
|
|
|
|
use overlays for highlighting. If overlays are used, the
|
2020-05-08 14:25:45 +00:00
|
|
|
highlighting will not update as you type. The Font Lock mode
|
|
|
|
is considered \"enabled\" in a buffer if its `major-mode'
|
|
|
|
causes `font-lock-specified-p' to return non-nil, which means
|
|
|
|
the major mode specifies support for Font Lock."
|
2000-08-02 21:29:36 +00:00
|
|
|
(interactive
|
|
|
|
(list
|
2008-07-29 14:45:01 +00:00
|
|
|
(hi-lock-regexp-okay
|
2020-09-28 12:16:22 +00:00
|
|
|
(read-regexp "Regexp to highlight"
|
|
|
|
(if (use-region-p)
|
|
|
|
(prog1
|
|
|
|
(buffer-substring (region-beginning)
|
|
|
|
(region-end))
|
|
|
|
(deactivate-mark))
|
|
|
|
'regexp-history-last)))
|
2018-08-03 21:08:10 +00:00
|
|
|
(hi-lock-read-face-name)
|
|
|
|
current-prefix-arg))
|
2020-10-15 15:45:12 +00:00
|
|
|
(when (stringp face)
|
|
|
|
(setq face (intern face)))
|
2005-11-29 22:28:59 +00:00
|
|
|
(or (facep face) (setq face 'hi-yellow))
|
2005-12-10 11:48:21 +00:00
|
|
|
(unless hi-lock-mode (hi-lock-mode 1))
|
2020-04-11 23:45:02 +00:00
|
|
|
(hi-lock-set-pattern
|
|
|
|
regexp face subexp lighter
|
|
|
|
(if (and case-fold-search search-upper-case)
|
|
|
|
(isearch-no-upper-case-p regexp t)
|
|
|
|
case-fold-search)
|
|
|
|
search-spaces-regexp))
|
2000-08-02 21:29:36 +00:00
|
|
|
|
2001-02-06 15:43:37 +00:00
|
|
|
;;;###autoload
|
|
|
|
(defalias 'highlight-phrase 'hi-lock-face-phrase-buffer)
|
|
|
|
;;;###autoload
|
|
|
|
(defun hi-lock-face-phrase-buffer (regexp &optional face)
|
|
|
|
"Set face of each match of phrase REGEXP to FACE.
|
2014-02-07 07:18:02 +00:00
|
|
|
Interactively, prompt for REGEXP using `read-regexp', then FACE.
|
|
|
|
Use the global history list for FACE.
|
|
|
|
|
2020-04-11 23:45:02 +00:00
|
|
|
If REGEXP contains upper case characters (excluding those preceded by `\\')
|
|
|
|
and `search-upper-case' is non-nil, the matching is case-sensitive.
|
|
|
|
Also set `search-spaces-regexp' to the value of `search-whitespace-regexp'.
|
2013-03-08 04:18:16 +00:00
|
|
|
|
|
|
|
Use Font lock mode, if enabled, to highlight REGEXP. Otherwise,
|
|
|
|
use overlays for highlighting. If overlays are used, the
|
2020-05-08 14:25:45 +00:00
|
|
|
highlighting will not update as you type. The Font Lock mode
|
|
|
|
is considered \"enabled\" in a buffer if its `major-mode'
|
|
|
|
causes `font-lock-specified-p' to return non-nil, which means
|
|
|
|
the major mode specifies support for Font Lock."
|
2001-02-06 15:43:37 +00:00
|
|
|
(interactive
|
|
|
|
(list
|
|
|
|
(hi-lock-regexp-okay
|
2020-04-11 23:45:02 +00:00
|
|
|
(read-regexp "Phrase to highlight" 'regexp-history-last))
|
2001-02-06 15:43:37 +00:00
|
|
|
(hi-lock-read-face-name)))
|
2005-11-29 22:28:59 +00:00
|
|
|
(or (facep face) (setq face 'hi-yellow))
|
2005-12-10 11:48:21 +00:00
|
|
|
(unless hi-lock-mode (hi-lock-mode 1))
|
2020-04-11 23:45:02 +00:00
|
|
|
(hi-lock-set-pattern
|
|
|
|
regexp face nil nil
|
|
|
|
(if (and case-fold-search search-upper-case)
|
|
|
|
(isearch-no-upper-case-p regexp t)
|
|
|
|
case-fold-search)
|
|
|
|
search-whitespace-regexp))
|
2001-02-06 15:43:37 +00:00
|
|
|
|
2013-06-03 08:51:50 +00:00
|
|
|
;;;###autoload
|
|
|
|
(defalias 'highlight-symbol-at-point 'hi-lock-face-symbol-at-point)
|
|
|
|
;;;###autoload
|
|
|
|
(defun hi-lock-face-symbol-at-point ()
|
2014-02-07 07:18:02 +00:00
|
|
|
"Highlight each instance of the symbol at point.
|
|
|
|
Uses the next face from `hi-lock-face-defaults' without prompting,
|
|
|
|
unless you use a prefix argument.
|
|
|
|
Uses `find-tag-default-as-symbol-regexp' to retrieve the symbol at point.
|
|
|
|
|
2020-04-11 23:45:02 +00:00
|
|
|
If REGEXP contains upper case characters (excluding those preceded by `\\')
|
|
|
|
and `search-upper-case' is non-nil, the matching is case-sensitive.
|
|
|
|
|
2014-02-07 07:18:02 +00:00
|
|
|
This uses Font lock mode if it is enabled; otherwise it uses overlays,
|
2020-05-08 14:25:45 +00:00
|
|
|
in which case the highlighting will not update as you type. The Font
|
|
|
|
Lock mode is considered \"enabled\" in a buffer if its `major-mode'
|
|
|
|
causes `font-lock-specified-p' to return non-nil, which means
|
|
|
|
the major mode specifies support for Font Lock."
|
2013-06-03 08:51:50 +00:00
|
|
|
(interactive)
|
|
|
|
(let* ((regexp (hi-lock-regexp-okay
|
2013-12-20 19:55:56 +00:00
|
|
|
(find-tag-default-as-symbol-regexp)))
|
2013-06-03 08:51:50 +00:00
|
|
|
(hi-lock-auto-select-face t)
|
|
|
|
(face (hi-lock-read-face-name)))
|
|
|
|
(or (facep face) (setq face 'hi-yellow))
|
|
|
|
(unless hi-lock-mode (hi-lock-mode 1))
|
2020-04-11 23:45:02 +00:00
|
|
|
(hi-lock-set-pattern
|
|
|
|
regexp face nil nil
|
|
|
|
(if (and case-fold-search search-upper-case)
|
|
|
|
(isearch-no-upper-case-p regexp t)
|
|
|
|
case-fold-search))))
|
2013-06-03 08:51:50 +00:00
|
|
|
|
2012-12-10 18:33:59 +00:00
|
|
|
(defun hi-lock-keyword->face (keyword)
|
|
|
|
(cadr (cadr (cadr keyword)))) ; Keyword looks like (REGEXP (0 'FACE) ...).
|
|
|
|
|
2009-11-10 08:11:47 +00:00
|
|
|
(declare-function x-popup-menu "menu.c" (position menu))
|
2008-08-11 01:23:07 +00:00
|
|
|
|
2012-12-04 21:13:47 +00:00
|
|
|
(defun hi-lock--regexps-at-point ()
|
|
|
|
(let ((regexps '()))
|
|
|
|
;; When using overlays, there is no ambiguity on the best
|
|
|
|
;; choice of regexp.
|
2012-12-06 16:17:11 +00:00
|
|
|
(let ((regexp (get-char-property (point) 'hi-lock-overlay-regexp)))
|
|
|
|
(when regexp (push regexp regexps)))
|
2012-12-10 18:33:59 +00:00
|
|
|
;; With font-locking on, check if the cursor is on a highlighted text.
|
2020-04-12 23:40:56 +00:00
|
|
|
(let* ((faces-after (get-text-property (point) 'face))
|
|
|
|
(faces-before
|
|
|
|
(unless (bobp) (get-text-property (1- (point)) 'face)))
|
2020-04-20 23:48:22 +00:00
|
|
|
;; Use proper-list-p to handle faces like (foreground-color . "red3")
|
|
|
|
(faces-after (if (proper-list-p faces-after) faces-after (list faces-after)))
|
|
|
|
(faces-before (if (proper-list-p faces-before) faces-before (list faces-before)))
|
2020-04-12 23:40:56 +00:00
|
|
|
(faces (mapcar #'hi-lock-keyword->face
|
|
|
|
hi-lock-interactive-patterns))
|
|
|
|
(face-after (seq-some (lambda (face) (car (memq face faces))) faces-after))
|
|
|
|
(face-before (seq-some (lambda (face) (car (memq face faces))) faces-before)))
|
2012-12-10 21:26:13 +00:00
|
|
|
(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)
|
2020-04-12 23:40:56 +00:00
|
|
|
(let ((regexp (or (car (rassq hi-lock-pattern hi-lock-interactive-lighters))
|
|
|
|
(car hi-lock-pattern))))
|
2012-12-10 21:26:13 +00:00
|
|
|
(if (string-match regexp hi-text)
|
|
|
|
(push regexp regexps)))))))
|
2012-12-07 16:48:42 +00:00
|
|
|
regexps))
|
2012-12-04 21:13:47 +00:00
|
|
|
|
2012-12-10 18:33:59 +00:00
|
|
|
(defvar-local hi-lock--unused-faces nil
|
|
|
|
"List of faces that is not used and is available for highlighting new text.
|
|
|
|
Face names from this list come from `hi-lock-face-defaults'.")
|
2012-12-06 16:17:11 +00:00
|
|
|
|
2000-08-02 21:29:36 +00:00
|
|
|
;;;###autoload
|
|
|
|
(defalias 'unhighlight-regexp 'hi-lock-unface-buffer)
|
|
|
|
;;;###autoload
|
|
|
|
(defun hi-lock-unface-buffer (regexp)
|
2001-02-06 15:43:37 +00:00
|
|
|
"Remove highlighting of each match to REGEXP set by hi-lock.
|
2012-08-14 06:52:59 +00:00
|
|
|
Interactively, prompt for REGEXP, accepting only regexps
|
2012-12-04 21:13:47 +00:00
|
|
|
previously inserted by hi-lock interactive functions.
|
|
|
|
If REGEXP is t (or if \\[universal-argument] was specified interactively),
|
|
|
|
then remove all hi-lock highlighting."
|
2000-08-02 21:29:36 +00:00
|
|
|
(interactive
|
2012-12-04 21:13:47 +00:00
|
|
|
(cond
|
|
|
|
(current-prefix-arg (list t))
|
|
|
|
((and (display-popup-menus-p)
|
|
|
|
(listp last-nonmenu-event)
|
|
|
|
use-dialog-box)
|
|
|
|
(catch 'snafu
|
|
|
|
(or
|
|
|
|
(x-popup-menu
|
|
|
|
t
|
|
|
|
(cons
|
2018-11-05 00:22:15 +00:00
|
|
|
'keymap
|
2012-12-04 21:13:47 +00:00
|
|
|
(cons "Select Pattern to Unhighlight"
|
|
|
|
(mapcar (lambda (pattern)
|
2020-04-11 23:45:02 +00:00
|
|
|
(let ((lighter
|
|
|
|
(or (car (rassq pattern hi-lock-interactive-lighters))
|
|
|
|
(car pattern))))
|
|
|
|
(list lighter
|
|
|
|
(format
|
|
|
|
"%s (%s)" lighter
|
|
|
|
(hi-lock-keyword->face pattern))
|
|
|
|
(cons nil nil)
|
|
|
|
lighter)))
|
2012-12-04 21:13:47 +00:00
|
|
|
hi-lock-interactive-patterns))))
|
|
|
|
;; If the user clicks outside the menu, meaning that they
|
|
|
|
;; change their mind, x-popup-menu returns nil, and
|
|
|
|
;; interactive signals a wrong number of arguments error.
|
|
|
|
;; To prevent that, we return an empty string, which will
|
|
|
|
;; effectively disable the rest of the function.
|
|
|
|
(throw 'snafu '("")))))
|
|
|
|
(t
|
|
|
|
;; Un-highlighting triggered via keyboard action.
|
|
|
|
(unless hi-lock-interactive-patterns
|
2020-04-11 23:45:02 +00:00
|
|
|
(user-error "No highlighting to remove"))
|
2012-12-04 21:13:47 +00:00
|
|
|
;; Infer the regexp to un-highlight based on cursor position.
|
2012-12-07 16:48:42 +00:00
|
|
|
(let* ((defaults (or (hi-lock--regexps-at-point)
|
2020-04-12 23:40:56 +00:00
|
|
|
(mapcar (lambda (pattern)
|
|
|
|
(or (car (rassq pattern hi-lock-interactive-lighters))
|
|
|
|
(car pattern)))
|
|
|
|
hi-lock-interactive-patterns))))
|
2000-08-02 21:29:36 +00:00
|
|
|
(list
|
Use `format-prompt' when prompting with default values
* lisp/woman.el (woman-file-name):
* lisp/wid-edit.el (widget-file-prompt-value)
(widget-coding-system-prompt-value):
* lisp/w32-fns.el (w32-set-system-coding-system):
* lisp/vc/vc.el (vc-print-root-log):
* lisp/vc/vc-annotate.el (vc-annotate):
* lisp/vc/emerge.el (emerge-read-file-name):
* lisp/vc/ediff.el (ediff-directories)
(ediff-directory-revisions, ediff-directories3)
(ediff-merge-directories, )
(ediff-merge-directories-with-ancestor)
(ediff-merge-directory-revisions)
(ediff-merge-directory-revisions-with-ancestor)
(ediff-merge-revisions, ediff-merge-revisions-with-ancestor)
(ediff-revision):
* lisp/vc/ediff-util.el (ediff-toggle-regexp-match):
* lisp/vc/ediff-mult.el (ediff-filegroup-action):
* lisp/vc/add-log.el (prompt-for-change-log-name):
* lisp/textmodes/table.el (table-insert-row-column)
(table-span-cell, table-split-cell-horizontally)
(table-split-cell, table-justify, table-generate-source)
(table-insert-sequence, table-capture)
(table--read-from-minibuffer, table--query-justification):
* lisp/textmodes/sgml-mode.el (sgml-tag, sgml-tag-help):
* lisp/textmodes/reftex-ref.el (reftex-goto-label):
* lisp/textmodes/refer.el (refer-get-bib-files):
* lisp/textmodes/css-mode.el (css-lookup-symbol):
* lisp/term.el (serial-read-name, serial-read-speed):
* lisp/speedbar.el (speedbar-change-initial-expansion-list):
* lisp/simple.el (previous-matching-history-element)
(set-variable):
* lisp/ses.el (ses-read-cell, ses-set-column-width):
* lisp/replace.el (query-replace-read-from)
(occur-read-primary-args):
* lisp/rect.el (string-rectangle, string-insert-rectangle):
* lisp/progmodes/tcl.el (tcl-help-on-word):
* lisp/progmodes/sh-script.el (sh-set-shell):
* lisp/progmodes/python.el (python-eldoc-at-point):
* lisp/progmodes/octave.el (octave-completing-read)
(octave-update-function-file-comment, octave-insert-defun):
* lisp/progmodes/inf-lisp.el (lisp-symprompt):
* lisp/progmodes/cperl-mode.el (cperl-info-on-command)
(cperl-perldoc):
* lisp/progmodes/compile.el (compilation-find-file):
* lisp/net/rcirc.el (rcirc-prompt-for-encryption):
* lisp/net/eww.el (eww):
* lisp/net/browse-url.el (browse-url-with-browser-kind):
* lisp/man.el (man):
* lisp/mail/sendmail.el (sendmail-query-user-about-smtp):
* lisp/mail/mailalias.el (build-mail-aliases):
* lisp/mail/mailabbrev.el (merge-mail-abbrevs)
(rebuild-mail-abbrevs):
* lisp/locate.el (locate-prompt-for-search-string):
* lisp/isearch.el (isearch-occur):
* lisp/international/ogonek.el (ogonek-read-encoding)
(ogonek-read-prefix):
* lisp/international/mule.el (read-buffer-file-coding-system)
(set-terminal-coding-system, set-keyboard-coding-system)
(set-next-selection-coding-system, recode-region):
* lisp/international/mule-cmds.el ()
(universal-coding-system-argument, search-unencodable-char)
(select-safe-coding-system-interactively):
* lisp/info.el (Info-search, Info-search-backward, Info-menu):
* lisp/info-look.el (info-lookup-interactive-arguments):
* lisp/imenu.el (imenu--completion-buffer):
* lisp/ibuf-ext.el (mode, used-mode, ibuffer-mark-by-mode):
* lisp/hi-lock.el (hi-lock-unface-buffer)
(hi-lock-read-face-name):
* lisp/help.el (view-emacs-news, where-is):
* lisp/help-fns.el (describe-variable, describe-symbol)
(describe-keymap):
* lisp/gnus/mm-decode.el (mm-save-part):
* lisp/gnus/gnus-sum.el (gnus-summary-browse-url):
* lisp/gnus/gnus-group.el (gnus-group--read-bug-ids)
(gnus-group-set-current-level):
* lisp/frame.el (make-frame-on-monitor)
(close-display-connection, select-frame-by-name):
* lisp/format.el (format-encode-buffer, format-encode-region):
* lisp/files.el (recode-file-name):
* lisp/files-x.el (read-file-local-variable)
(read-file-local-variable-value, )
(read-file-local-variable-mode):
* lisp/ffap.el (ffap-menu-ask):
* lisp/faces.el (face-read-string):
* lisp/facemenu.el (facemenu-set-charset):
* lisp/erc/erc-dcc.el (erc-dcc-do-GET-command):
* lisp/emulation/edt-mapper.el (edt-mapper):
* lisp/emacs-lisp/trace.el (trace--read-args)
(trace-function-foreground, trace-function-background):
* lisp/emacs-lisp/smie.el (smie-config-set-indent):
* lisp/emacs-lisp/re-builder.el (reb-change-syntax):
* lisp/emacs-lisp/package.el (describe-package):
* lisp/emacs-lisp/find-func.el (read-library-name)
(find-function-read):
* lisp/emacs-lisp/ert.el (ert-read-test-name)
(ert-run-tests-interactively):
* lisp/emacs-lisp/disass.el (disassemble):
* lisp/emacs-lisp/debug.el (debug-on-entry)
(debug-on-variable-change):
* lisp/emacs-lisp/advice.el (ad-read-advised-function)
(ad-read-advice-class, ad-read-advice-name, ad-read-regexp):
* lisp/dired-x.el (dired--mark-suffix-interactive-spec):
* lisp/dired-aux.el (dired-diff):
* lisp/cus-edit.el (custom-variable-prompt, customize-mode)
(customize-changed-options):
* lisp/completion.el (interactive-completion-string-reader):
* lisp/calendar/timeclock.el (timeclock-ask-for-project):
* lisp/calc/calcalg3.el (calc-get-fit-variables):
* lisp/calc/calc-store.el (calc-edit-variable):
* lisp/calc/calc-bin.el (calc-word-size):
* lisp/bookmark.el (bookmark-set-internal):
* lisp/abbrev.el (read-abbrev-file): Use `format-prompt' for
prompting (bug#12443).
2020-09-06 14:56:44 +00:00
|
|
|
(completing-read (format-prompt "Regexp to unhighlight" (car defaults))
|
2020-04-11 23:45:02 +00:00
|
|
|
(mapcar (lambda (pattern)
|
|
|
|
(cons (or (car (rassq pattern hi-lock-interactive-lighters))
|
|
|
|
(car pattern))
|
|
|
|
(cdr pattern)))
|
|
|
|
hi-lock-interactive-patterns)
|
2012-12-04 21:13:47 +00:00
|
|
|
nil t nil nil defaults))))))
|
2020-04-11 23:45:02 +00:00
|
|
|
|
|
|
|
(when (assoc regexp hi-lock-interactive-lighters)
|
|
|
|
(setq regexp (cadr (assoc regexp hi-lock-interactive-lighters))))
|
|
|
|
|
2012-12-04 21:13:47 +00:00
|
|
|
(dolist (keyword (if (eq regexp t) hi-lock-interactive-patterns
|
|
|
|
(list (assoc regexp hi-lock-interactive-patterns))))
|
2000-08-02 21:29:36 +00:00
|
|
|
(when keyword
|
2012-12-10 18:33:59 +00:00
|
|
|
(let ((face (hi-lock-keyword->face keyword)))
|
2012-12-06 16:17:11 +00:00
|
|
|
;; Make `face' the next one to use by default.
|
2013-01-28 20:00:35 +00:00
|
|
|
(when (symbolp face) ;Don't add it if it's a list (bug#13297).
|
|
|
|
(add-to-list 'hi-lock--unused-faces (face-name face))))
|
2015-02-11 21:37:49 +00:00
|
|
|
;; FIXME: Calling `font-lock-remove-keywords' causes
|
|
|
|
;; `font-lock-specified-p' to go from nil to non-nil (because it
|
|
|
|
;; calls font-lock-set-defaults). This is yet-another bug in
|
|
|
|
;; font-lock-add/remove-keywords, which we circumvent here by
|
2015-02-24 19:03:54 +00:00
|
|
|
;; testing `font-lock-fontified' (bug#19796).
|
2015-02-11 21:37:49 +00:00
|
|
|
(if font-lock-fontified (font-lock-remove-keywords nil (list keyword)))
|
2000-08-02 21:29:36 +00:00
|
|
|
(setq hi-lock-interactive-patterns
|
|
|
|
(delq keyword hi-lock-interactive-patterns))
|
2005-12-23 16:20:58 +00:00
|
|
|
(remove-overlays
|
2020-04-11 23:45:02 +00:00
|
|
|
nil nil 'hi-lock-overlay-regexp
|
2020-04-13 23:33:52 +00:00
|
|
|
(or (car (rassq keyword hi-lock-interactive-lighters))
|
|
|
|
(hi-lock--hashcons (car keyword))))
|
2020-04-11 23:45:02 +00:00
|
|
|
(setq hi-lock-interactive-lighters
|
|
|
|
(rassq-delete-all keyword hi-lock-interactive-lighters))
|
* lisp/font-lock.el (font-lock-flush, font-lock-ensure): New functions.
(font-lock-fontify-buffer): Mark interactive-only.
(font-lock-multiline, font-lock-fontified, font-lock-set-defaults):
Make buffer-local.
(font-lock-specified-p): Remove redundant boundp check.
(font-lock-flush-function, font-lock-ensure-function): New vars.
(font-lock-turn-on-thing-lock): Set them.
(font-lock-default-fontify-buffer): Obey font-lock-dont-widen.
(font-lock-after-change-function): Make `old-len' optional.
(font-lock-set-defaults): Remove redundant `set' of font-lock-defaults.
Call font-lock-flush, just in case.
* lisp/progmodes/verilog-mode.el (verilog-preprocess): Disable workaround in
recent Emacsen.
* lisp/progmodes/vera-mode.el (vera-fontify-buffer): Declare obsolete.
(vera-mode-map, vera-mode-menu): Remove bindings to it.
* lisp/progmodes/idlw-help.el (idlwave-help-fontify): Use font-lock-ensure
and with-syntax-table.
* lisp/textmodes/conf-mode.el (conf-quote-normal):
* lisp/progmodes/sh-script.el (sh-set-shell):
* lisp/progmodes/prog-mode.el (prettify-symbols-mode):
* lisp/progmodes/f90.el (f90-font-lock-n):
* lisp/progmodes/cwarn.el (cwarn-mode):
* lisp/nxml/nxml-mode.el (nxml-toggle-char-ref-extra-display):
* lisp/progmodes/compile.el (compilation-setup, compilation--unsetup):
* lisp/hi-lock.el (hi-lock-mode, hi-lock-unface-buffer)
(hi-lock-set-pattern, hi-lock-set-file-patterns): Use font-lock-flush.
* lisp/mail/rmail.el (rmail-variables): Set font-lock-dont-widen instead of
font-lock-fontify-buffer-function and
font-lock-unfontify-buffer-function.
(rmail-unfontify-buffer-function, rmail-fontify-message):
Use with-silent-modifications.
* lisp/htmlfontify.el (hfy-force-fontification): Use jit-lock-fontify-now
and font-lock-ensure.
* lisp/bs.el (bs-show-in-buffer): Use font-lock-ensure.
* lisp/gnus/mm-view.el (mm-display-inline-fontify): Use font-lock-ensure.
* lisp/gnus/gnus-cite.el (gnus-message-citation-mode): Use font-lock-flush.
* lisp/org/org-compat.el (org-font-lock-ensure): New function.
* lisp/org/ox-odt.el (org-odt-do-format-code):
* lisp/org/ox-html.el (org-html-fontify-code):
* lisp/org/org.el (org-fontify-like-in-org-mode):
* lisp/org/org-src.el (org-src-font-lock-fontify-block):
* lisp/org/org-clock.el (org-clock-get-clocktable): Use it.
* lisp/org/ox-org.el (org-org-publish-to-org): Use it. Avoid using find-file
from Elisp.
* test/automated/ruby-mode-tests.el (ruby-assert-face): Use font-lock-ensure.
(ruby-interpolation-keeps-non-quote-syntax): Use syntax-propertize.
2014-05-29 03:45:29 +00:00
|
|
|
(font-lock-flush))))
|
2000-08-02 21:29:36 +00:00
|
|
|
|
|
|
|
;;;###autoload
|
|
|
|
(defun hi-lock-write-interactive-patterns ()
|
|
|
|
"Write interactively added patterns, if any, into buffer at point.
|
|
|
|
|
|
|
|
Interactively added patterns are those normally specified using
|
|
|
|
`highlight-regexp' and `highlight-lines-matching-regexp'; they can
|
|
|
|
be found in variable `hi-lock-interactive-patterns'."
|
|
|
|
(interactive)
|
2005-11-29 22:28:59 +00:00
|
|
|
(if (null hi-lock-interactive-patterns)
|
2020-04-11 23:45:02 +00:00
|
|
|
(user-error "There are no interactive patterns"))
|
2005-11-29 22:28:59 +00:00
|
|
|
(let ((beg (point)))
|
2007-09-25 11:07:41 +00:00
|
|
|
(mapc
|
2000-08-02 21:29:36 +00:00
|
|
|
(lambda (pattern)
|
2005-12-23 16:45:05 +00:00
|
|
|
(insert (format "%s: (%s)\n"
|
|
|
|
hi-lock-file-patterns-prefix
|
|
|
|
(prin1-to-string pattern))))
|
2005-11-29 22:28:59 +00:00
|
|
|
hi-lock-interactive-patterns)
|
|
|
|
(comment-region beg (point)))
|
|
|
|
(when (> (point) hi-lock-file-patterns-range)
|
|
|
|
(warn "Inserted keywords not close enough to top of file")))
|
2000-08-02 21:29:36 +00:00
|
|
|
|
|
|
|
;; Implementation Functions
|
|
|
|
|
|
|
|
(defun hi-lock-regexp-okay (regexp)
|
|
|
|
"Return REGEXP if it appears suitable for a font-lock pattern.
|
|
|
|
|
|
|
|
Otherwise signal an error. A pattern that matches the null string is
|
|
|
|
not suitable."
|
2013-12-20 19:55:56 +00:00
|
|
|
(cond
|
|
|
|
((null regexp)
|
|
|
|
(error "Regexp cannot match nil"))
|
|
|
|
((string-match regexp "")
|
|
|
|
(error "Regexp cannot match an empty string"))
|
|
|
|
(t regexp)))
|
2013-03-08 04:18:16 +00:00
|
|
|
|
2000-08-02 21:29:36 +00:00
|
|
|
(defun hi-lock-read-face-name ()
|
2012-12-06 16:17:11 +00:00
|
|
|
"Return face for interactive highlighting.
|
2012-12-04 21:13:47 +00:00
|
|
|
When `hi-lock-auto-select-face' is non-nil, just return the next face.
|
2014-02-07 07:18:02 +00:00
|
|
|
Otherwise, or with a prefix argument, read a face from the minibuffer
|
|
|
|
with completion and history."
|
2012-12-10 18:33:59 +00:00
|
|
|
(unless hi-lock-interactive-patterns
|
|
|
|
(setq hi-lock--unused-faces hi-lock-face-defaults))
|
|
|
|
(let* ((last-used-face
|
|
|
|
(when hi-lock-interactive-patterns
|
|
|
|
(face-name (hi-lock-keyword->face
|
|
|
|
(car hi-lock-interactive-patterns)))))
|
|
|
|
(defaults (append hi-lock--unused-faces
|
|
|
|
(cdr (member last-used-face hi-lock-face-defaults))
|
|
|
|
hi-lock-face-defaults))
|
|
|
|
face)
|
2012-12-06 16:17:11 +00:00
|
|
|
(if (and hi-lock-auto-select-face (not current-prefix-arg))
|
2012-12-10 18:33:59 +00:00
|
|
|
(setq face (or (pop hi-lock--unused-faces) (car defaults)))
|
|
|
|
(setq face (completing-read
|
Use `format-prompt' when prompting with default values
* lisp/woman.el (woman-file-name):
* lisp/wid-edit.el (widget-file-prompt-value)
(widget-coding-system-prompt-value):
* lisp/w32-fns.el (w32-set-system-coding-system):
* lisp/vc/vc.el (vc-print-root-log):
* lisp/vc/vc-annotate.el (vc-annotate):
* lisp/vc/emerge.el (emerge-read-file-name):
* lisp/vc/ediff.el (ediff-directories)
(ediff-directory-revisions, ediff-directories3)
(ediff-merge-directories, )
(ediff-merge-directories-with-ancestor)
(ediff-merge-directory-revisions)
(ediff-merge-directory-revisions-with-ancestor)
(ediff-merge-revisions, ediff-merge-revisions-with-ancestor)
(ediff-revision):
* lisp/vc/ediff-util.el (ediff-toggle-regexp-match):
* lisp/vc/ediff-mult.el (ediff-filegroup-action):
* lisp/vc/add-log.el (prompt-for-change-log-name):
* lisp/textmodes/table.el (table-insert-row-column)
(table-span-cell, table-split-cell-horizontally)
(table-split-cell, table-justify, table-generate-source)
(table-insert-sequence, table-capture)
(table--read-from-minibuffer, table--query-justification):
* lisp/textmodes/sgml-mode.el (sgml-tag, sgml-tag-help):
* lisp/textmodes/reftex-ref.el (reftex-goto-label):
* lisp/textmodes/refer.el (refer-get-bib-files):
* lisp/textmodes/css-mode.el (css-lookup-symbol):
* lisp/term.el (serial-read-name, serial-read-speed):
* lisp/speedbar.el (speedbar-change-initial-expansion-list):
* lisp/simple.el (previous-matching-history-element)
(set-variable):
* lisp/ses.el (ses-read-cell, ses-set-column-width):
* lisp/replace.el (query-replace-read-from)
(occur-read-primary-args):
* lisp/rect.el (string-rectangle, string-insert-rectangle):
* lisp/progmodes/tcl.el (tcl-help-on-word):
* lisp/progmodes/sh-script.el (sh-set-shell):
* lisp/progmodes/python.el (python-eldoc-at-point):
* lisp/progmodes/octave.el (octave-completing-read)
(octave-update-function-file-comment, octave-insert-defun):
* lisp/progmodes/inf-lisp.el (lisp-symprompt):
* lisp/progmodes/cperl-mode.el (cperl-info-on-command)
(cperl-perldoc):
* lisp/progmodes/compile.el (compilation-find-file):
* lisp/net/rcirc.el (rcirc-prompt-for-encryption):
* lisp/net/eww.el (eww):
* lisp/net/browse-url.el (browse-url-with-browser-kind):
* lisp/man.el (man):
* lisp/mail/sendmail.el (sendmail-query-user-about-smtp):
* lisp/mail/mailalias.el (build-mail-aliases):
* lisp/mail/mailabbrev.el (merge-mail-abbrevs)
(rebuild-mail-abbrevs):
* lisp/locate.el (locate-prompt-for-search-string):
* lisp/isearch.el (isearch-occur):
* lisp/international/ogonek.el (ogonek-read-encoding)
(ogonek-read-prefix):
* lisp/international/mule.el (read-buffer-file-coding-system)
(set-terminal-coding-system, set-keyboard-coding-system)
(set-next-selection-coding-system, recode-region):
* lisp/international/mule-cmds.el ()
(universal-coding-system-argument, search-unencodable-char)
(select-safe-coding-system-interactively):
* lisp/info.el (Info-search, Info-search-backward, Info-menu):
* lisp/info-look.el (info-lookup-interactive-arguments):
* lisp/imenu.el (imenu--completion-buffer):
* lisp/ibuf-ext.el (mode, used-mode, ibuffer-mark-by-mode):
* lisp/hi-lock.el (hi-lock-unface-buffer)
(hi-lock-read-face-name):
* lisp/help.el (view-emacs-news, where-is):
* lisp/help-fns.el (describe-variable, describe-symbol)
(describe-keymap):
* lisp/gnus/mm-decode.el (mm-save-part):
* lisp/gnus/gnus-sum.el (gnus-summary-browse-url):
* lisp/gnus/gnus-group.el (gnus-group--read-bug-ids)
(gnus-group-set-current-level):
* lisp/frame.el (make-frame-on-monitor)
(close-display-connection, select-frame-by-name):
* lisp/format.el (format-encode-buffer, format-encode-region):
* lisp/files.el (recode-file-name):
* lisp/files-x.el (read-file-local-variable)
(read-file-local-variable-value, )
(read-file-local-variable-mode):
* lisp/ffap.el (ffap-menu-ask):
* lisp/faces.el (face-read-string):
* lisp/facemenu.el (facemenu-set-charset):
* lisp/erc/erc-dcc.el (erc-dcc-do-GET-command):
* lisp/emulation/edt-mapper.el (edt-mapper):
* lisp/emacs-lisp/trace.el (trace--read-args)
(trace-function-foreground, trace-function-background):
* lisp/emacs-lisp/smie.el (smie-config-set-indent):
* lisp/emacs-lisp/re-builder.el (reb-change-syntax):
* lisp/emacs-lisp/package.el (describe-package):
* lisp/emacs-lisp/find-func.el (read-library-name)
(find-function-read):
* lisp/emacs-lisp/ert.el (ert-read-test-name)
(ert-run-tests-interactively):
* lisp/emacs-lisp/disass.el (disassemble):
* lisp/emacs-lisp/debug.el (debug-on-entry)
(debug-on-variable-change):
* lisp/emacs-lisp/advice.el (ad-read-advised-function)
(ad-read-advice-class, ad-read-advice-name, ad-read-regexp):
* lisp/dired-x.el (dired--mark-suffix-interactive-spec):
* lisp/dired-aux.el (dired-diff):
* lisp/cus-edit.el (custom-variable-prompt, customize-mode)
(customize-changed-options):
* lisp/completion.el (interactive-completion-string-reader):
* lisp/calendar/timeclock.el (timeclock-ask-for-project):
* lisp/calc/calcalg3.el (calc-get-fit-variables):
* lisp/calc/calc-store.el (calc-edit-variable):
* lisp/calc/calc-bin.el (calc-word-size):
* lisp/bookmark.el (bookmark-set-internal):
* lisp/abbrev.el (read-abbrev-file): Use `format-prompt' for
prompting (bug#12443).
2020-09-06 14:56:44 +00:00
|
|
|
(format-prompt "Highlight using face" (car defaults))
|
2012-12-10 18:33:59 +00:00
|
|
|
obarray 'facep t nil 'face-name-history defaults))
|
|
|
|
;; Update list of un-used faces.
|
|
|
|
(setq hi-lock--unused-faces (remove face hi-lock--unused-faces))
|
|
|
|
;; Grow the list of defaults.
|
|
|
|
(add-to-list 'hi-lock-face-defaults face t))
|
|
|
|
(intern face)))
|
2000-08-02 21:29:36 +00:00
|
|
|
|
2020-04-11 23:45:02 +00:00
|
|
|
(defun hi-lock-set-pattern (regexp face &optional subexp lighter case-fold spaces-regexp)
|
2018-08-15 02:37:45 +00:00
|
|
|
"Highlight SUBEXP of REGEXP with face FACE.
|
|
|
|
If omitted or nil, SUBEXP defaults to zero, i.e. the entire
|
2020-04-11 23:45:02 +00:00
|
|
|
REGEXP is highlighted. LIGHTER is a human-readable string to
|
|
|
|
display instead of a regexp. Non-nil CASE-FOLD ignores case.
|
|
|
|
SPACES-REGEXP is a regexp to substitute spaces in font-lock search."
|
2012-12-06 16:17:11 +00:00
|
|
|
;; Hashcons the regexp, so it can be passed to remove-overlays later.
|
|
|
|
(setq regexp (hi-lock--hashcons regexp))
|
2018-08-03 21:08:10 +00:00
|
|
|
(setq subexp (or subexp 0))
|
2020-04-11 23:45:02 +00:00
|
|
|
(let ((pattern (list (lambda (limit)
|
|
|
|
(let ((case-fold-search case-fold)
|
|
|
|
(search-spaces-regexp spaces-regexp))
|
|
|
|
(re-search-forward regexp limit t)))
|
|
|
|
(list subexp (list 'quote face) 'prepend)))
|
2017-08-24 15:00:20 +00:00
|
|
|
(no-matches t))
|
2012-12-10 18:33:59 +00:00
|
|
|
;; Refuse to highlight a text that is already highlighted.
|
2020-04-12 23:40:56 +00:00
|
|
|
(if (or (assoc regexp hi-lock-interactive-patterns)
|
|
|
|
(assoc (or lighter regexp) hi-lock-interactive-lighters))
|
2017-04-27 03:01:19 +00:00
|
|
|
(add-to-list 'hi-lock--unused-faces (face-name face))
|
2005-11-24 20:52:16 +00:00
|
|
|
(push pattern hi-lock-interactive-patterns)
|
2020-04-11 23:45:02 +00:00
|
|
|
(push (cons (or lighter regexp) pattern) hi-lock-interactive-lighters)
|
2013-12-20 19:47:01 +00:00
|
|
|
(if (and font-lock-mode (font-lock-specified-p major-mode))
|
2010-10-09 04:09:19 +00:00
|
|
|
(progn
|
|
|
|
(font-lock-add-keywords nil (list pattern) t)
|
* lisp/font-lock.el (font-lock-flush, font-lock-ensure): New functions.
(font-lock-fontify-buffer): Mark interactive-only.
(font-lock-multiline, font-lock-fontified, font-lock-set-defaults):
Make buffer-local.
(font-lock-specified-p): Remove redundant boundp check.
(font-lock-flush-function, font-lock-ensure-function): New vars.
(font-lock-turn-on-thing-lock): Set them.
(font-lock-default-fontify-buffer): Obey font-lock-dont-widen.
(font-lock-after-change-function): Make `old-len' optional.
(font-lock-set-defaults): Remove redundant `set' of font-lock-defaults.
Call font-lock-flush, just in case.
* lisp/progmodes/verilog-mode.el (verilog-preprocess): Disable workaround in
recent Emacsen.
* lisp/progmodes/vera-mode.el (vera-fontify-buffer): Declare obsolete.
(vera-mode-map, vera-mode-menu): Remove bindings to it.
* lisp/progmodes/idlw-help.el (idlwave-help-fontify): Use font-lock-ensure
and with-syntax-table.
* lisp/textmodes/conf-mode.el (conf-quote-normal):
* lisp/progmodes/sh-script.el (sh-set-shell):
* lisp/progmodes/prog-mode.el (prettify-symbols-mode):
* lisp/progmodes/f90.el (f90-font-lock-n):
* lisp/progmodes/cwarn.el (cwarn-mode):
* lisp/nxml/nxml-mode.el (nxml-toggle-char-ref-extra-display):
* lisp/progmodes/compile.el (compilation-setup, compilation--unsetup):
* lisp/hi-lock.el (hi-lock-mode, hi-lock-unface-buffer)
(hi-lock-set-pattern, hi-lock-set-file-patterns): Use font-lock-flush.
* lisp/mail/rmail.el (rmail-variables): Set font-lock-dont-widen instead of
font-lock-fontify-buffer-function and
font-lock-unfontify-buffer-function.
(rmail-unfontify-buffer-function, rmail-fontify-message):
Use with-silent-modifications.
* lisp/htmlfontify.el (hfy-force-fontification): Use jit-lock-fontify-now
and font-lock-ensure.
* lisp/bs.el (bs-show-in-buffer): Use font-lock-ensure.
* lisp/gnus/mm-view.el (mm-display-inline-fontify): Use font-lock-ensure.
* lisp/gnus/gnus-cite.el (gnus-message-citation-mode): Use font-lock-flush.
* lisp/org/org-compat.el (org-font-lock-ensure): New function.
* lisp/org/ox-odt.el (org-odt-do-format-code):
* lisp/org/ox-html.el (org-html-fontify-code):
* lisp/org/org.el (org-fontify-like-in-org-mode):
* lisp/org/org-src.el (org-src-font-lock-fontify-block):
* lisp/org/org-clock.el (org-clock-get-clocktable): Use it.
* lisp/org/ox-org.el (org-org-publish-to-org): Use it. Avoid using find-file
from Elisp.
* test/automated/ruby-mode-tests.el (ruby-assert-face): Use font-lock-ensure.
(ruby-interpolation-keeps-non-quote-syntax): Use syntax-propertize.
2014-05-29 03:45:29 +00:00
|
|
|
(font-lock-flush))
|
2012-12-06 16:17:11 +00:00
|
|
|
(let* ((range-min (- (point) (/ hi-lock-highlight-range 2)))
|
2005-12-23 16:20:58 +00:00
|
|
|
(range-max (+ (point) (/ hi-lock-highlight-range 2)))
|
|
|
|
(search-start
|
|
|
|
(max (point-min)
|
|
|
|
(- range-min (max 0 (- range-max (point-max))))))
|
|
|
|
(search-end
|
|
|
|
(min (point-max)
|
2020-04-11 23:45:02 +00:00
|
|
|
(+ range-max (max 0 (- (point-min) range-min)))))
|
|
|
|
(case-fold-search case-fold)
|
|
|
|
(search-spaces-regexp spaces-regexp))
|
2005-12-23 16:20:58 +00:00
|
|
|
(save-excursion
|
|
|
|
(goto-char search-start)
|
|
|
|
(while (re-search-forward regexp search-end t)
|
2017-08-24 15:00:20 +00:00
|
|
|
(when no-matches (setq no-matches nil))
|
2018-08-03 21:08:10 +00:00
|
|
|
(let ((overlay (make-overlay (match-beginning subexp)
|
|
|
|
(match-end subexp))))
|
2005-12-23 16:20:58 +00:00
|
|
|
(overlay-put overlay 'hi-lock-overlay t)
|
2020-04-12 23:40:56 +00:00
|
|
|
(overlay-put overlay 'hi-lock-overlay-regexp (or lighter regexp))
|
2005-12-23 16:20:58 +00:00
|
|
|
(overlay-put overlay 'face face))
|
2017-08-24 15:00:20 +00:00
|
|
|
(goto-char (match-end 0)))
|
|
|
|
(when no-matches
|
2017-08-24 15:24:59 +00:00
|
|
|
(add-to-list 'hi-lock--unused-faces (face-name face))
|
|
|
|
(setq hi-lock-interactive-patterns
|
2020-04-11 23:45:02 +00:00
|
|
|
(cdr hi-lock-interactive-patterns)
|
|
|
|
hi-lock-interactive-lighters
|
2020-08-06 23:55:00 +00:00
|
|
|
(cdr hi-lock-interactive-lighters))))
|
|
|
|
(when (or (> search-start (point-min)) (< search-end (point-max)))
|
|
|
|
(message "Hi-lock added only in range %d-%d" search-start search-end)))))))
|
2000-08-02 21:29:36 +00:00
|
|
|
|
|
|
|
(defun hi-lock-set-file-patterns (patterns)
|
|
|
|
"Replace file patterns list with PATTERNS and refontify."
|
2001-02-06 15:43:37 +00:00
|
|
|
(when (or hi-lock-file-patterns patterns)
|
|
|
|
(font-lock-remove-keywords nil hi-lock-file-patterns)
|
|
|
|
(setq hi-lock-file-patterns patterns)
|
2005-12-23 16:45:05 +00:00
|
|
|
(font-lock-add-keywords nil hi-lock-file-patterns t)
|
* lisp/font-lock.el (font-lock-flush, font-lock-ensure): New functions.
(font-lock-fontify-buffer): Mark interactive-only.
(font-lock-multiline, font-lock-fontified, font-lock-set-defaults):
Make buffer-local.
(font-lock-specified-p): Remove redundant boundp check.
(font-lock-flush-function, font-lock-ensure-function): New vars.
(font-lock-turn-on-thing-lock): Set them.
(font-lock-default-fontify-buffer): Obey font-lock-dont-widen.
(font-lock-after-change-function): Make `old-len' optional.
(font-lock-set-defaults): Remove redundant `set' of font-lock-defaults.
Call font-lock-flush, just in case.
* lisp/progmodes/verilog-mode.el (verilog-preprocess): Disable workaround in
recent Emacsen.
* lisp/progmodes/vera-mode.el (vera-fontify-buffer): Declare obsolete.
(vera-mode-map, vera-mode-menu): Remove bindings to it.
* lisp/progmodes/idlw-help.el (idlwave-help-fontify): Use font-lock-ensure
and with-syntax-table.
* lisp/textmodes/conf-mode.el (conf-quote-normal):
* lisp/progmodes/sh-script.el (sh-set-shell):
* lisp/progmodes/prog-mode.el (prettify-symbols-mode):
* lisp/progmodes/f90.el (f90-font-lock-n):
* lisp/progmodes/cwarn.el (cwarn-mode):
* lisp/nxml/nxml-mode.el (nxml-toggle-char-ref-extra-display):
* lisp/progmodes/compile.el (compilation-setup, compilation--unsetup):
* lisp/hi-lock.el (hi-lock-mode, hi-lock-unface-buffer)
(hi-lock-set-pattern, hi-lock-set-file-patterns): Use font-lock-flush.
* lisp/mail/rmail.el (rmail-variables): Set font-lock-dont-widen instead of
font-lock-fontify-buffer-function and
font-lock-unfontify-buffer-function.
(rmail-unfontify-buffer-function, rmail-fontify-message):
Use with-silent-modifications.
* lisp/htmlfontify.el (hfy-force-fontification): Use jit-lock-fontify-now
and font-lock-ensure.
* lisp/bs.el (bs-show-in-buffer): Use font-lock-ensure.
* lisp/gnus/mm-view.el (mm-display-inline-fontify): Use font-lock-ensure.
* lisp/gnus/gnus-cite.el (gnus-message-citation-mode): Use font-lock-flush.
* lisp/org/org-compat.el (org-font-lock-ensure): New function.
* lisp/org/ox-odt.el (org-odt-do-format-code):
* lisp/org/ox-html.el (org-html-fontify-code):
* lisp/org/org.el (org-fontify-like-in-org-mode):
* lisp/org/org-src.el (org-src-font-lock-fontify-block):
* lisp/org/org-clock.el (org-clock-get-clocktable): Use it.
* lisp/org/ox-org.el (org-org-publish-to-org): Use it. Avoid using find-file
from Elisp.
* test/automated/ruby-mode-tests.el (ruby-assert-face): Use font-lock-ensure.
(ruby-interpolation-keeps-non-quote-syntax): Use syntax-propertize.
2014-05-29 03:45:29 +00:00
|
|
|
(font-lock-flush)))
|
2000-08-02 21:29:36 +00:00
|
|
|
|
2020-09-28 09:45:28 +00:00
|
|
|
;;;###autoload
|
2000-08-02 21:29:36 +00:00
|
|
|
(defun hi-lock-find-patterns ()
|
2016-04-29 20:53:42 +00:00
|
|
|
"Add patterns from the current buffer to the list of hi-lock patterns."
|
2000-08-02 21:29:36 +00:00
|
|
|
(interactive)
|
|
|
|
(unless (memq major-mode hi-lock-exclude-modes)
|
|
|
|
(let ((all-patterns nil)
|
|
|
|
(target-regexp (concat "\\<" hi-lock-file-patterns-prefix ":")))
|
|
|
|
(save-excursion
|
2002-02-01 19:31:46 +00:00
|
|
|
(save-restriction
|
|
|
|
(widen)
|
|
|
|
(goto-char (point-min))
|
|
|
|
(re-search-forward target-regexp
|
|
|
|
(+ (point) hi-lock-file-patterns-range) t)
|
|
|
|
(beginning-of-line)
|
|
|
|
(while (and (re-search-forward target-regexp (+ (point) 100) t)
|
|
|
|
(not (looking-at "\\s-*end")))
|
2005-07-07 01:51:48 +00:00
|
|
|
(condition-case nil
|
|
|
|
(setq all-patterns (append (read (current-buffer)) all-patterns))
|
|
|
|
(error (message "Invalid pattern list expression at %d"
|
2005-11-24 20:52:16 +00:00
|
|
|
(line-number-at-pos)))))))
|
2007-04-20 19:24:19 +00:00
|
|
|
(when (and all-patterns
|
|
|
|
hi-lock-mode
|
|
|
|
(cond
|
|
|
|
((eq this-command 'hi-lock-find-patterns) t)
|
|
|
|
((functionp hi-lock-file-patterns-policy)
|
|
|
|
(funcall hi-lock-file-patterns-policy all-patterns))
|
|
|
|
((eq hi-lock-file-patterns-policy 'ask)
|
|
|
|
(y-or-n-p "Add patterns from this buffer to hi-lock? "))
|
|
|
|
(t nil)))
|
|
|
|
(hi-lock-set-file-patterns all-patterns)
|
2009-10-02 03:48:36 +00:00
|
|
|
(if (called-interactively-p 'interactive)
|
2007-04-20 19:24:19 +00:00
|
|
|
(message "Hi-lock added %d patterns." (length all-patterns)))))))
|
2000-08-02 21:29:36 +00:00
|
|
|
|
|
|
|
(defun hi-lock-font-lock-hook ()
|
2006-02-02 10:43:18 +00:00
|
|
|
"Add hi-lock patterns to font-lock's."
|
2010-10-09 04:09:19 +00:00
|
|
|
(when font-lock-fontified
|
|
|
|
(font-lock-add-keywords nil hi-lock-file-patterns t)
|
|
|
|
(font-lock-add-keywords nil hi-lock-interactive-patterns t)))
|
2000-08-02 21:29:36 +00:00
|
|
|
|
2012-12-06 16:17:11 +00:00
|
|
|
(defvar hi-lock--hashcons-hash
|
|
|
|
(make-hash-table :test 'equal :weakness t)
|
|
|
|
"Hash table used to hash cons regexps.")
|
2005-12-23 16:20:58 +00:00
|
|
|
|
2012-12-06 16:17:11 +00:00
|
|
|
(defun hi-lock--hashcons (string)
|
|
|
|
"Return unique object equal to STRING."
|
|
|
|
(or (gethash string hi-lock--hashcons-hash)
|
|
|
|
(puthash string string hi-lock--hashcons-hash)))
|
2005-12-23 16:20:58 +00:00
|
|
|
|
2008-03-31 00:04:49 +00:00
|
|
|
(defun hi-lock-unload-function ()
|
|
|
|
"Unload the Hi-Lock library."
|
|
|
|
(global-hi-lock-mode -1)
|
|
|
|
;; continue standard unloading
|
|
|
|
nil)
|
|
|
|
|
2000-08-02 21:29:36 +00:00
|
|
|
(provide 'hi-lock)
|
|
|
|
|
|
|
|
;;; hi-lock.el ends here
|