# HG changeset patch
# User Jim Blandy <jimb@redhat.com>
# Date 721877826 0
# Node ID 567e76c81b0cc3641886ec118ce84ca0477659e1
# Parent  694d5c6de713551c02c03401fd99232b019974ac
	* bytecomp.el: Declare unread-command-char an obsolete variable.
	* vip.el (vip-escape-to-emacs, vip-prefix-arg-value,
	vip-prefix-arg-com): Use unread-command-event instead of
	unread-command-char; respect its new semantics.
	* isearch-mode.el (isearch-update, isearch-unread): Same.

diff -r 694d5c6de713 -r 567e76c81b0c lisp/isearch.el
--- a/lisp/isearch.el	Mon Nov 16 01:36:46 1992 +0000
+++ b/lisp/isearch.el	Mon Nov 16 01:37:06 1992 +0000
@@ -4,7 +4,7 @@
 ;; LCD Archive Entry:
 ;; isearch-mode|Daniel LaLiberte|liberte@cs.uiuc.edu
 ;; |A minor mode replacement for isearch.el.
-;; |$Date: 1992/11/01 22:10:59 $|$Revision: 1.14 $|~/modes/isearch-mode.el
+;; |$Date: 1992/11/07 06:17:04 $|$Revision: 1.15 $|~/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.
@@ -88,8 +88,21 @@
 ;;;====================================================================
 ;;; Change History
 
-;;; $Header: /gd/gnu/emacs/19.0/lisp/RCS/isearch-mode.el,v 1.14 1992/11/01 22:10:59 rms Exp $
+;;; $Header: /home/gd/gnu/emacs/19.0/lisp/RCS/isearch-mode.el,v 1.15 1992/11/07 06:17:04 jimb Exp jimb $
 ;;; $Log: isearch-mode.el,v $
+; Revision 1.15  1992/11/07  06:17:04  jimb
+;         * isearch.el (isearch-frames-exist): This isn't what we want -
+; 	replaced by...
+; 	(isearch-gnu-emacs-events): non-nil if should expect events in the
+; 	style generated by GNU Emacs 19.  Set if set-frame-height is
+; 	fboundp; this is true on any GNU Emacs 19, whether or not it was
+; 	compiled with multiple frame support.
+; 	(isearch-mode-map): Test isearch-gnu-emacs-events instead of
+; 	isearch-frames-exist to see if we should bind switch-frame events.
+; 	(isearch-update): Test isearch-gnu-emacs-events instead of
+; 	isearch-frames-exist to see if unread-command-char's quiescent
+; 	value is nil or -1.
+;
 ; Revision 1.14  1992/11/01  22:10:59  rms
 ; (isearch-search): Handle all sorts of errors from regexp search.
 ;
@@ -544,7 +557,7 @@
   (if (if isearch-event-data-type
 	  (null unread-command-event)
 	(if isearch-gnu-emacs-events
-	    (null unread-command-char)
+	    (null unread-command-event)
 	  (< unread-command-char 0)))
       (progn
 	(if (not (input-pending-p))
@@ -1412,9 +1425,13 @@
 
 (defun isearch-unread (char-or-event)
   ;; General function to unread a character or event.
-  (if isearch-event-data-type
-      (setq unread-command-event char-or-event)
-    (setq unread-command-char char-or-event)))
+  (cond
+   (isearch-event-data-type
+    (setq unread-command-event char-or-event))
+   (isearch-gnu-emacs-events
+    (setq unread-command-event char-or-event))
+   (t
+    (setq unread-command-char char-or-event))))
 
 (defun isearch-last-command-char ()
   ;; General function to return the last command character.