1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-10 21:50:37 -08:00
Commit graph

77 commits

Author SHA1 Message Date
Glenn Morris
1595ecfac9 * lisp/hi-lock.el (hi-lock-process-phrase): Try to make it less fragile.
Fixes: debbugs:7161
2012-10-06 17:27:31 -07:00
Glenn Morris
82ed3ab40d * lisp/hi-lock.el (hi-lock-face-phrase-buffer): Doc fix. 2012-10-06 17:07:03 -07:00
Chong Yidong
865fe16fd2 Update docstrings and comments to use "init file" terminology.
* bookmark.el (bookmark-bmenu-toggle-filenames): Doc fixes.
* comint.el (comint-prompt-read-only):
* custom.el (defcustom):
* hi-lock.el (hi-lock-mode):
* ibuffer.el (ibuffer-formats):
* ielm.el (ielm-prompt-read-only):
* novice.el (disable-command):
* saveplace.el (toggle-save-place):
* speedbar.el (speedbar-supported-extension-expressions):
* startup.el (auto-save-list-file-prefix, init-file-user)
(after-init-hook, inhibit-startup-echo-area-message):
* strokes.el (strokes-help):
* time-stamp.el (time-stamp):
* calendar/calendar.el (calendar, diary-file):
* calendar/diary-lib.el (diary-mail-entries, diary)
(diary-list-entries-hook):
* calendar/holidays.el (holidays, calendar-holidays):
* calendar/lunar.el (lunar-phases):
* calendar/solar.el (sunrise-sunset):
* emulation/edt.el (edt-load-keys):
* emulation/viper.el (viper-mode):
* eshell/em-alias.el (eshell-command-aliases-list):
* eshell/esh-util.el (eshell-convert-numeric-arguments):
* international/ogonek.el (ogonek-information):
* net/tramp-cmds.el (tramp-bug):
* net/quickurl.el (quickurl-reread-hook-postfix):
* play/decipher.el (decipher-font-lock-keywords):
* progmodes/cc-styles.el (c-set-style):
* progmodes/idlw-shell.el (idlwave-shell-prompt-pattern):
* progmodes/inf-lisp.el (inferior-lisp-prompt):
* progmodes/octave-mod.el (octave-mode):
* progmodes/sql.el (sql-mode, sql-interactive-mode, sql-password):
* progmodes/verilog-mode.el (verilog-read-defines):
* textmodes/two-column.el (2C-mode): Likewise.
2012-09-17 13:41:04 +08:00
Chong Yidong
a9f6f311c7 Fix highlight-regexp's use of Font Lock mode.
* hi-lock.el (hi-lock-mode): Do not unilaterally enable font lock.
(hi-lock-set-pattern): When deciding whether to use font lock or
overlays, look at font-lock-mode instead of font-lock-fontified.
(hi-lock-mode, hi-lock-line-face-buffer, hi-lock-unface-buffer)
(hi-lock-face-buffer, hi-lock-face-phrase-buffer): Doc fix.

