Mercurial > emacs
annotate lisp/hi-lock.el @ 92111:105ec1146aa7
Finish pdbtrack integration cleanup, settling missing-functions
byte compiler warnings appropriately.
* progmodes/python.el (python-point): Remove this - beginning-of-line was
all that was necessary for `python-pdbtrack-overlay-arrow'.
(python-end-of-def-or-class, python-beginning-of-def-or-class)
(python-goto-initial-line): Drop these - they were only needed for
python-point.
(python-comint-output-filter-function): Use condition-case and
beginning-of-line directly, instead of python-mode.el functions
which require all sorts of baggage.
(point-safe): Unnecessary - we're using condition-case directly,
instead.
(python-execute-file): Include for python-shell, which i'm leaving
in keeping despite it being unnecessary for pdb tracking.
author | Ken Manheimer <ken.manheimer@gmail.com> |
---|---|
date | Fri, 22 Feb 2008 17:49:48 +0000 |
parents | 107ccd98fa12 |
children | 606f2d163a64 d3e8f7c16304 |
rev | line source |
---|---|
38436
b174db545cfd
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
36708
diff
changeset
|
1 ;;; hi-lock.el --- minor mode for interactive automatic highlighting |
30565 | 2 |
64762
41bb365f41c4
Update years in copyright notice; nfc.
Thien-Thi Nguyen <ttn@gnuvola.org>
parents:
64117
diff
changeset
|
3 ;; Copyright (C) 2000, 2001, 2002, 2003, 2004, |
79721 | 4 ;; 2005, 2006, 2007, 2008 Free Software Foundation, Inc. |
30565 | 5 |
77343
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
6 ;; Author: David M. Koppelman, koppel@ece.lsu.edu |
30565 | 7 ;; Keywords: faces, minor-mode, matching, display |
8 | |
9 ;; This file is part of GNU Emacs. | |
10 | |
11 ;; GNU Emacs is free software; you can redistribute it and/or modify | |
12 ;; it under the terms of the GNU General Public License as published by | |
78236
9355f9b7bbff
Switch license to GPLv3 or later.
Glenn Morris <rgm@gnu.org>
parents:
77553
diff
changeset
|
13 ;; the Free Software Foundation; either version 3, or (at your option) |
30565 | 14 ;; any later version. |
15 | |
16 ;; GNU Emacs is distributed in the hope that it will be useful, | |
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of | |
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
19 ;; GNU General Public License for more details. | |
20 | |
21 ;; You should have received a copy of the GNU General Public License | |
22 ;; along with GNU Emacs; see the file COPYING. If not, write to the | |
64091 | 23 ;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, |
24 ;; Boston, MA 02110-1301, USA. | |
30565 | 25 |
38436
b174db545cfd
Some fixes to follow coding conventions.
Pavel Janík <Pavel@Janik.cz>
parents:
36708
diff
changeset
|
26 ;;; Commentary: |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48256
diff
changeset
|
27 ;; |
30565 | 28 ;; With the hi-lock commands text matching interactively entered |
29 ;; regexp's can be highlighted. For example, `M-x highlight-regexp | |
30 ;; RET clearly RET RET' will highlight all occurrences of `clearly' | |
31 ;; using a yellow background face. New occurrences of `clearly' will | |
32 ;; be highlighted as they are typed. `M-x unhighlight-regexp RET' | |
33 ;; will remove the highlighting. Any existing face can be used for | |
34 ;; highlighting and a set of appropriate faces is provided. The | |
35 ;; regexps can be written into the current buffer in a form that will | |
77343
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
36 ;; be recognized the next time the corresponding file is read (when |
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
37 ;; file patterns is turned on). |
30565 | 38 ;; |
39 ;; Applications: | |
40 ;; | |
41 ;; In program source code highlight a variable to quickly see all | |
42 ;; places it is modified or referenced: | |
43 ;; M-x highlight-regexp ground_contact_switches_closed RET RET | |
44 ;; | |
45 ;; In a shell or other buffer that is showing lots of program | |
46 ;; output, highlight the parts of the output you're interested in: | |
47 ;; M-x highlight-regexp Total execution time [0-9]+ RET hi-blue-b RET | |
48 ;; | |
49 ;; In buffers displaying tables, highlight the lines you're interested in: | |
50 ;; M-x highlight-lines-matching-regexp January 2000 RET hi-black-b RET | |
51 ;; | |
52 ;; When writing text, highlight personal cliches. This can be | |
53 ;; amusing. | |
35926
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
54 ;; M-x highlight-phrase as can be seen RET RET |
30565 | 55 ;; |
35926
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
56 ;; Setup: |
30565 | 57 ;; |
58 ;; Put the following code in your .emacs file. This turns on | |
35926
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
59 ;; hi-lock mode and adds a "Regexp Highlighting" entry |
30565 | 60 ;; to the edit menu. |
61 ;; | |
67474
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
62 ;; (global-hi-lock-mode 1) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48256
diff
changeset
|
63 ;; |
77343
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
64 ;; To enable the use of patterns found in files (presumably placed |
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
65 ;; there by hi-lock) include the following in your .emacs file: |
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
66 ;; |
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
67 ;; (setq hi-lock-file-patterns-policy 'ask) |
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
68 ;; |
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
69 ;; If you get tired of being asked each time a file is loaded replace |
77420
0e63897240ee
(hi-lock-file-patterns-policy): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
77384
diff
changeset
|
70 ;; `ask' with a function that returns t if patterns should be read. |
77343
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
71 ;; |
30565 | 72 ;; You might also want to bind the hi-lock commands to more |
73 ;; finger-friendly sequences: | |
74 | |
75 ;; (define-key hi-lock-map "\C-z\C-h" 'highlight-lines-matching-regexp) | |
76 ;; (define-key hi-lock-map "\C-zi" 'hi-lock-find-patterns) | |
77 ;; (define-key hi-lock-map "\C-zh" 'highlight-regexp) | |
35926
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
78 ;; (define-key hi-lock-map "\C-zp" 'highlight-phrase) |
30565 | 79 ;; (define-key hi-lock-map "\C-zr" 'unhighlight-regexp) |
80 ;; (define-key hi-lock-map "\C-zb" 'hi-lock-write-interactive-patterns)) | |
81 | |
82 ;; See the documentation for hi-lock-mode `C-h f hi-lock-mode' for | |
83 ;; additional instructions. | |
84 | |
85 ;; Sample file patterns: | |
86 | |
87 ; Hi-lock: (("^;;; .*" (0 (quote hi-black-hb) t))) | |
88 ; Hi-lock: ( ("make-variable-buffer-\\(local\\)" (0 font-lock-keyword-face)(1 'italic append))))) | |
89 ; Hi-lock: end | |
90 | |
91 ;;; Code: | |
92 | |
30584
b823f1c83a00
(toplevel): Require font-lock.
Eli Zaretskii <eliz@gnu.org>
parents:
30565
diff
changeset
|
93 (eval-and-compile |
30565 | 94 (require 'font-lock)) |
95 | |
66960
29560f2ff8ed
(hi-lock): Rename this defgroup from
Juri Linkov <juri@jurta.org>
parents:
66833
diff
changeset
|
96 (defgroup hi-lock nil |
30565 | 97 "Interactively add and remove font-lock patterns for highlighting text." |
66960
29560f2ff8ed
(hi-lock): Rename this defgroup from
Juri Linkov <juri@jurta.org>
parents:
66833
diff
changeset
|
98 :link '(custom-manual "(emacs)Highlight Interactively") |
29560f2ff8ed
(hi-lock): Rename this defgroup from
Juri Linkov <juri@jurta.org>
parents:
66833
diff
changeset
|
99 :group 'font-lock) |
30565 | 100 |
101 (defcustom hi-lock-file-patterns-range 10000 | |
102 "Limit of search in a buffer for hi-lock patterns. | |
68559
695ee8cc49c1
(hi-lock-mode, hi-lock-line-face-buffer, hi-lock-face-buffer,
Juanma Barranquero <lekktu@gmail.com>
parents:
67768
diff
changeset
|
103 When a file is visited and hi-lock mode is on, patterns starting |
30565 | 104 up to this limit are added to font-lock's patterns. See documentation |
105 of functions `hi-lock-mode' and `hi-lock-find-patterns'." | |
106 :type 'integer | |
66960
29560f2ff8ed
(hi-lock): Rename this defgroup from
Juri Linkov <juri@jurta.org>
parents:
66833
diff
changeset
|
107 :group 'hi-lock) |
30565 | 108 |
67765
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
109 (defcustom hi-lock-highlight-range 200000 |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
110 "Size of area highlighted by hi-lock when font-lock not active. |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
111 Font-lock is not active in buffers that do their own highlighting, |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
112 such as the buffer created by `list-colors-display'. In those buffers |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
113 hi-lock patterns will only be applied over a range of |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
114 `hi-lock-highlight-range' characters. If font-lock is active then |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
115 highlighting will be applied throughout the buffer." |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
116 :type 'integer |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
117 :group 'hi-lock) |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
118 |
30565 | 119 (defcustom hi-lock-exclude-modes |
120 '(rmail-mode mime/viewer-mode gnus-article-mode) | |
121 "List of major modes in which hi-lock will not run. | |
122 For security reasons since font lock patterns can specify function | |
123 calls." | |
35215
2be11f207ca8
(hi-lock-exclude-modes): Fix :type.
Dave Love <fx@gnu.org>
parents:
33974
diff
changeset
|
124 :type '(repeat symbol) |
66960
29560f2ff8ed
(hi-lock): Rename this defgroup from
Juri Linkov <juri@jurta.org>
parents:
66833
diff
changeset
|
125 :group 'hi-lock) |
30565 | 126 |
77553
871bc98458d9
(hi-lock-file-patterns-policy): Default to `ask'.
Richard M. Stallman <rms@gnu.org>
parents:
77420
diff
changeset
|
127 (defcustom hi-lock-file-patterns-policy 'ask |
77343
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
128 "Specify when hi-lock should use patterns found in file. |
77420
0e63897240ee
(hi-lock-file-patterns-policy): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
77384
diff
changeset
|
129 If `ask', prompt when patterns found in buffer; if bound to a function, |
77343
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
130 use patterns when function returns t (function is called with patterns |
77420
0e63897240ee
(hi-lock-file-patterns-policy): Doc fix.
Richard M. Stallman <rms@gnu.org>
parents:
77384
diff
changeset
|
131 as first argument); if nil or `never' or anything else, don't use file |
77384
4c5740f0be2c
(hi-lock-file-patterns-policy): Make it a defcustom, and give it the
Glenn Morris <rgm@gnu.org>
parents:
77343
diff
changeset
|
132 patterns." |
4c5740f0be2c
(hi-lock-file-patterns-policy): Make it a defcustom, and give it the
Glenn Morris <rgm@gnu.org>
parents:
77343
diff
changeset
|
133 :type '(choice (const :tag "Do not use file patterns" never) |
4c5740f0be2c
(hi-lock-file-patterns-policy): Make it a defcustom, and give it the
Glenn Morris <rgm@gnu.org>
parents:
77343
diff
changeset
|
134 (const :tag "Ask about file patterns" ask) |
4c5740f0be2c
(hi-lock-file-patterns-policy): Make it a defcustom, and give it the
Glenn Morris <rgm@gnu.org>
parents:
77343
diff
changeset
|
135 (function :tag "Function to check file patterns")) |
4c5740f0be2c
(hi-lock-file-patterns-policy): Make it a defcustom, and give it the
Glenn Morris <rgm@gnu.org>
parents:
77343
diff
changeset
|
136 :group 'hi-lock |
4c5740f0be2c
(hi-lock-file-patterns-policy): Make it a defcustom, and give it the
Glenn Morris <rgm@gnu.org>
parents:
77343
diff
changeset
|
137 :version "22.1") |
4c5740f0be2c
(hi-lock-file-patterns-policy): Make it a defcustom, and give it the
Glenn Morris <rgm@gnu.org>
parents:
77343
diff
changeset
|
138 |
4c5740f0be2c
(hi-lock-file-patterns-policy): Make it a defcustom, and give it the
Glenn Morris <rgm@gnu.org>
parents:
77343
diff
changeset
|
139 ;; It can have a function value. |
4c5740f0be2c
(hi-lock-file-patterns-policy): Make it a defcustom, and give it the
Glenn Morris <rgm@gnu.org>
parents:
77343
diff
changeset
|
140 (put 'hi-lock-file-patterns-policy 'risky-local-variable t) |
30565 | 141 |
142 (defgroup hi-lock-faces nil | |
143 "Faces for hi-lock." | |
66960
29560f2ff8ed
(hi-lock): Rename this defgroup from
Juri Linkov <juri@jurta.org>
parents:
66833
diff
changeset
|
144 :group 'hi-lock |
29560f2ff8ed
(hi-lock): Rename this defgroup from
Juri Linkov <juri@jurta.org>
parents:
66833
diff
changeset
|
145 :group 'faces) |
30565 | 146 |
147 (defface hi-yellow | |
61398 | 148 '((((min-colors 88) (background dark)) |
61394
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents:
60902
diff
changeset
|
149 (:background "yellow1" :foreground "black")) |
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents:
60902
diff
changeset
|
150 (((background dark)) (:background "yellow" :foreground "black")) |
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents:
60902
diff
changeset
|
151 (((min-colors 88)) (:background "yellow1")) |
30896
ca514eff4924
(hi-yellow, hi-pink, hi-green, hi-blue): Force the foreground color to
Miles Bader <miles@gnu.org>
parents:
30590
diff
changeset
|
152 (t (:background "yellow"))) |
30565 | 153 "Default face for hi-lock mode." |
154 :group 'hi-lock-faces) | |
155 | |
156 (defface hi-pink | |
33780
00803fb0f58e
(hi-lock-refontify): Don't call non-existent
Gerd Moellmann <gerd@gnu.org>
parents:
31745
diff
changeset
|
157 '((((background dark)) (:background "pink" :foreground "black")) |
30896
ca514eff4924
(hi-yellow, hi-pink, hi-green, hi-blue): Force the foreground color to
Miles Bader <miles@gnu.org>
parents:
30590
diff
changeset
|
158 (t (:background "pink"))) |
30565 | 159 "Face for hi-lock mode." |
160 :group 'hi-lock-faces) | |
161 | |
162 (defface hi-green | |
61398 | 163 '((((min-colors 88) (background dark)) |
61394
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents:
60902
diff
changeset
|
164 (:background "green1" :foreground "black")) |
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents:
60902
diff
changeset
|
165 (((background dark)) (:background "green" :foreground "black")) |
61398 | 166 (((min-colors 88)) (:background "green1")) |
30896
ca514eff4924
(hi-yellow, hi-pink, hi-green, hi-blue): Force the foreground color to
Miles Bader <miles@gnu.org>
parents:
30590
diff
changeset
|
167 (t (:background "green"))) |
30565 | 168 "Face for hi-lock mode." |
169 :group 'hi-lock-faces) | |
170 | |
171 (defface hi-blue | |
33780
00803fb0f58e
(hi-lock-refontify): Don't call non-existent
Gerd Moellmann <gerd@gnu.org>
parents:
31745
diff
changeset
|
172 '((((background dark)) (:background "light blue" :foreground "black")) |
30896
ca514eff4924
(hi-yellow, hi-pink, hi-green, hi-blue): Force the foreground color to
Miles Bader <miles@gnu.org>
parents:
30590
diff
changeset
|
173 (t (:background "light blue"))) |
30565 | 174 "Face for hi-lock mode." |
175 :group 'hi-lock-faces) | |
176 | |
177 (defface hi-black-b | |
178 '((t (:weight bold))) | |
179 "Face for hi-lock mode." | |
180 :group 'hi-lock-faces) | |
181 | |
182 (defface hi-blue-b | |
61394
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents:
60902
diff
changeset
|
183 '((((min-colors 88)) (:weight bold :foreground "blue1")) |
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents:
60902
diff
changeset
|
184 (t (:weight bold :foreground "blue"))) |
30565 | 185 "Face for hi-lock mode." |
186 :group 'hi-lock-faces) | |
187 | |
188 (defface hi-green-b | |
61394
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents:
60902
diff
changeset
|
189 '((((min-colors 88)) (:weight bold :foreground "green1")) |
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents:
60902
diff
changeset
|
190 (t (:weight bold :foreground "green"))) |
30565 | 191 "Face for hi-lock mode." |
192 :group 'hi-lock-faces) | |
193 | |
194 (defface hi-red-b | |
61394
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents:
60902
diff
changeset
|
195 '((((min-colors 88)) (:weight bold :foreground "red1")) |
31aa9a390538
* mh-customize.el (mh-speedbar-selected-folder-face): Special case
Dan Nicolaescu <dann@ics.uci.edu>
parents:
60902
diff
changeset
|
196 (t (:weight bold :foreground "red"))) |
30565 | 197 "Face for hi-lock mode." |
198 :group 'hi-lock-faces) | |
199 | |
200 (defface hi-black-hb | |
31745 | 201 '((t (:weight bold :height 1.67 :inherit variable-pitch))) |
30565 | 202 "Face for hi-lock mode." |
203 :group 'hi-lock-faces) | |
204 | |
205 (defvar hi-lock-file-patterns nil | |
206 "Patterns found in file for hi-lock. Should not be changed.") | |
207 | |
208 (defvar hi-lock-interactive-patterns nil | |
209 "Patterns provided to hi-lock by user. Should not be changed.") | |
210 | |
211 (defvar hi-lock-face-history | |
212 (list "hi-yellow" "hi-pink" "hi-green" "hi-blue" "hi-black-b" | |
213 "hi-blue-b" "hi-red-b" "hi-green-b" "hi-black-hb") | |
214 "History list of faces for hi-lock interactive functions.") | |
215 | |
216 ;(dolist (f hi-lock-face-history) (unless (facep f) (error "%s not a face" f))) | |
217 | |
218 (defvar hi-lock-regexp-history nil | |
219 "History of regexps used for interactive fontification.") | |
220 | |
221 (defvar hi-lock-file-patterns-prefix "Hi-lock" | |
77343
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
222 "Search target for finding hi-lock patterns at top of file.") |
30565 | 223 |
67474
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
224 (defvar hi-lock-archaic-interface-message-used nil |
67768
edd5b99fd103
(hi-lock-archaic-interface-message-used)
Juri Linkov <juri@jurta.org>
parents:
67765
diff
changeset
|
225 "True if user alerted that `global-hi-lock-mode' is now the global switch. |
68559
695ee8cc49c1
(hi-lock-mode, hi-lock-line-face-buffer, hi-lock-face-buffer,
Juanma Barranquero <lekktu@gmail.com>
parents:
67768
diff
changeset
|
226 Earlier versions of hi-lock used `hi-lock-mode' as the global switch; |
67768
edd5b99fd103
(hi-lock-archaic-interface-message-used)
Juri Linkov <juri@jurta.org>
parents:
67765
diff
changeset
|
227 the message is issued if it appears that `hi-lock-mode' is used assuming |
67474
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
228 that older functionality. This variable avoids multiple reminders.") |
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
229 |
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
230 (defvar hi-lock-archaic-interface-deduce nil |
67768
edd5b99fd103
(hi-lock-archaic-interface-message-used)
Juri Linkov <juri@jurta.org>
parents:
67765
diff
changeset
|
231 "If non-nil, sometimes assume that `hi-lock-mode' means `global-hi-lock-mode'. |
edd5b99fd103
(hi-lock-archaic-interface-message-used)
Juri Linkov <juri@jurta.org>
parents:
67765
diff
changeset
|
232 Assumption is made if `hi-lock-mode' used in the *scratch* buffer while |
67474
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
233 a library is being loaded.") |
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
234 |
30565 | 235 (make-variable-buffer-local 'hi-lock-interactive-patterns) |
236 (put 'hi-lock-interactive-patterns 'permanent-local t) | |
237 (make-variable-buffer-local 'hi-lock-regexp-history) | |
238 (put 'hi-lock-regexp-history 'permanent-local t) | |
239 (make-variable-buffer-local 'hi-lock-file-patterns) | |
240 (put 'hi-lock-file-patterns 'permanent-local t) | |
241 | |
242 (defvar hi-lock-menu (make-sparse-keymap "Hi Lock") | |
243 "Menu for hi-lock mode.") | |
244 | |
245 (define-key-after hi-lock-menu [highlight-regexp] | |
246 '(menu-item "Highlight Regexp..." highlight-regexp | |
247 :help "Highlight text matching PATTERN (a regexp).")) | |
248 | |
35926
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
249 (define-key-after hi-lock-menu [highlight-phrase] |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
250 '(menu-item "Highlight Phrase..." highlight-phrase |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
251 :help "Highlight text matching PATTERN (a regexp processed to match phrases).")) |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
252 |
30565 | 253 (define-key-after hi-lock-menu [highlight-lines-matching-regexp] |
254 '(menu-item "Highlight Lines..." highlight-lines-matching-regexp | |
255 :help "Highlight lines containing match of PATTERN (a regexp)..")) | |
256 | |
257 (define-key-after hi-lock-menu [unhighlight-regexp] | |
258 '(menu-item "Remove Highlighting..." unhighlight-regexp | |
259 :help "Remove previously entered highlighting pattern." | |
260 :enable hi-lock-interactive-patterns)) | |
261 | |
262 (define-key-after hi-lock-menu [hi-lock-write-interactive-patterns] | |
263 '(menu-item "Patterns to Buffer" hi-lock-write-interactive-patterns | |
264 :help "Insert interactively added REGEXPs into buffer at point." | |
265 :enable hi-lock-interactive-patterns)) | |
266 | |
267 (define-key-after hi-lock-menu [hi-lock-find-patterns] | |
268 '(menu-item "Patterns from Buffer" hi-lock-find-patterns | |
269 :help "Use patterns (if any) near top of buffer.")) | |
270 | |
271 (defvar hi-lock-map (make-sparse-keymap "Hi Lock") | |
272 "Key map for hi-lock.") | |
273 | |
274 (define-key hi-lock-map "\C-xwi" 'hi-lock-find-patterns) | |
275 (define-key hi-lock-map "\C-xwl" 'highlight-lines-matching-regexp) | |
35926
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
276 (define-key hi-lock-map "\C-xwp" 'highlight-phrase) |
30565 | 277 (define-key hi-lock-map "\C-xwh" 'highlight-regexp) |
278 (define-key hi-lock-map "\C-xwr" 'unhighlight-regexp) | |
279 (define-key hi-lock-map "\C-xwb" 'hi-lock-write-interactive-patterns) | |
280 | |
281 ;; Visible Functions | |
282 | |
283 ;;;###autoload | |
67474
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
284 (define-minor-mode hi-lock-mode |
30565 | 285 "Toggle minor mode for interactively adding font-lock highlighting patterns. |
286 | |
67768
edd5b99fd103
(hi-lock-archaic-interface-message-used)
Juri Linkov <juri@jurta.org>
parents:
67765
diff
changeset
|
287 If ARG positive, turn hi-lock on. Issuing a hi-lock command will also |
edd5b99fd103
(hi-lock-archaic-interface-message-used)
Juri Linkov <juri@jurta.org>
parents:
67765
diff
changeset
|
288 turn hi-lock on. To turn hi-lock on in all buffers use |
edd5b99fd103
(hi-lock-archaic-interface-message-used)
Juri Linkov <juri@jurta.org>
parents:
67765
diff
changeset
|
289 `global-hi-lock-mode' or in your .emacs file (global-hi-lock-mode 1). |
67474
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
290 When hi-lock is turned on, a \"Regexp Highlighting\" submenu is added |
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
291 to the \"Edit\" menu. The commands in the submenu, which can be |
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
292 called interactively, are: |
30565 | 293 |
294 \\[highlight-regexp] REGEXP FACE | |
295 Highlight matches of pattern REGEXP in current buffer with FACE. | |
296 | |
35926
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
297 \\[highlight-phrase] PHRASE FACE |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
298 Highlight matches of phrase PHRASE in current buffer with FACE. |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
299 (PHRASE can be any REGEXP, but spaces will be replaced by matches |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
300 to whitespace and initial lower-case letters will become case insensitive.) |
49588
37645a051842
Trailing whitespace deleted.
Juanma Barranquero <lekktu@gmail.com>
parents:
48256
diff
changeset
|
301 |
30565 | 302 \\[highlight-lines-matching-regexp] REGEXP FACE |
303 Highlight lines containing matches of REGEXP in current buffer with FACE. | |
304 | |
305 \\[unhighlight-regexp] REGEXP | |
306 Remove highlighting on matches of REGEXP in current buffer. | |
307 | |
308 \\[hi-lock-write-interactive-patterns] | |
77343
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
309 Write active REGEXPs into buffer as comments (if possible). They may |
30565 | 310 be read the next time file is loaded or when the \\[hi-lock-find-patterns] command |
311 is issued. The inserted regexps are in the form of font lock keywords. | |
84872
b39ee0f351f1
(hi-lock-write-interactive-patterns): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents:
82857
diff
changeset
|
312 (See `font-lock-keywords'.) They may be edited and re-loaded with \\[hi-lock-find-patterns], |
77343
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
313 any valid `font-lock-keywords' form is acceptable. When a file is |
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
314 loaded the patterns are read if `hi-lock-file-patterns-policy is |
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
315 'ask and the user responds y to the prompt, or if |
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
316 `hi-lock-file-patterns-policy' is bound to a function and that |
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
317 function returns t. |
30565 | 318 |
319 \\[hi-lock-find-patterns] | |
320 Re-read patterns stored in buffer (in the format produced by \\[hi-lock-write-interactive-patterns]). | |
321 | |
77343
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
322 When hi-lock is started and if the mode is not excluded or patterns |
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
323 rejected, the beginning of the buffer is searched for lines of the |
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
324 form: |
30565 | 325 Hi-lock: FOO |
68559
695ee8cc49c1
(hi-lock-mode, hi-lock-line-face-buffer, hi-lock-face-buffer,
Juanma Barranquero <lekktu@gmail.com>
parents:
67768
diff
changeset
|
326 where FOO is a list of patterns. These are added to the font lock |
695ee8cc49c1
(hi-lock-mode, hi-lock-line-face-buffer, hi-lock-face-buffer,
Juanma Barranquero <lekktu@gmail.com>
parents:
67768
diff
changeset
|
327 keywords already present. The patterns must start before position |
695ee8cc49c1
(hi-lock-mode, hi-lock-line-face-buffer, hi-lock-face-buffer,
Juanma Barranquero <lekktu@gmail.com>
parents:
67768
diff
changeset
|
328 \(number of characters into buffer) `hi-lock-file-patterns-range'. |
695ee8cc49c1
(hi-lock-mode, hi-lock-line-face-buffer, hi-lock-face-buffer,
Juanma Barranquero <lekktu@gmail.com>
parents:
67768
diff
changeset
|
329 Patterns will be read until |
30565 | 330 Hi-lock: end |
68559
695ee8cc49c1
(hi-lock-mode, hi-lock-line-face-buffer, hi-lock-face-buffer,
Juanma Barranquero <lekktu@gmail.com>
parents:
67768
diff
changeset
|
331 is found. A mode is excluded if it's in the list `hi-lock-exclude-modes'." |
67112
146389d32df6
* hi-lock.el (hi-lock-buffer-mode): Renamed from `hi-lock-mode'.
Chong Yidong <cyd@stupidchicken.com>
parents:
66960
diff
changeset
|
332 :group 'hi-lock |
67768
edd5b99fd103
(hi-lock-archaic-interface-message-used)
Juri Linkov <juri@jurta.org>
parents:
67765
diff
changeset
|
333 :lighter (:eval (if (or hi-lock-interactive-patterns |
edd5b99fd103
(hi-lock-archaic-interface-message-used)
Juri Linkov <juri@jurta.org>
parents:
67765
diff
changeset
|
334 hi-lock-file-patterns) |
edd5b99fd103
(hi-lock-archaic-interface-message-used)
Juri Linkov <juri@jurta.org>
parents:
67765
diff
changeset
|
335 " Hi" "")) |
67112
146389d32df6
* hi-lock.el (hi-lock-buffer-mode): Renamed from `hi-lock-mode'.
Chong Yidong <cyd@stupidchicken.com>
parents:
66960
diff
changeset
|
336 :global nil |
146389d32df6
* hi-lock.el (hi-lock-buffer-mode): Renamed from `hi-lock-mode'.
Chong Yidong <cyd@stupidchicken.com>
parents:
66960
diff
changeset
|
337 :keymap hi-lock-map |
67474
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
338 (when (and (equal (buffer-name) "*scratch*") |
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
339 load-in-progress |
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
340 (not (interactive-p)) |
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
341 (not hi-lock-archaic-interface-message-used)) |
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
342 (setq hi-lock-archaic-interface-message-used t) |
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
343 (if hi-lock-archaic-interface-deduce |
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
344 (global-hi-lock-mode hi-lock-mode) |
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
345 (warn |
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
346 "Possible archaic use of (hi-lock-mode). |
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
347 Use (global-hi-lock-mode 1) in .emacs to enable hi-lock for all buffers, |
67768
edd5b99fd103
(hi-lock-archaic-interface-message-used)
Juri Linkov <juri@jurta.org>
parents:
67765
diff
changeset
|
348 use (hi-lock-mode 1) for individual buffers. For compatibility with Emacs |
67474
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
349 versions before 22 use the following in your .emacs file: |
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
350 |
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
351 (if (functionp 'global-hi-lock-mode) |
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
352 (global-hi-lock-mode 1) |
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
353 (hi-lock-mode 1)) |
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
354 "))) |
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
355 (if hi-lock-mode |
67112
146389d32df6
* hi-lock.el (hi-lock-buffer-mode): Renamed from `hi-lock-mode'.
Chong Yidong <cyd@stupidchicken.com>
parents:
66960
diff
changeset
|
356 ;; Turned on. |
146389d32df6
* hi-lock.el (hi-lock-buffer-mode): Renamed from `hi-lock-mode'.
Chong Yidong <cyd@stupidchicken.com>
parents:
66960
diff
changeset
|
357 (progn |
67115
152403ad207b
* hi-lock.el (hi-lock-buffer-mode): Turn on font-lock.
Chong Yidong <cyd@stupidchicken.com>
parents:
67114
diff
changeset
|
358 (unless font-lock-mode (font-lock-mode 1)) |
67112
146389d32df6
* hi-lock.el (hi-lock-buffer-mode): Renamed from `hi-lock-mode'.
Chong Yidong <cyd@stupidchicken.com>
parents:
66960
diff
changeset
|
359 (define-key-after menu-bar-edit-menu [hi-lock] |
146389d32df6
* hi-lock.el (hi-lock-buffer-mode): Renamed from `hi-lock-mode'.
Chong Yidong <cyd@stupidchicken.com>
parents:
66960
diff
changeset
|
360 (cons "Regexp Highlighting" hi-lock-menu)) |
146389d32df6
* hi-lock.el (hi-lock-buffer-mode): Renamed from `hi-lock-mode'.
Chong Yidong <cyd@stupidchicken.com>
parents:
66960
diff
changeset
|
361 (hi-lock-find-patterns) |
67115
152403ad207b
* hi-lock.el (hi-lock-buffer-mode): Turn on font-lock.
Chong Yidong <cyd@stupidchicken.com>
parents:
67114
diff
changeset
|
362 (add-hook 'font-lock-mode-hook 'hi-lock-font-lock-hook nil t)) |
30565 | 363 ;; Turned off. |
67115
152403ad207b
* hi-lock.el (hi-lock-buffer-mode): Turn on font-lock.
Chong Yidong <cyd@stupidchicken.com>
parents:
67114
diff
changeset
|
364 (when (or hi-lock-interactive-patterns |
152403ad207b
* hi-lock.el (hi-lock-buffer-mode): Turn on font-lock.
Chong Yidong <cyd@stupidchicken.com>
parents:
67114
diff
changeset
|
365 hi-lock-file-patterns) |
67474
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
366 (when hi-lock-interactive-patterns |
67115
152403ad207b
* hi-lock.el (hi-lock-buffer-mode): Turn on font-lock.
Chong Yidong <cyd@stupidchicken.com>
parents:
67114
diff
changeset
|
367 (font-lock-remove-keywords nil hi-lock-interactive-patterns) |
152403ad207b
* hi-lock.el (hi-lock-buffer-mode): Turn on font-lock.
Chong Yidong <cyd@stupidchicken.com>
parents:
67114
diff
changeset
|
368 (setq hi-lock-interactive-patterns nil)) |
152403ad207b
* hi-lock.el (hi-lock-buffer-mode): Turn on font-lock.
Chong Yidong <cyd@stupidchicken.com>
parents:
67114
diff
changeset
|
369 (when hi-lock-file-patterns |
152403ad207b
* hi-lock.el (hi-lock-buffer-mode): Turn on font-lock.
Chong Yidong <cyd@stupidchicken.com>
parents:
67114
diff
changeset
|
370 (font-lock-remove-keywords nil hi-lock-file-patterns) |
152403ad207b
* hi-lock.el (hi-lock-buffer-mode): Turn on font-lock.
Chong Yidong <cyd@stupidchicken.com>
parents:
67114
diff
changeset
|
371 (setq hi-lock-file-patterns nil)) |
67765
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
372 (remove-overlays nil nil 'hi-lock-overlay t) |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
373 (when font-lock-fontified (font-lock-fontify-buffer))) |
67112
146389d32df6
* hi-lock.el (hi-lock-buffer-mode): Renamed from `hi-lock-mode'.
Chong Yidong <cyd@stupidchicken.com>
parents:
66960
diff
changeset
|
374 (define-key-after menu-bar-edit-menu [hi-lock] nil) |
146389d32df6
* hi-lock.el (hi-lock-buffer-mode): Renamed from `hi-lock-mode'.
Chong Yidong <cyd@stupidchicken.com>
parents:
66960
diff
changeset
|
375 (remove-hook 'font-lock-mode-hook 'hi-lock-font-lock-hook t))) |
66833
efab878cd2e1
* hi-lock.el (hi-lock-mode): Set the default value of
Chong Yidong <cyd@stupidchicken.com>
parents:
65582
diff
changeset
|
376 |
67112
146389d32df6
* hi-lock.el (hi-lock-buffer-mode): Renamed from `hi-lock-mode'.
Chong Yidong <cyd@stupidchicken.com>
parents:
66960
diff
changeset
|
377 ;;;###autoload |
75642
a27300a96e36
(global-hi-lock-mode): define-global-minor-mode changed to
Chong Yidong <cyd@stupidchicken.com>
parents:
75347
diff
changeset
|
378 (define-globalized-minor-mode global-hi-lock-mode |
67474
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
379 hi-lock-mode turn-on-hi-lock-if-enabled |
67114 | 380 :group 'hi-lock) |
67474
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
381 |
67112
146389d32df6
* hi-lock.el (hi-lock-buffer-mode): Renamed from `hi-lock-mode'.
Chong Yidong <cyd@stupidchicken.com>
parents:
66960
diff
changeset
|
382 (defun turn-on-hi-lock-if-enabled () |
67474
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
383 (setq hi-lock-archaic-interface-message-used t) |
67112
146389d32df6
* hi-lock.el (hi-lock-buffer-mode): Renamed from `hi-lock-mode'.
Chong Yidong <cyd@stupidchicken.com>
parents:
66960
diff
changeset
|
384 (unless (memq major-mode hi-lock-exclude-modes) |
67474
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
385 (hi-lock-mode 1))) |
30565 | 386 |
387 ;;;###autoload | |
388 (defalias 'highlight-lines-matching-regexp 'hi-lock-line-face-buffer) | |
389 ;;;###autoload | |
390 (defun hi-lock-line-face-buffer (regexp &optional face) | |
35926
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
391 "Set face of all lines containing a match of REGEXP to FACE. |
30565 | 392 |
393 Interactively, prompt for REGEXP then FACE. Buffer-local history | |
394 list maintained for regexps, global history maintained for faces. | |
395 \\<minibuffer-local-map>Use \\[next-history-element] and \\[previous-history-element] to retrieve next or previous history item. | |
68559
695ee8cc49c1
(hi-lock-mode, hi-lock-line-face-buffer, hi-lock-face-buffer,
Juanma Barranquero <lekktu@gmail.com>
parents:
67768
diff
changeset
|
396 \(See info node `Minibuffer History'.)" |
30565 | 397 (interactive |
398 (list | |
399 (hi-lock-regexp-okay | |
400 (read-from-minibuffer "Regexp to highlight line: " | |
401 (cons (or (car hi-lock-regexp-history) "") 1 ) | |
402 nil nil 'hi-lock-regexp-history)) | |
403 (hi-lock-read-face-name))) | |
67208
af4b92018fde
* hi-lock.el (hi-lock-line-face-buffer, hi-lock-face-buffer)
Chong Yidong <cyd@stupidchicken.com>
parents:
67115
diff
changeset
|
404 (or (facep face) (setq face 'hi-yellow)) |
67474
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
405 (unless hi-lock-mode (hi-lock-mode 1)) |
30565 | 406 (hi-lock-set-pattern |
36708
0e09b49d21b8
(hi-lock-line-face-buffer): Wrap the regexp in a group
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36357
diff
changeset
|
407 ;; The \\(?:...\\) grouping construct ensures that a leading ^, +, * or ? |
0e09b49d21b8
(hi-lock-line-face-buffer): Wrap the regexp in a group
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36357
diff
changeset
|
408 ;; or a trailing $ in REGEXP will be interpreted correctly. |
67112
146389d32df6
* hi-lock.el (hi-lock-buffer-mode): Renamed from `hi-lock-mode'.
Chong Yidong <cyd@stupidchicken.com>
parents:
66960
diff
changeset
|
409 (concat "^.*\\(?:" regexp "\\).*$") face)) |
30565 | 410 |
35926
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
411 |
30565 | 412 ;;;###autoload |
413 (defalias 'highlight-regexp 'hi-lock-face-buffer) | |
414 ;;;###autoload | |
415 (defun hi-lock-face-buffer (regexp &optional face) | |
35926
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
416 "Set face of each match of REGEXP to FACE. |
30565 | 417 |
418 Interactively, prompt for REGEXP then FACE. Buffer-local history | |
419 list maintained for regexps, global history maintained for faces. | |
420 \\<minibuffer-local-map>Use \\[next-history-element] and \\[previous-history-element] to retrieve next or previous history item. | |
68559
695ee8cc49c1
(hi-lock-mode, hi-lock-line-face-buffer, hi-lock-face-buffer,
Juanma Barranquero <lekktu@gmail.com>
parents:
67768
diff
changeset
|
421 \(See info node `Minibuffer History'.)" |
30565 | 422 (interactive |
423 (list | |
424 (hi-lock-regexp-okay | |
425 (read-from-minibuffer "Regexp to highlight: " | |
426 (cons (or (car hi-lock-regexp-history) "") 1 ) | |
427 nil nil 'hi-lock-regexp-history)) | |
428 (hi-lock-read-face-name))) | |
67208
af4b92018fde
* hi-lock.el (hi-lock-line-face-buffer, hi-lock-face-buffer)
Chong Yidong <cyd@stupidchicken.com>
parents:
67115
diff
changeset
|
429 (or (facep face) (setq face 'hi-yellow)) |
67474
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
430 (unless hi-lock-mode (hi-lock-mode 1)) |
67112
146389d32df6
* hi-lock.el (hi-lock-buffer-mode): Renamed from `hi-lock-mode'.
Chong Yidong <cyd@stupidchicken.com>
parents:
66960
diff
changeset
|
431 (hi-lock-set-pattern regexp face)) |
30565 | 432 |
433 ;;;###autoload | |
35926
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
434 (defalias 'highlight-phrase 'hi-lock-face-phrase-buffer) |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
435 ;;;###autoload |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
436 (defun hi-lock-face-phrase-buffer (regexp &optional face) |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
437 "Set face of each match of phrase REGEXP to FACE. |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
438 |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
439 Whitespace in REGEXP converted to arbitrary whitespace and initial |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
440 lower-case letters made case insensitive." |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
441 (interactive |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
442 (list |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
443 (hi-lock-regexp-okay |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
444 (hi-lock-process-phrase |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
445 (read-from-minibuffer "Phrase to highlight: " |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
446 (cons (or (car hi-lock-regexp-history) "") 1 ) |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
447 nil nil 'hi-lock-regexp-history))) |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
448 (hi-lock-read-face-name))) |
67208
af4b92018fde
* hi-lock.el (hi-lock-line-face-buffer, hi-lock-face-buffer)
Chong Yidong <cyd@stupidchicken.com>
parents:
67115
diff
changeset
|
449 (or (facep face) (setq face 'hi-yellow)) |
67474
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
450 (unless hi-lock-mode (hi-lock-mode 1)) |
67112
146389d32df6
* hi-lock.el (hi-lock-buffer-mode): Renamed from `hi-lock-mode'.
Chong Yidong <cyd@stupidchicken.com>
parents:
66960
diff
changeset
|
451 (hi-lock-set-pattern regexp face)) |
35926
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
452 |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
453 ;;;###autoload |
30565 | 454 (defalias 'unhighlight-regexp 'hi-lock-unface-buffer) |
455 ;;;###autoload | |
456 (defun hi-lock-unface-buffer (regexp) | |
35926
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
457 "Remove highlighting of each match to REGEXP set by hi-lock. |
30565 | 458 |
459 Interactively, prompt for REGEXP. Buffer-local history of inserted | |
460 regexp's maintained. Will accept only regexps inserted by hi-lock | |
35926
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
461 interactive functions. \(See `hi-lock-interactive-patterns'.\) |
30565 | 462 \\<minibuffer-local-must-match-map>Use \\[minibuffer-complete] to complete a partially typed regexp. |
30590
63a24eff41fe
(hi-lock-unface-buffer): If a menu of regexps is
Eli Zaretskii <eliz@gnu.org>
parents:
30584
diff
changeset
|
463 \(See info node `Minibuffer History'.\)" |
30565 | 464 (interactive |
82857
2a4d4f565ad8
(hi-lock-unface-buffer): Show a x-menu only if the mouse was used.
Michaël Cadilhac <michael.cadilhac@lrde.org>
parents:
78236
diff
changeset
|
465 (if (and (display-popup-menus-p) (not last-nonmenu-event)) |
30590
63a24eff41fe
(hi-lock-unface-buffer): If a menu of regexps is
Eli Zaretskii <eliz@gnu.org>
parents:
30584
diff
changeset
|
466 (catch 'snafu |
63a24eff41fe
(hi-lock-unface-buffer): If a menu of regexps is
Eli Zaretskii <eliz@gnu.org>
parents:
30584
diff
changeset
|
467 (or |
63a24eff41fe
(hi-lock-unface-buffer): If a menu of regexps is
Eli Zaretskii <eliz@gnu.org>
parents:
30584
diff
changeset
|
468 (x-popup-menu |
63a24eff41fe
(hi-lock-unface-buffer): If a menu of regexps is
Eli Zaretskii <eliz@gnu.org>
parents:
30584
diff
changeset
|
469 t |
63a24eff41fe
(hi-lock-unface-buffer): If a menu of regexps is
Eli Zaretskii <eliz@gnu.org>
parents:
30584
diff
changeset
|
470 (cons |
63a24eff41fe
(hi-lock-unface-buffer): If a menu of regexps is
Eli Zaretskii <eliz@gnu.org>
parents:
30584
diff
changeset
|
471 `keymap |
63a24eff41fe
(hi-lock-unface-buffer): If a menu of regexps is
Eli Zaretskii <eliz@gnu.org>
parents:
30584
diff
changeset
|
472 (cons "Select Pattern to Unhighlight" |
63a24eff41fe
(hi-lock-unface-buffer): If a menu of regexps is
Eli Zaretskii <eliz@gnu.org>
parents:
30584
diff
changeset
|
473 (mapcar (lambda (pattern) |
63a24eff41fe
(hi-lock-unface-buffer): If a menu of regexps is
Eli Zaretskii <eliz@gnu.org>
parents:
30584
diff
changeset
|
474 (list (car pattern) |
63a24eff41fe
(hi-lock-unface-buffer): If a menu of regexps is
Eli Zaretskii <eliz@gnu.org>
parents:
30584
diff
changeset
|
475 (format |
63a24eff41fe
(hi-lock-unface-buffer): If a menu of regexps is
Eli Zaretskii <eliz@gnu.org>
parents:
30584
diff
changeset
|
476 "%s (%s)" (car pattern) |
63a24eff41fe
(hi-lock-unface-buffer): If a menu of regexps is
Eli Zaretskii <eliz@gnu.org>
parents:
30584
diff
changeset
|
477 (symbol-name |
63a24eff41fe
(hi-lock-unface-buffer): If a menu of regexps is
Eli Zaretskii <eliz@gnu.org>
parents:
30584
diff
changeset
|
478 (car |
63a24eff41fe
(hi-lock-unface-buffer): If a menu of regexps is
Eli Zaretskii <eliz@gnu.org>
parents:
30584
diff
changeset
|
479 (cdr (car (cdr (car (cdr pattern)))))))) |
63a24eff41fe
(hi-lock-unface-buffer): If a menu of regexps is
Eli Zaretskii <eliz@gnu.org>
parents:
30584
diff
changeset
|
480 (cons nil nil) |
63a24eff41fe
(hi-lock-unface-buffer): If a menu of regexps is
Eli Zaretskii <eliz@gnu.org>
parents:
30584
diff
changeset
|
481 (car pattern))) |
63a24eff41fe
(hi-lock-unface-buffer): If a menu of regexps is
Eli Zaretskii <eliz@gnu.org>
parents:
30584
diff
changeset
|
482 hi-lock-interactive-patterns)))) |
63a24eff41fe
(hi-lock-unface-buffer): If a menu of regexps is
Eli Zaretskii <eliz@gnu.org>
parents:
30584
diff
changeset
|
483 ;; If the user clicks outside the menu, meaning that they |
63a24eff41fe
(hi-lock-unface-buffer): If a menu of regexps is
Eli Zaretskii <eliz@gnu.org>
parents:
30584
diff
changeset
|
484 ;; change their mind, x-popup-menu returns nil, and |
63a24eff41fe
(hi-lock-unface-buffer): If a menu of regexps is
Eli Zaretskii <eliz@gnu.org>
parents:
30584
diff
changeset
|
485 ;; interactive signals a wrong number of arguments error. |
63a24eff41fe
(hi-lock-unface-buffer): If a menu of regexps is
Eli Zaretskii <eliz@gnu.org>
parents:
30584
diff
changeset
|
486 ;; To prevent that, we return an empty string, which will |
63a24eff41fe
(hi-lock-unface-buffer): If a menu of regexps is
Eli Zaretskii <eliz@gnu.org>
parents:
30584
diff
changeset
|
487 ;; effectively disable the rest of the function. |
63a24eff41fe
(hi-lock-unface-buffer): If a menu of regexps is
Eli Zaretskii <eliz@gnu.org>
parents:
30584
diff
changeset
|
488 (throw 'snafu '("")))) |
30565 | 489 (let ((history-list (mapcar (lambda (p) (car p)) |
490 hi-lock-interactive-patterns))) | |
491 (unless hi-lock-interactive-patterns | |
492 (error "No highlighting to remove")) | |
493 (list | |
494 (completing-read "Regexp to unhighlight: " | |
36357
06ff4f3266f8
(hi-lock-unface-buffer): Use nil rather than t for
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
36062
diff
changeset
|
495 hi-lock-interactive-patterns nil t |
30565 | 496 (car (car hi-lock-interactive-patterns)) |
497 (cons 'history-list 1)))))) | |
498 (let ((keyword (assoc regexp hi-lock-interactive-patterns))) | |
499 (when keyword | |
500 (font-lock-remove-keywords nil (list keyword)) | |
501 (setq hi-lock-interactive-patterns | |
502 (delq keyword hi-lock-interactive-patterns)) | |
67765
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
503 (remove-overlays |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
504 nil nil 'hi-lock-overlay-regexp (hi-lock-string-serialize regexp)) |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
505 (when font-lock-fontified (font-lock-fontify-buffer))))) |
30565 | 506 |
507 ;;;###autoload | |
508 (defun hi-lock-write-interactive-patterns () | |
509 "Write interactively added patterns, if any, into buffer at point. | |
510 | |
511 Interactively added patterns are those normally specified using | |
512 `highlight-regexp' and `highlight-lines-matching-regexp'; they can | |
513 be found in variable `hi-lock-interactive-patterns'." | |
514 (interactive) | |
67208
af4b92018fde
* hi-lock.el (hi-lock-line-face-buffer, hi-lock-face-buffer)
Chong Yidong <cyd@stupidchicken.com>
parents:
67115
diff
changeset
|
515 (if (null hi-lock-interactive-patterns) |
af4b92018fde
* hi-lock.el (hi-lock-line-face-buffer, hi-lock-face-buffer)
Chong Yidong <cyd@stupidchicken.com>
parents:
67115
diff
changeset
|
516 (error "There are no interactive patterns")) |
af4b92018fde
* hi-lock.el (hi-lock-line-face-buffer, hi-lock-face-buffer)
Chong Yidong <cyd@stupidchicken.com>
parents:
67115
diff
changeset
|
517 (let ((beg (point))) |
84872
b39ee0f351f1
(hi-lock-write-interactive-patterns): Use `mapc' rather than `mapcar'.
Juanma Barranquero <lekktu@gmail.com>
parents:
82857
diff
changeset
|
518 (mapc |
30565 | 519 (lambda (pattern) |
67768
edd5b99fd103
(hi-lock-archaic-interface-message-used)
Juri Linkov <juri@jurta.org>
parents:
67765
diff
changeset
|
520 (insert (format "%s: (%s)\n" |
edd5b99fd103
(hi-lock-archaic-interface-message-used)
Juri Linkov <juri@jurta.org>
parents:
67765
diff
changeset
|
521 hi-lock-file-patterns-prefix |
edd5b99fd103
(hi-lock-archaic-interface-message-used)
Juri Linkov <juri@jurta.org>
parents:
67765
diff
changeset
|
522 (prin1-to-string pattern)))) |
67208
af4b92018fde
* hi-lock.el (hi-lock-line-face-buffer, hi-lock-face-buffer)
Chong Yidong <cyd@stupidchicken.com>
parents:
67115
diff
changeset
|
523 hi-lock-interactive-patterns) |
af4b92018fde
* hi-lock.el (hi-lock-line-face-buffer, hi-lock-face-buffer)
Chong Yidong <cyd@stupidchicken.com>
parents:
67115
diff
changeset
|
524 (comment-region beg (point))) |
af4b92018fde
* hi-lock.el (hi-lock-line-face-buffer, hi-lock-face-buffer)
Chong Yidong <cyd@stupidchicken.com>
parents:
67115
diff
changeset
|
525 (when (> (point) hi-lock-file-patterns-range) |
af4b92018fde
* hi-lock.el (hi-lock-line-face-buffer, hi-lock-face-buffer)
Chong Yidong <cyd@stupidchicken.com>
parents:
67115
diff
changeset
|
526 (warn "Inserted keywords not close enough to top of file"))) |
30565 | 527 |
528 ;; Implementation Functions | |
529 | |
35926
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
530 (defun hi-lock-process-phrase (phrase) |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
531 "Convert regexp PHRASE to a regexp that matches phrases. |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
532 |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
533 Blanks in PHRASE replaced by regexp that matches arbitrary whitespace |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
534 and initial lower-case letters made case insensitive." |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
535 (let ((mod-phrase nil)) |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
536 (setq mod-phrase |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
537 (replace-regexp-in-string |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
538 "\\<[a-z]" (lambda (m) (format "[%s%s]" (upcase m) m)) phrase)) |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
539 (setq mod-phrase |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
540 (replace-regexp-in-string |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
541 "\\s-+" "[ \t\n]+" mod-phrase nil t)))) |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
542 |
30565 | 543 (defun hi-lock-regexp-okay (regexp) |
544 "Return REGEXP if it appears suitable for a font-lock pattern. | |
545 | |
546 Otherwise signal an error. A pattern that matches the null string is | |
547 not suitable." | |
548 (if (string-match regexp "") | |
549 (error "Regexp cannot match an empty string") | |
550 regexp)) | |
551 | |
552 (defun hi-lock-read-face-name () | |
553 "Read face name from minibuffer with completion and history." | |
554 (intern (completing-read | |
555 "Highlight using face: " | |
556 obarray 'facep t | |
557 (cons (car hi-lock-face-history) | |
558 (let ((prefix | |
559 (try-completion | |
560 (substring (car hi-lock-face-history) 0 1) | |
561 (mapcar (lambda (f) (cons f f)) | |
562 hi-lock-face-history)))) | |
563 (if (and (stringp prefix) | |
564 (not (equal prefix (car hi-lock-face-history)))) | |
565 (length prefix) 0))) | |
566 '(hi-lock-face-history . 0)))) | |
567 | |
67112
146389d32df6
* hi-lock.el (hi-lock-buffer-mode): Renamed from `hi-lock-mode'.
Chong Yidong <cyd@stupidchicken.com>
parents:
66960
diff
changeset
|
568 (defun hi-lock-set-pattern (regexp face) |
146389d32df6
* hi-lock.el (hi-lock-buffer-mode): Renamed from `hi-lock-mode'.
Chong Yidong <cyd@stupidchicken.com>
parents:
66960
diff
changeset
|
569 "Highlight REGEXP with face FACE." |
146389d32df6
* hi-lock.el (hi-lock-buffer-mode): Renamed from `hi-lock-mode'.
Chong Yidong <cyd@stupidchicken.com>
parents:
66960
diff
changeset
|
570 (let ((pattern (list regexp (list 0 (list 'quote face) t)))) |
30565 | 571 (unless (member pattern hi-lock-interactive-patterns) |
67768
edd5b99fd103
(hi-lock-archaic-interface-message-used)
Juri Linkov <juri@jurta.org>
parents:
67765
diff
changeset
|
572 (font-lock-add-keywords nil (list pattern) t) |
67112
146389d32df6
* hi-lock.el (hi-lock-buffer-mode): Renamed from `hi-lock-mode'.
Chong Yidong <cyd@stupidchicken.com>
parents:
66960
diff
changeset
|
573 (push pattern hi-lock-interactive-patterns) |
67765
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
574 (if font-lock-fontified |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
575 (font-lock-fontify-buffer) |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
576 (let* ((serial (hi-lock-string-serialize regexp)) |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
577 (range-min (- (point) (/ hi-lock-highlight-range 2))) |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
578 (range-max (+ (point) (/ hi-lock-highlight-range 2))) |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
579 (search-start |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
580 (max (point-min) |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
581 (- range-min (max 0 (- range-max (point-max)))))) |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
582 (search-end |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
583 (min (point-max) |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
584 (+ range-max (max 0 (- (point-min) range-min)))))) |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
585 (save-excursion |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
586 (goto-char search-start) |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
587 (while (re-search-forward regexp search-end t) |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
588 (let ((overlay (make-overlay (match-beginning 0) (match-end 0)))) |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
589 (overlay-put overlay 'hi-lock-overlay t) |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
590 (overlay-put overlay 'hi-lock-overlay-regexp serial) |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
591 (overlay-put overlay 'face face)) |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
592 (goto-char (match-end 0))))))))) |
30565 | 593 |
594 (defun hi-lock-set-file-patterns (patterns) | |
595 "Replace file patterns list with PATTERNS and refontify." | |
35926
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
596 (when (or hi-lock-file-patterns patterns) |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
597 (font-lock-remove-keywords nil hi-lock-file-patterns) |
d2997845573f
(hi-lock-mode): Toggling hi-lock-mode now affects all
Gerd Moellmann <gerd@gnu.org>
parents:
35779
diff
changeset
|
598 (setq hi-lock-file-patterns patterns) |
67768
edd5b99fd103
(hi-lock-archaic-interface-message-used)
Juri Linkov <juri@jurta.org>
parents:
67765
diff
changeset
|
599 (font-lock-add-keywords nil hi-lock-file-patterns t) |
67115
152403ad207b
* hi-lock.el (hi-lock-buffer-mode): Turn on font-lock.
Chong Yidong <cyd@stupidchicken.com>
parents:
67114
diff
changeset
|
600 (font-lock-fontify-buffer))) |
30565 | 601 |
602 (defun hi-lock-find-patterns () | |
603 "Find patterns in current buffer for hi-lock." | |
604 (interactive) | |
605 (unless (memq major-mode hi-lock-exclude-modes) | |
606 (let ((all-patterns nil) | |
607 (target-regexp (concat "\\<" hi-lock-file-patterns-prefix ":"))) | |
608 (save-excursion | |
43052
4037178317df
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39065
diff
changeset
|
609 (save-restriction |
4037178317df
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39065
diff
changeset
|
610 (widen) |
4037178317df
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39065
diff
changeset
|
611 (goto-char (point-min)) |
4037178317df
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39065
diff
changeset
|
612 (re-search-forward target-regexp |
4037178317df
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39065
diff
changeset
|
613 (+ (point) hi-lock-file-patterns-range) t) |
4037178317df
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39065
diff
changeset
|
614 (beginning-of-line) |
4037178317df
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39065
diff
changeset
|
615 (while (and (re-search-forward target-regexp (+ (point) 100) t) |
4037178317df
*** empty log message ***
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
39065
diff
changeset
|
616 (not (looking-at "\\s-*end"))) |
64117
8ad318b132eb
(hi-lock-find-patterns): Protect also against invalid values for the pattern
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
617 (condition-case nil |
8ad318b132eb
(hi-lock-find-patterns): Protect also against invalid values for the pattern
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
618 (setq all-patterns (append (read (current-buffer)) all-patterns)) |
8ad318b132eb
(hi-lock-find-patterns): Protect also against invalid values for the pattern
Juanma Barranquero <lekktu@gmail.com>
parents:
64091
diff
changeset
|
619 (error (message "Invalid pattern list expression at %d" |
67112
146389d32df6
* hi-lock.el (hi-lock-buffer-mode): Renamed from `hi-lock-mode'.
Chong Yidong <cyd@stupidchicken.com>
parents:
66960
diff
changeset
|
620 (line-number-at-pos))))))) |
77343
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
621 (when (and all-patterns |
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
622 hi-lock-mode |
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
623 (cond |
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
624 ((eq this-command 'hi-lock-find-patterns) t) |
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
625 ((functionp hi-lock-file-patterns-policy) |
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
626 (funcall hi-lock-file-patterns-policy all-patterns)) |
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
627 ((eq hi-lock-file-patterns-policy 'ask) |
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
628 (y-or-n-p "Add patterns from this buffer to hi-lock? ")) |
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
629 (t nil))) |
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
630 (hi-lock-set-file-patterns all-patterns) |
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
631 (if (interactive-p) |
f8ec7356b88a
(hi-lock-file-patterns-policy): New var.
Chong Yidong <cyd@stupidchicken.com>
parents:
75642
diff
changeset
|
632 (message "Hi-lock added %d patterns." (length all-patterns))))))) |
30565 | 633 |
634 (defun hi-lock-font-lock-hook () | |
68559
695ee8cc49c1
(hi-lock-mode, hi-lock-line-face-buffer, hi-lock-face-buffer,
Juanma Barranquero <lekktu@gmail.com>
parents:
67768
diff
changeset
|
635 "Add hi-lock patterns to font-lock's." |
67115
152403ad207b
* hi-lock.el (hi-lock-buffer-mode): Turn on font-lock.
Chong Yidong <cyd@stupidchicken.com>
parents:
67114
diff
changeset
|
636 (if font-lock-mode |
67768
edd5b99fd103
(hi-lock-archaic-interface-message-used)
Juri Linkov <juri@jurta.org>
parents:
67765
diff
changeset
|
637 (progn |
edd5b99fd103
(hi-lock-archaic-interface-message-used)
Juri Linkov <juri@jurta.org>
parents:
67765
diff
changeset
|
638 (font-lock-add-keywords nil hi-lock-file-patterns t) |
edd5b99fd103
(hi-lock-archaic-interface-message-used)
Juri Linkov <juri@jurta.org>
parents:
67765
diff
changeset
|
639 (font-lock-add-keywords nil hi-lock-interactive-patterns t)) |
67474
a75f6e2ee182
(hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
Eli Zaretskii <eliz@gnu.org>
parents:
67208
diff
changeset
|
640 (hi-lock-mode -1))) |
30565 | 641 |
67765
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
642 (defvar hi-lock-string-serialize-hash |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
643 (make-hash-table :test 'equal) |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
644 "Hash table used to assign unique numbers to strings.") |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
645 |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
646 (defvar hi-lock-string-serialize-serial 1 |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
647 "Number assigned to last new string in call to `hi-lock-string-serialize'. |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
648 A string is considered new if it had not previously been used in a call to |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
649 `hi-lock-string-serialize'.") |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
650 |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
651 (defun hi-lock-string-serialize (string) |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
652 "Return unique serial number for STRING." |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
653 (interactive) |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
654 (let ((val (gethash string hi-lock-string-serialize-hash))) |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
655 (if val val |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
656 (puthash string |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
657 (setq hi-lock-string-serialize-serial |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
658 (1+ hi-lock-string-serialize-serial)) |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
659 hi-lock-string-serialize-hash) |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
660 hi-lock-string-serialize-serial))) |
fd7c898ab005
(hi-lock-highlight-range): New variable.
Juri Linkov <juri@jurta.org>
parents:
67474
diff
changeset
|
661 |
30565 | 662 (provide 'hi-lock) |
663 | |
60902
7160fe3a7ef1
find-file-hooks -> find-file-hook.
Stefan Monnier <monnier@iro.umontreal.ca>
parents:
59873
diff
changeset
|
664 ;; arch-tag: d2e8fd07-4cc9-4c6f-a200-1e729bc54066 |
30565 | 665 ;;; hi-lock.el ends here |