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-edit-string): Make the search-ring available for

Browse source 
minibuffer history commands.
(minibuffer-local-isearch-map): Remove bindings for M-p	and M-n,
the default history commands now work just as well.
(isearch-ring-retreat-edit, isearch-ring-advance-edit): Remove.
This commit is contained in:
Stefan Monnier 2005-04-18 22:32:37 +00:00
parent 1338947ca0
commit e5feeb319e
2 changed files with 16 additions and 59 deletions
Download patch file Download diff file Expand all files Collapse all files

63
lisp/isearch.el
View file

@ -405,12 +405,6 @@ A value of nil means highlight all matches."
(let ((map (make-sparse-keymap)))
(set-keymap-parent map minibuffer-local-map)
(define-key map "\r" 'isearch-nonincremental-exit-minibuffer)
(define-key map "\M-n" 'isearch-ring-advance-edit)
(define-key map [next] 'isearch-ring-advance-edit)
(define-key map [down] 'isearch-ring-advance-edit)
(define-key map "\M-p" 'isearch-ring-retreat-edit)
(define-key map [prior] 'isearch-ring-retreat-edit)
(define-key map [up] 'isearch-ring-retreat-edit)
(define-key map "\M-\t" 'isearch-complete-edit)
(define-key map "\C-s" 'isearch-forward-exit-minibuffer)
(define-key map "\C-r" 'isearch-reverse-exit-minibuffer)
@ -937,8 +931,6 @@ The following additional command keys are active while editing.
\\[isearch-nonincremental-exit-minibuffer] to do one nonincremental search.
\\[isearch-forward-exit-minibuffer] to resume isearching forward.
\\[isearch-reverse-exit-minibuffer] to resume isearching backward.
\\[isearch-ring-advance-edit] to replace the search string with the next item in the search ring.
\\[isearch-ring-retreat-edit] to replace the search string with the previous item in the search ring.
\\[isearch-complete-edit] to complete the search string using the search ring.
\\<isearch-mode-map>
If first char entered is \\[isearch-yank-word-or-char], then do word search instead."
@ -1024,12 +1016,12 @@ If first char entered is \\[isearch-yank-word-or-char], then do word search inst
(isearch-unread e))
(setq cursor-in-echo-area nil)
(setq isearch-new-string
(let (junk-ring)
(read-from-minibuffer
(isearch-message-prefix nil nil isearch-nonincremental)
isearch-string
minibuffer-local-isearch-map nil
'junk-ring nil t))
(read-from-minibuffer
(isearch-message-prefix nil nil isearch-nonincremental)
isearch-string
minibuffer-local-isearch-map nil
(if isearch-regexp 'regexp-search-ring 'search-ring)
nil t)
isearch-new-message
(mapconcat 'isearch-text-char-description
isearch-new-string "")))
@ -1860,49 +1852,6 @@ Obsolete."
(interactive)
(isearch-ring-adjust nil))
(defun isearch-ring-advance-edit (n)
"Insert the next element of the search history into the minibuffer.
With prefix arg N, insert the Nth element."
(interactive "p")
(let* ((yank-pointer-name (if isearch-regexp
'regexp-search-ring-yank-pointer
'search-ring-yank-pointer))
(yank-pointer (eval yank-pointer-name))
(ring (if isearch-regexp regexp-search-ring search-ring))
(length (length ring)))
(if (zerop length)
()
(set yank-pointer-name
(setq yank-pointer
(mod (- (or yank-pointer 0) n)
length)))
(delete-field)
(insert (nth yank-pointer ring))
(goto-char (point-max)))))
(defun isearch-ring-retreat-edit (n)
"Insert the previous element of the search history into the minibuffer.
With prefix arg N, insert the Nth element."
(interactive "p")
(isearch-ring-advance-edit (- n)))
;;(defun isearch-ring-adjust-edit (advance)
;; "Use the next or previous search string in the ring while in minibuffer."
;; (isearch-ring-adjust1 advance)
;; (erase-buffer)
;; (insert isearch-string))
;;(defun isearch-ring-advance-edit ()
;; (interactive)
;; (isearch-ring-adjust-edit 'advance))
;;(defun isearch-ring-retreat-edit ()
;; "Retreat to the previous search string in the ring while in the minibuffer."
;; (interactive)
;; (isearch-ring-adjust-edit nil))
(defun isearch-complete1 ()
;; Helper for isearch-complete and isearch-complete-edit
;; Return t if completion OK, nil if no completion exists.