[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/isearch.el [lexbind]
From: |
Miles Bader |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/isearch.el [lexbind] |
Date: |
Tue, 14 Oct 2003 19:52:04 -0400 |
Index: emacs/lisp/isearch.el
diff -c emacs/lisp/isearch.el:1.212.2.1 emacs/lisp/isearch.el:1.212.2.2
*** emacs/lisp/isearch.el:1.212.2.1 Fri Apr 4 01:20:08 2003
--- emacs/lisp/isearch.el Tue Oct 14 19:51:10 2003
***************
*** 1,6 ****
;;; isearch.el --- incremental search minor mode
! ;; Copyright (C) 1992, 93, 94, 95, 96, 97, 1999, 2000, 2001
;; Free Software Foundation, Inc.
;; Author: Daniel LaLiberte <address@hidden>
--- 1,6 ----
;;; isearch.el --- incremental search minor mode
! ;; Copyright (C) 1992, 93, 94, 95, 96, 97, 1999, 2000, 01, 2003
;; Free Software Foundation, Inc.
;; Author: Daniel LaLiberte <address@hidden>
***************
*** 151,157 ****
:type 'boolean
:group 'isearch)
! (defcustom search-whitespace-regexp "\\s-+"
"*If non-nil, regular expression to match a sequence of whitespace chars.
This applies to regular expression incremental search.
You might want to use something like \"[ \\t\\r\\n]+\" instead.
--- 151,157 ----
:type 'boolean
:group 'isearch)
! (defcustom search-whitespace-regexp "\\(?:\\s-+\\)"
"*If non-nil, regular expression to match a sequence of whitespace chars.
This applies to regular expression incremental search.
You might want to use something like \"[ \\t\\r\\n]+\" instead.
***************
*** 738,752 ****
(if (or (null regexp-search-ring)
(not (string= string (car regexp-search-ring))))
(progn
! (setq regexp-search-ring
! (cons string regexp-search-ring))
(if (> (length regexp-search-ring) regexp-search-ring-max)
(setcdr (nthcdr (1- search-ring-max) regexp-search-ring)
nil))))
(if (or (null search-ring)
(not (string= string (car search-ring))))
(progn
! (setq search-ring (cons string search-ring))
(if (> (length search-ring) search-ring-max)
(setcdr (nthcdr (1- search-ring-max) search-ring) nil))))))
--- 738,751 ----
(if (or (null regexp-search-ring)
(not (string= string (car regexp-search-ring))))
(progn
! (push string regexp-search-ring)
(if (> (length regexp-search-ring) regexp-search-ring-max)
(setcdr (nthcdr (1- search-ring-max) regexp-search-ring)
nil))))
(if (or (null search-ring)
(not (string= string (car search-ring))))
(progn
! (push string search-ring)
(if (> (length search-ring) search-ring-max)
(setcdr (nthcdr (1- search-ring-max) search-ring) nil))))))
***************
*** 1493,1501 ****
;; Helper for isearch-complete and isearch-complete-edit
;; Return t if completion OK, nil if no completion exists.
(let* ((ring (if isearch-regexp regexp-search-ring search-ring))
- (alist (mapcar (function (lambda (string) (list string))) ring))
(completion-ignore-case case-fold-search)
! (completion (try-completion isearch-string alist)))
(cond
((eq completion t)
;; isearch-string stays the same
--- 1492,1499 ----
;; Helper for isearch-complete and isearch-complete-edit
;; Return t if completion OK, nil if no completion exists.
(let* ((ring (if isearch-regexp regexp-search-ring search-ring))
(completion-ignore-case case-fold-search)
! (completion (try-completion isearch-string ring)))
(cond
((eq completion t)
;; isearch-string stays the same
***************
*** 1507,1513 ****
(if completion-auto-help
(with-output-to-temp-buffer "*Isearch completions*"
(display-completion-list
! (all-completions isearch-string alist))))
t)
(and completion
(setq isearch-string completion))))
--- 1505,1511 ----
(if completion-auto-help
(with-output-to-temp-buffer "*Isearch completions*"
(display-completion-list
! (all-completions isearch-string ring))))
t)
(and completion
(setq isearch-string completion))))
***************
*** 1521,1527 ****
If there is no completion possible, say so and continue searching."
(interactive)
(if (isearch-complete1)
! (isearch-edit-string)
;; else
(sit-for 1)
(isearch-update)))
--- 1519,1528 ----
If there is no completion possible, say so and continue searching."
(interactive)
(if (isearch-complete1)
! (progn (setq isearch-message
! (mapconcat 'isearch-text-char-description
! isearch-string ""))
! (isearch-edit-string))
;; else
(sit-for 1)
(isearch-update)))
***************
*** 1529,1535 ****
(defun isearch-complete-edit ()
"Same as `isearch-complete' except in the minibuffer."
(interactive)
! (setq isearch-string (buffer-string))
(if (isearch-complete1)
(progn
(delete-field)
--- 1530,1536 ----
(defun isearch-complete-edit ()
"Same as `isearch-complete' except in the minibuffer."
(interactive)
! (setq isearch-string (field-string))
(if (isearch-complete1)
(progn
(delete-field)
***************
*** 2123,2126 ****
--- 2124,2128 ----
isearch-case-fold-search case-fold)
(isearch-search))
+ ;;; arch-tag: 74850515-f7d8-43a6-8a2c-ca90a4c1e675
;;; isearch.el ends here
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] Changes to emacs/lisp/isearch.el [lexbind],
Miles Bader <=