(tpu-search-internal): Changed variable

searching-forward to tpu-searching-forward.

Changed "edit-picture-hook" to "picture-mode-hook" for emacs version 19.

1 files changed, 8 insertions, 5 deletions

diff --git a/lisp/emulation/tpu-extras.el b/lisp/emulation/tpu-extras.el
index 22fb46a2d07..7ba2179140b 100644
--- a/lisp/emulation/tpu-extras.el
+++ b/lisp/emulation/tpu-extras.el
@@ -1,4 +1,5 @@
 ;;; tpu-extras.el --- Scroll margins and free cursor mode for TPU-edt
+
 ;; Copyright (C) 1993 Free Software Foundation, Inc.
 
 ;; Author: Rob Riepel <riepel@networking.stanford.edu>
@@ -21,8 +22,6 @@
 ;; along with GNU Emacs; see the file COPYING.  If not, write to
 ;; the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.
 
-;;; Revision: $Id: tpu-extras.el,v 1.2 1993/08/04 08:19:13 rms Exp rms $
-
 ;;; Commentary:
 
 ;;  The functions contained in this file implement scroll margins and free
@@ -105,7 +104,7 @@
 
 ;;;  Revision Information
 
-(defconst tpu-extras-revision "$Revision: 1.2 $"
+(defconst tpu-extras-revision "$Revision: 3.5 $"
   "Revision number of the TPU-edt extras.")
 
 
@@ -133,7 +132,11 @@ the previous line when starting from a line beginning.")
 ;;;  Hooks  --  Set cursor free in picture mode.
 ;;;             Clean up when writing a file from cursor free mode.
 
-(add-hook 'edit-picture-hook 'tpu-set-cursor-free)
+(if tpu-gnu-emacs18-p
+    (or (memq 'tpu-set-cursor-free edit-picture-hook)
+        (setq edit-picture-hook
+              (cons 'tpu-set-cursor-free edit-picture-hook)))
+  (add-hook 'picture-mode-hook 'tpu-set-cursor-free))
 
 (defun tpu-write-file-hook nil
   "Eliminate whitespace at ends of lines, if the cursor is free."
@@ -374,7 +377,7 @@ A repeat count means scroll that many sections."
          (far (save-excursion
                 (goto-char bottom) (forward-line (- height 2)) (point))))
     (tpu-search-internal-core pat quiet)
-    (if searching-forward
+    (if tpu-searching-forward
         (cond((> (point) far)
               (setq left (save-excursion (forward-line height)))
               (if (= 0 left) (recenter top-margin)