Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: doitian/emacs.d
base: dcb9629cc1
...
head fork: doitian/emacs.d
compare: 258d97a75c
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 9 additions and 11 deletions.
  1. +8 −10 lisp/iy-go-to-char.el
  2. +1 −1  lisp/modes/iy-ido-mode.el
View
18 lisp/iy-go-to-char.el
@@ -105,6 +105,11 @@
"last char used in iy-go-to-char"
)
+(defun iy-go-to-char-isearch-setup ()
+ (remove-hook 'isearch-mode-hook 'iy-go-to-char-isearch-setup)
+ (setq isearch-string (if iy-go-to-char-last-char (string iy-go-to-char-last-char) ""))
+ (isearch-search-and-update))
+
;;;###autoload
(defun iy-go-to-char (n char)
"Move forward to Nth occurence of CHAR.
@@ -152,15 +157,8 @@ Unless quit using C-g or the region is activated before searching, the start
(push-mark orig t)
(cond
((or (eq ev ?\C-s) (eq ev ?\C-r))
- (let ((begin (match-beginning 0))
- (end (match-end 0))
- isearch-initial-string
- )
- (if (eq begin end)
- (if (eq ev ?\C-s) (isearch-forward) (isearch-backward))
- (setq isearch-initial-string (buffer-substring begin end))
- (add-hook 'isearch-mode-hook 'isearch-set-initial-string)
- (if (eq ev ?\C-s) (isearch-forward) (isearch-backward)))))
+ (add-hook 'isearch-mode-hook 'iy-go-to-char-isearch-setup)
+ (if (eq ev ?\C-s) (isearch-forward) (isearch-backward)))
((eq ev ?\C-w)
(goto-char pt)
(push-mark orig t)
@@ -201,4 +199,4 @@ Typing C-s or C-r will start `isearch` using CHAR"
-(provide 'iy-go-to-char)
+(provide 'iy-go-to-char)
View
2  lisp/modes/iy-ido-mode.el
@@ -11,7 +11,7 @@
(push 'ido-ubiquitous el-get-packages)
(custom-set-variables
- '(ido-ubiquitous-command-exceptions '(execute-extended-command man))
+ '(ido-ubiquitous-command-exceptions '(execute-extended-command describe-function man))
'(ido-ubiquitous t))
(defun iy-ido-mode-init ()

No commit comments for this range

Something went wrong with that request. Please try again.