From: Tassilo Horn <tassilo@member.fsf.org>
To: Gideon Stupp <gideon.stupp@gmail.com>
Cc: juri@jurta.org, bug-gnu-emacs@gnu.org, emacs-devel@gnu.org
Subject: Re: [EXPERIMENTAL PATCH] Extending Isearch-repeat-forward/backward to support a prefix argument following suggesion by Juri Linkov
Date: Thu, 26 Jan 2012 19:46:07 +0100 [thread overview]
Message-ID: <8762fyfgk0.fsf@thinkpad.tsdh.de> (raw)
In-Reply-To: <87lioufh0t.fsf@thinkpad.tsdh.de> (Tassilo Horn's message of "Thu, 26 Jan 2012 19:36:02 +0100")
[-- Attachment #1: Type: text/plain, Size: 482 bytes --]
Tassilo Horn <tassilo@member.fsf.org> writes:
>> This experimental patch implements a suggestion by Juri Linkov to
>> extend isearch-repeat-forward/backward to support a prefix argument.
>
> I like it. I adapted it a bit to show the hints at the position where
> point would be if that one's selected, and I added also a bit
> superscript magic, which suits me better, visually. (Well, that should
> be customizable, of course.)
Ups, I forgot to attach the patch.
Bye,
Tassilo
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: isearchnavjuri.patch --]
[-- Type: text/x-patch, Size: 6509 bytes --]
=== modified file 'lisp/isearch.el'
--- lisp/isearch.el 2012-01-19 07:21:25 +0000
+++ lisp/isearch.el 2012-01-26 18:32:18 +0000
@@ -333,6 +333,21 @@
'lazy-highlight-face
"22.1")
(defvar lazy-highlight-face 'lazy-highlight)
+
+(defface lazy-highlight-hint
+ '((((class color) (min-colors 88) (background light))
+ (:background "paleturquoise" :bold t))
+ (((class color) (min-colors 88) (background dark))
+ (:background "paleturquoise4" :bold t))
+ (((class color) (min-colors 16))
+ (:background "turquoise3" :bold t))
+ (((class color) (min-colors 8))
+ (:background "turquoise3" :bold t))
+ (t (:underline t)))
+ "Face for lazy highlighting hints."
+ :group 'lazy-highlight
+ :group 'basic-faces)
+
\f
;; Define isearch help map.
@@ -417,10 +432,25 @@
;; We need these explicit definitions because, in a dense keymap,
;; the binding for t does not affect characters.
;; We use a dense keymap to save space.
+
(while (< i ?\s)
(define-key map (make-string 1 i) 'isearch-other-control-char)
(setq i (1+ i)))
+ ;; Bring universal-argument and friends back in
+ (define-key map "\C-u" 'universal-argument)
+ (define-key map (kbd "C--") 'negative-argument)
+ (define-key map (kbd "C-0") 'digit-argument)
+ (define-key map (kbd "C-1") 'digit-argument)
+ (define-key map (kbd "C-2") 'digit-argument)
+ (define-key map (kbd "C-3") 'digit-argument)
+ (define-key map (kbd "C-4") 'digit-argument)
+ (define-key map (kbd "C-5") 'digit-argument)
+ (define-key map (kbd "C-6") 'digit-argument)
+ (define-key map (kbd "C-7") 'digit-argument)
+ (define-key map (kbd "C-8") 'digit-argument)
+ (define-key map (kbd "C-9") 'digit-argument)
+
;; Single-byte printing chars extend the search string by default.
(setq i ?\s)
(while (< i 256)
@@ -434,7 +464,20 @@
;; default local key binding for any key not otherwise bound.
(let ((meta-map (make-sparse-keymap)))
(define-key map (char-to-string meta-prefix-char) meta-map)
- (define-key map [escape] meta-map))
+ (define-key map [escape] meta-map)
+ (define-key meta-map (kbd "-") 'negative-argument)
+ (define-key meta-map (kbd "C--") 'negative-argument)
+ (define-key meta-map (kbd "C-0") 'digit-argument)
+ (define-key meta-map (kbd "C-1") 'digit-argument)
+ (define-key meta-map (kbd "C-2") 'digit-argument)
+ (define-key meta-map (kbd "C-3") 'digit-argument)
+ (define-key meta-map (kbd "C-4") 'digit-argument)
+ (define-key meta-map (kbd "C-5") 'digit-argument)
+ (define-key meta-map (kbd "C-6") 'digit-argument)
+ (define-key meta-map (kbd "C-7") 'digit-argument)
+ (define-key meta-map (kbd "C-8") 'digit-argument)
+ (define-key meta-map (kbd "C-9") 'digit-argument))
+
(define-key map (vector meta-prefix-char t) 'isearch-other-meta-char)
;; Several non-printing chars change the searching behavior.
@@ -528,6 +571,7 @@
;; These are all set with setq while isearching
;; and bound locally while editing the search string.
+(defvar isearch-hint-count 0)
(defvar isearch-forward nil) ; Searching in the forward direction.
(defvar isearch-regexp nil) ; Searching for a regexp.
(defvar isearch-word nil) ; Searching for words.
@@ -1340,15 +1384,30 @@
(isearch-push-state)
(isearch-update))
-(defun isearch-repeat-forward ()
+(defun isearch-repeat-forward (arg)
"Repeat incremental search forwards."
- (interactive)
- (isearch-repeat 'forward))
+ (interactive "p")
+ (while (> arg 0)
+ (isearch-repeat 'forward)
+ (setq arg (1- arg))
+ (setq isearch-hint-count (1+ isearch-hint-count)))
+ (while (< arg 0)
+ (isearch-repeat 'backward)
+ (setq arg (1+ arg))
+ (setq isearch-hint-count (1+ isearch-hint-count)))
+ (isearch-update))
-(defun isearch-repeat-backward ()
+(defun isearch-repeat-backward (arg)
"Repeat incremental search backwards."
- (interactive)
- (isearch-repeat 'backward))
+ (interactive "p")
+ (while (> arg 0)
+ (isearch-repeat 'backward)
+ (setq arg (1- arg))
+ (setq isearch-hint-count (1+ isearch-hint-count)))
+ (while (< arg 0)
+ (isearch-repeat 'forward)
+ (setq arg (1+ arg)))
+ (setq isearch-hint-count (1+ isearch-hint-count)))
(defun isearch-toggle-regexp ()
"Toggle regexp searching on or off."
@@ -2627,6 +2686,7 @@
(defvar isearch-lazy-highlight-word nil)
(defvar isearch-lazy-highlight-forward nil)
(defvar isearch-lazy-highlight-error nil)
+(defvar isearch-lazy-highlight-hint-count nil)
(defun lazy-highlight-cleanup (&optional force)
"Stop lazy highlighting and remove extra highlighting from current buffer.
@@ -2671,6 +2731,9 @@
isearch-lazy-highlight-window-end))
(not (eq isearch-forward
isearch-lazy-highlight-forward))
+ (not (eq isearch-lazy-highlight-hint-count
+ isearch-hint-count))
+
;; In case we are recovering from an error.
(not (equal isearch-error
isearch-lazy-highlight-error))))
@@ -2693,6 +2756,7 @@
isearch-lazy-highlight-regexp isearch-regexp
isearch-lazy-highlight-space-regexp search-whitespace-regexp
isearch-lazy-highlight-word isearch-word
+ isearch-lazy-highlight-hint-count isearch-hint-count
isearch-lazy-highlight-forward isearch-forward)
(unless (equal isearch-string "")
(setq isearch-lazy-highlight-timer
@@ -2739,7 +2803,8 @@
"Update highlighting of other matches for current search."
(let ((max lazy-highlight-max-at-a-time)
(looping t)
- nomore)
+ nomore
+ (count 1))
(with-local-quit
(save-selected-window
(if (and (window-live-p isearch-lazy-highlight-window)
@@ -2773,8 +2838,19 @@
(forward-char -1)))
;; non-zero-length match
- (let ((ov (make-overlay mb me)))
+ (let ((ov (make-overlay mb me)) hint)
(push ov isearch-lazy-highlight-overlays)
+ (if (not isearch-lazy-highlight-wrapped)
+ (progn
+ (setq hint (number-to-string count))
+ (setq count (1+ count))
+ (set-text-properties 0 (length hint)
+ '(face lazy-highlight-hint
+ display ((height 0.7) (raise 0.3)))
+ hint)
+ (if isearch-lazy-highlight-forward
+ (overlay-put ov 'after-string hint)
+ (overlay-put ov 'before-string hint))))
;; 1000 is higher than ediff's 100+,
;; but lower than isearch main overlay's 1001
(overlay-put ov 'priority 1000)
next prev parent reply other threads:[~2012-01-26 18:46 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-01-26 17:27 bug#10614: [EXPERIMENTAL PATCH] Extending Isearch-repeat-forward/backward to support a prefix argument following suggesion by Juri Linkov Gideon Stupp
2012-01-26 18:36 ` Tassilo Horn
2012-01-26 18:46 ` Tassilo Horn [this message]
2012-01-26 19:00 ` Re: [EXPERIMENTAL PATCH] Extending Isearch-repeat-forward/backward to support a prefix argument gideon.stupp
2012-01-26 19:10 ` Re: Re: [EXPERIMENTAL PATCH] Extending Isearch-repeat-forward/backward to support a prefix argum gideon.stupp
2012-01-26 19:32 ` Glenn Morris
2012-01-26 19:11 ` [EXPERIMENTAL PATCH] Extending Isearch-repeat-forward/backward to support a prefix argument following suggesion by Juri Linkov Tassilo Horn
2012-01-26 19:28 ` bug#10614: " Jérémy Compostella
2012-01-26 21:43 ` bug#10614: [EXPERIMENTAL PATCH] ExtendingIsearch-repeat-forward/backward to support a prefix argumentfollowing " Drew Adams
2012-01-27 1:44 ` [EXPERIMENTAL PATCH] Extending Isearch-repeat-forward/backward to support a prefix argument following " Juri Linkov
2012-01-27 6:17 ` Gideon Stupp
2012-01-27 12:07 ` Juri Linkov
2012-01-27 17:05 ` [EXPERIMENTAL PATCH] Extending Isearch-repeat-forward/backward tosupport " Drew Adams
2012-01-28 12:40 ` RE: [EXPERIMENTAL PATCH] Extending Isearch-repeat-forward/backward tosupport a prefix argument f gideon.stupp
2012-01-28 12:31 ` Re: [EXPERIMENTAL PATCH] Extending Isearch-repeat-forward/backward to support a prefix argument gideon.stupp
2012-01-29 16:11 ` [EXPERIMENTAL PATCH] Extending Isearch-repeat-forward/backward to support a prefix argument following suggesion by Juri Linkov Gideon Stupp
2012-01-30 0:38 ` Juri Linkov
2012-01-30 9:53 ` Gideon Stupp
2012-01-30 22:53 ` Juri Linkov
2012-01-31 11:52 ` Gideon Stupp
2012-01-31 20:18 ` Juri Linkov
2016-02-25 6:06 ` bug#10614: " Lars Ingebrigtsen
2016-02-29 23:44 ` Juri Linkov
2016-03-01 0:43 ` Lars Ingebrigtsen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8762fyfgk0.fsf@thinkpad.tsdh.de \
--to=tassilo@member.fsf.org \
--cc=bug-gnu-emacs@gnu.org \
--cc=emacs-devel@gnu.org \
--cc=gideon.stupp@gmail.com \
--cc=juri@jurta.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).