Fixes: debbugs:12168
2012-08-14 14:52:59 +08:00
Stefan Monnier
a52c0aa070 * lisp/hi-lock.el (hi-lock-face-defaults): Move obsolete before definition. 2012-05-21 00:33:54 -04:00
Glenn Morris
acaf905b11 Add 2012 to FSF copyright years for Emacs files 2012-01-05 01:46:05 -08:00
Chong Yidong
06e21633a4 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 08:54:24 -04:00
Chong Yidong
7be1c708c5 Merge from emacs-23 branch 2011-08-09 18:13:11 -04:00
Chong Yidong
8d96c9a4e7 * hi-lock.el (hi-lock-unface-buffer): Fix interactive spec (Bug#7554). 2011-08-09 17:55:34 -04:00
Stefan Monnier
b016851cb1 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 11:56:00 -05:00
Glenn Morris
befe199d3a require' is automatically eval-and-compile'd.
* hi-lock.el, ps-bdf.el, ps-mule.el, ps-print.el, ps-samp.el:
`require' is automatically `eval-and-compile'd.
2011-02-02 23:21:56 -08:00
Glenn Morris
73b0cd5003 Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
Glenn Morris
0d9f702fd0 Nuke arch-tags. 2011-01-15 15:16:57 -08:00
Glenn Morris
5df4f04cd3 Add 2011 to FSF/AIST copyright years. 2011-01-02 15:50:46 -08:00
David Koppelman
c58059f23e Fix hi-lock-mode interactions with font-lock.
* hi-lock.el (hi-lock-font-lock-hook): Check font-lock-fontified
instead of font-lock-mode before adding keywords. Removed
hi-lock-mode off code. Removed inhibit hack.
(hi-lock-set-pattern): Only add keywords if font-lock-fontified
non-nil; removed hook inhibit hack.
2010-10-09 00:09:19 -04:00
Glenn Morris
114f9c9679 Add 2010 to copyright years. 2010-01-13 00:35:10 -08:00
Glenn Morris
e8a11b2298 Update x-popup-menu declaration. 2009-11-10 08:11:47 +00:00
Juanma Barranquero
32226619c5 Use called-interactively-p' instead of interactive-p'. 2009-10-02 03:48:36 +00:00
Juanma Barranquero
d88444f292 * speedbar.el (speedbar-item-delete):
* calc/calc-prog.el (calc-kbd-if):
* language/hanja-util.el (hanja-init-load): Fix typos in messages.

* epa.el (epa-key-list-mode-map):
* hi-lock.el (hi-lock-menu): Fix typos in menus.

* progmodes/hideshow.el (hs-allow-nesting): Reflow docstring.
(hs-show-hook): Fix typo in docstring.
2009-09-29 02:26:20 +00:00
Chong Yidong
474749510e * hi-lock.el (hi-lock--inhibit-font-lock-hook): New var.
(hi-lock-set-pattern, hi-lock-font-lock-hook): Use it (Bug#3068).
2009-04-23 01:34:54 +00:00
Glenn Morris
ae940284fa Add 2009 to copyright years. 2009-01-05 03:18:22 +00:00
Glenn Morris
4c12073242 Header format fix. 2008-12-19 05:29:04 +00:00
Glenn Morris
f2d9c15f59 Add declarations for builds without X. 2008-08-11 01:23:07 +00:00
Juri Linkov
8677dea3af (hi-lock-line-face-buffer, hi-lock-face-buffer)
(hi-lock-face-phrase-buffer): Use `(car regexp-history)'
as the second arg of `read-regexp'.
2008-07-29 14:45:01 +00:00
Juri Linkov
ef705f2574 (hi-lock-regexp-history): Make it an obsolete alias
to `regexp-history'.
(hi-lock-face-history): Rename to `hi-lock-face-defaults' and
make it an obsolete alias to it.
(hi-lock-face-defaults): New variable renamed from
`hi-lock-face-history'.
(hi-lock-line-face-buffer, hi-lock-face-buffer)
(hi-lock-face-phrase-buffer): Use `read-regexp' instead of
`read-from-minibuffer'.  Doc fix.
(hi-lock-read-face-name): Replace `hi-lock-face-history' with
`hi-lock-face-defaults'.  Remove `mapcar (lambda (f) (cons f f))'.
Set `hist' arg of `completing-read' to `face-name-history'.
Put a list of default faces to `default' arg instead of `hist' arg.
2008-06-30 19:36:38 +00:00
Glenn Morris
eb3fa2cfcf Switch to recommended form of GPLv3 permissions notice. 2008-05-06 08:06:51 +00:00
Juanma Barranquero
869d3e1733 (hi-lock-mode): Fix typos in docstring.
(hi-lock-unload-function): New function.
2008-03-31 00:04:49 +00:00
Miles Bader
59ce725a3b Merge from emacs--rel--22
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-987
2008-01-08 20:46:54 +00:00
Glenn Morris
409cc4a3ea Add 2008 to copyright years. 2008-01-07 02:45:14 +00:00
Juanma Barranquero
ee44464cb4 (hi-lock-write-interactive-patterns): Use mapc' rather than mapcar'. 2007-09-25 11:07:41 +00:00
Michaël Cadilhac
a2ab90da9d (hi-lock-unface-buffer): Show a x-menu only if the mouse was used. 2007-08-26 19:35:16 +00:00
Glenn Morris
b4aa60262c Switch license to GPLv3 or later. 2007-07-25 04:50:21 +00:00
Richard M. Stallman
cf995676d5 (hi-lock-file-patterns-policy): Default to `ask'. 2007-04-25 14:01:26 +00:00
Richard M. Stallman
06b1a5ef97 (hi-lock-file-patterns-policy): Doc fix. 2007-04-22 16:52:29 +00:00
Glenn Morris
176eb1f17f (hi-lock-file-patterns-policy): Make it a defcustom, and give it the
risky-local-variable property.
2007-04-22 01:49:46 +00:00
Chong Yidong
c898bef77f (hi-lock-file-patterns-policy): New var.
(hi-lock-find-patterns): Use hi-lock-file-patterns-policy.
(hi-lock-mode): Update docstring.
2007-04-20 19:24:19 +00:00
Chong Yidong
98007d8383 (global-hi-lock-mode): define-global-minor-mode changed to
define-globalized-minor-mode.
2007-02-03 17:26:01 +00:00
Glenn Morris
d7a0267c8d Add 2007 to copyright years. 2007-01-21 03:53:13 +00:00
Thien-Thi Nguyen
aaef169dc6 Update years in copyright notice; nfc. 2006-02-06 15:23:23 +00:00
Juanma Barranquero
8b730780cb (hi-lock-mode, hi-lock-line-face-buffer, hi-lock-face-buffer,
hi-lock-font-lock-hook, hi-lock-archaic-interface-message-used,
hi-lock-file-patterns-range): Fix typos in docstrings.
2006-02-02 10:43:18 +00:00
Juri Linkov
907560871c (hi-lock-archaic-interface-message-used)
(hi-lock-archaic-interface-deduce, hi-lock-mode): Doc fix.
(hi-lock-mode): Display "Hi" in the mode line only when
hi-lock-interactive-patterns or hi-lock-file-patterns is non-nil.
(hi-lock-write-interactive-patterns):
Use hi-lock-file-patterns-prefix instead of hard-coded "Hi-lock".
(hi-lock-set-pattern, hi-lock-set-file-patterns)
(hi-lock-font-lock-hook): Set 3rd arg `how' of
font-lock-add-keywords to t.
2005-12-23 16:45:05 +00:00
Juri Linkov
81dc571454 (hi-lock-highlight-range): New variable.
(hi-lock-mode, hi-lock-unface-buffer): Call font-lock-fontify-buffer
only if font-lock-fontified is non-nil.  Remove overlays.
(hi-lock-set-pattern): Call font-lock-fontify-buffer if
font-lock-fontified is non-nil, otherwise use overlays (instead of
text properties).
(hi-lock-string-serialize-hash, hi-lock-string-serialize-serial):
New variables.
(hi-lock-string-serialize) New function.
2005-12-23 16:20:58 +00:00
Eli Zaretskii
71060bddb0 (hi-lock-mode) Renamed from hi-lock-buffer-mode; react if global-hi-lock-mode
seems intended.
(global-hi-lock-mode) Renamed from hi-lock-mode.
(hi-lock-archaic-interface-message-used, hi-lock-archaic-interface-deduce): New
variables.
(turn-on-hi-lock-if-enabled, hi-lock-line-face-buffer)
(hi-lock-face-buffer, hi-lock-face-phrase-buffer)
(hi-lock-find-patterns, hi-lock-font-lock-hook): Replace hi-lock-buffer-mode
with hi-lock-mode.
2005-12-10 11:48:21 +00:00
Chong Yidong
597767dac7 * hi-lock.el (hi-lock-line-face-buffer, hi-lock-face-buffer)
(hi-lock-face-phrase-buffer): Use hi-yellow face.
	(hi-lock-write-interactive-patterns): Use comment-region.
2005-11-29 22:28:59 +00:00
Chong Yidong
e4d5906679 * hi-lock.el (hi-lock-buffer-mode): Turn on font-lock.
(hi-lock-unface-buffer, hi-lock-set-file-patterns): Call
	font-lock-fontify-buffer.
	(hi-lock-refontify): Deleted.
	(hi-lock-font-lock-hook): Turn off hi-lock when font lock is
	turned off.
2005-11-25 05:32:56 +00:00
Chong Yidong
9cb4bb4503 Fix typo. 2005-11-24 21:11:42 +00:00
Chong Yidong
ae34cba19b Fix two omissions in last change. 2005-11-24 21:05:33 +00:00
Chong Yidong
963b20402d * hi-lock.el (hi-lock-buffer-mode): Renamed from `hi-lock-mode'.
Use define-minor-mode, and make it a local mode.
	(hi-lock-mode): New global minor mode.
	(turn-on-hi-lock-if-enabled): New function.
	(hi-lock-line-face-buffer, hi-lock-face-buffer)
	(hi-lock-set-pattern): Changed arguments to regexp and face
	instead of a font-lock pattern.  Directly set face property,
	instead of refontifying.
	(hi-lock-font-lock-hook): Check if font-lock is being turned on.
	(hi-lock-find-patterns): Use line-number-at-pos.

	(hi-lock-face-phrase-buffer): Call hi-lock-buffer-mode.  Use new
	arguments for hi-lock-set-pattern.
	(hi-lock-find-file-hook, hi-lock-current-line)
	(hi-lock-set-patterns): Deleted unused functions.

	* progmodes/compile.el (compilation-setup): Don't fiddle with
	font-lock-defaults.
2005-11-24 20:52:16 +00:00
Juri Linkov
f43eaaefc8 (hi-lock): Rename this defgroup from
`hi-lock-interactive-text-highlighting'.  Change parent group from
`faces' to `font-lock'.  Add link to the manual.
(hi-lock-mode, hi-lock-file-patterns-range)
(hi-lock-exclude-modes, hi-lock-faces): Rename :group from
`hi-lock-interactive-text-highlighting' to `hi-lock'.
(hi-lock-faces): Add :group `faces'.
2005-11-17 07:21:54 +00:00
Chong Yidong
71dd9295e3 * hi-lock.el (hi-lock-mode): Set the default value of
font-lock-defaults.
2005-11-12 17:17:52 +00:00