*** empty log message ***

[bpt/emacs.git] / lisp / isearch-old.el

diff --git a/lisp/isearch-old.el b/lisp/isearch-old.el
index 265ea6b..ee7a1b0 100644 (file)
--- a/lisp/isearch-old.el
+++ b/lisp/isearch-old.el
@@ -2,11 +2,13 @@
 
 ;; Copyright (C) 1985, 1986 Free Software Foundation, Inc.
 
+;; Maintainer: FSF
+
 ;; This file is part of GNU Emacs.
 
 ;; GNU Emacs is free software; you can redistribute it and/or modify
 ;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 1, or (at your option)
+;; the Free Software Foundation; either version 2, or (at your option)
 ;; any later version.
 
 ;; GNU Emacs is distributed in the hope that it will be useful,
@@ -18,6 +20,8 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
+;;; Code:
+
 (defvar search-last-string "" "\
 Last string search for by a non-regexp search command.
 This does not include direct calls to the primitive search functions,
@@ -166,7 +170,7 @@ is treated as a regexp.  See \\[isearch-forward] for more info."
        ;; non-nil means an explicit uppercase letter seen in the input
        (uppercase-flag nil)
        ;; Non-nil means start using a small window
-       ;; if the search moves outside what is currently on the screen.
+       ;; if the search moves outside what is currently on the frame.
        (slow-terminal-mode (and (<= baud-rate search-slow-speed)
                                 (> (window-height)
                                    (* 4 search-slow-window-lines))))
@@ -183,8 +187,8 @@ is treated as a regexp.  See \\[isearch-forward] for more info."
        ;; for moving the cursor back on quitting.
        (opoint (point))
        (inhibit-quit t)  ;Prevent ^G from quitting, so we can read it.
-       ;; The screen we're working on; if this changes, we exit isearch.
-       (screen (if (fboundp 'selected-screen) (selected-screen))))
+       ;; The frame we're working on; if this changes, we exit isearch.
+       (frame (if (fboundp 'selected-frame) (selected-frame))))
           
     (isearch-push-state)
     (save-window-excursion
@@ -225,8 +229,8 @@ is treated as a regexp.  See \\[isearch-forward] for more info."
                  (setq unread-command-char char)
                  (throw 'search-done t))
 
-                ;; If the user switches to a different screen, exit.
-                ((not (eq screen last-event-screen))
+                ;; If the user switches to a different frame, exit.
+                ((not (eq frame last-event-frame))
                  (setq unread-command-char char)
                  (throw 'search-done t))
 
@@ -445,7 +449,7 @@ is treated as a regexp.  See \\[isearch-forward] for more info."
              (setq regexp-search-ring (cons (cons search-string uppercase-flag)
                                            regexp-search-ring)
                    regexp-search-ring-yank-pointer regexp-search-ring)
-             (if (> (length regexp-search-ring) regexp-search-ring-max)
+             (if (> (length regexp-search-ring) search-ring-max)
                  (setcdr (nthcdr (1- search-ring-max) regexp-search-ring) nil)))
          (if (not (member search-string search-ring))
              (progn