mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-15 10:30:25 -08:00
Code Issues Projects Releases Wiki Activity

(isearch-mode-map): Bind M-s h r' to isearch-highlight-regexp'.

Browse source 
(isearch-highlight-regexp): New function.
This commit is contained in:
Juri Linkov 2008-06-25 20:22:14 +00:00
parent 56d62ee1fb
commit 11c9f489a4
2 changed files with 35 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

14
lisp/ChangeLog
View file

@ -1,3 +1,17 @@
2008-06-25 Juri Linkov <juri@jurta.org>
* bindings.el (goto-map): New variable. Rebind goto-related
commands to this `M-g' prefix keymap.
(search-map): New variable for `M-s' prefix keymap.
Bind `M-s o' to `occur', `M-shr' to `highlight-regexp', `M-shp' to
`highlight-phrase', `M-shl' to `highlight-lines-matching-regexp',
`M-shu' to `unhighlight-regexp', `M-shf' to `hi-lock-find-patterns',
`M-shw' to `hi-lock-write-interactive-patterns'.
* isearch.el (isearch-mode-map): Bind `M-s h r' to
`isearch-highlight-regexp'.
(isearch-highlight-regexp): New function.
2008-06-25 Stefan Monnier <monnier@iro.umontreal.ca>
* info.el (Info-bookmark-make-record):

21
lisp/isearch.el
View file

@ -494,6 +494,7 @@ This is like `describe-bindings', but displays only isearch keys."
(define-key map [?\M-%] 'isearch-query-replace)
(define-key map [?\C-\M-%] 'isearch-query-replace-regexp)
(define-key map "\M-so" 'isearch-occur)
(define-key map "\M-shr" 'isearch-highlight-regexp)
map)
"Keymap for `isearch-mode'.")
@ -1364,6 +1365,26 @@ string. NLINES has the same meaning as in `occur'."
(search-upper-case nil))
(occur regexp nlines)))
(declare-function hi-lock-regexp-okay "hi-lock" (regexp))
(declare-function hi-lock-read-face-name "hi-lock" ())
(defun isearch-highlight-regexp (regexp &optional face)
"Run `highlight-regexp' with regexp from the current search string.
Interactively, REGEXP is the current search regexp or a quoted search
string. FACE has the same meaning as in `highlight-regexp'."
(interactive
(list
(progn
(require 'hi-lock nil t)
(hi-lock-regexp-okay
(if isearch-regexp isearch-string (regexp-quote isearch-string))))
(hi-lock-read-face-name)))
(isearch-done)
(isearch-clean-overlays)
;; (add-to-history 'hi-lock-regexp-history regexp)
(let ((case-fold-search isearch-case-fold-search))
(hi-lock-face-buffer regexp face)))
(defun isearch-delete-char ()
"Discard last input item and move point back.