comparison lisp/isearch.el @ 1885:9e79ffe97d5b

Fix minor bugs in previous change.

1884:4a8bc12e7017

;; Copyright (C) 1992 Free Software Foundation, Inc.

;; LCD Archive Entry:
;; isearch-mode|Daniel LaLiberte|[e-mail]
;; |A minor mode replacement for isearch.el.
;; |$Date: 1993/01/26 01:48:27 $|$Revision: 1.17 $|~/modes/isearch-mode.el

;; This file is not yet part of GNU Emacs, but it is based almost
;; entirely on isearch.el which is part of GNU Emacs.

;; GNU Emacs is distributed in the hope that it will be useful,

;; - Hooks and options for failed search.

;;;====================================================================
;;; Change History

;;; $Header: /gd/gnu/emacs/19.0/lisp/RCS/isearch-mode.el,v 1.17 1993/01/26 01:48:27 jimb Exp rms $
;;; $Log: isearch-mode.el,v $
; Revision 1.17  1993/01/26  01:48:27  jimb
; JimB's changes since January 18th
;
; Revision 1.16  1992/11/16  01:37:06  jimb
; 	* bytecomp.el: Declare unread-command-char an obsolete variable.

If this function is called non-interactively, it does not return to
the calling function until the search is done."

  (interactive "P\np")
  (isearch-mode t (not (null regexp-p)) nil no-recursive-edit))

(defun isearch-forward-regexp (&optional not-regexp no-recursive-edit)
  "\
Do incremental search forward for regular expression.
With a prefix argument, do a regular string search instead.
Like ordinary incremental search except that your input
is treated as a regexp.  See \\[isearch-forward] for more info."
  (interactive "P\np")
  (isearch-mode t (null not-regexp) nil no-recursive-edit))

(defun isearch-backward (&optional regexp-p no-recursive-edit)
  "\
Do incremental search backward.
With a prefix argument, do a regular expression search instead.
See \\[isearch-forward] for more information."
  (interactive "P\np")
  (isearch-mode nil (not (null regexp-p)) nil no-recursive-edit))

(defun isearch-backward-regexp (&optional not-regexp no-recursive-edit)
  "\
Do incremental search backward for regular expression.
With a prefix argument, do a regular string search instead.
Like ordinary incremental search except that your input
is treated as a regexp.  See \\[isearch-forward] for more info."
  (interactive "P\np")
  (isearch-mode nil (null not-regexp) nil no-recursive-edit))


(defun isearch-mode-help ()
  (interactive)
  (describe-function 'isearch-forward)

;;		     last-command-event (character-to-event last-command-char)
;;		     this-command 'isearch-printing-char))))
;;	))

;;))

1885:9e79ffe97d5b

;; Copyright (C) 1992 Free Software Foundation, Inc.

;; LCD Archive Entry:
;; isearch-mode|Daniel LaLiberte|[e-mail]
;; |A minor mode replacement for isearch.el.
;; |$Date: 1993/02/17 20:34:20 $|$Revision: 1.18 $|~/modes/isearch-mode.el

;; This file is not yet part of GNU Emacs, but it is based almost
;; entirely on isearch.el which is part of GNU Emacs.

;; GNU Emacs is distributed in the hope that it will be useful,

;; - Hooks and options for failed search.

;;;====================================================================
;;; Change History

;;; $Header: /gd/gnu/emacs/19.0/lisp/RCS/isearch-mode.el,v 1.18 1993/02/17 20:34:20 rms Exp rms $
;;; $Log: isearch-mode.el,v $
; Revision 1.18  1993/02/17  20:34:20  rms
; (isearch-backward-regexp):
; New arg no-recursive-edit, always non-nil for interactive call.
; Rename first arg, and set it right in interactive call.
; (isearch-forward-regexp): Likewise.
; (isearch-forward, isearch-backward): Likewise no-recursive-edit.
;
; Revision 1.17  1993/01/26  01:48:27  jimb
; JimB's changes since January 18th
;
; Revision 1.16  1992/11/16  01:37:06  jimb
; 	* bytecomp.el: Declare unread-command-char an obsolete variable.

If this function is called non-interactively, it does not return to
the calling function until the search is done."

  (interactive "P\np")
  (isearch-mode t (not (null regexp-p)) nil (not no-recursive-edit)))

(defun isearch-forward-regexp (&optional not-regexp no-recursive-edit)
  "\
Do incremental search forward for regular expression.
With a prefix argument, do a regular string search instead.
Like ordinary incremental search except that your input
is treated as a regexp.  See \\[isearch-forward] for more info."
  (interactive "P\np")
  (isearch-mode t (null not-regexp) nil (not no-recursive-edit)))

(defun isearch-backward (&optional regexp-p no-recursive-edit)
  "\
Do incremental search backward.
With a prefix argument, do a regular expression search instead.
See \\[isearch-forward] for more information."
  (interactive "P\np")
  (isearch-mode nil (not (null regexp-p)) nil (not no-recursive-edit)))

(defun isearch-backward-regexp (&optional not-regexp no-recursive-edit)
  "\
Do incremental search backward for regular expression.
With a prefix argument, do a regular string search instead.
Like ordinary incremental search except that your input
is treated as a regexp.  See \\[isearch-forward] for more info."
  (interactive "P\np")
  (isearch-mode nil (null not-regexp) nil (not no-recursive-edit)))


(defun isearch-mode-help ()
  (interactive)
  (describe-function 'isearch-forward)

;;		     last-command-event (character-to-event last-command-char)
;;		     this-command 'isearch-printing-char))))
;;	))

;;))