From xemacs-m  Sun Jan  5 16:01:14 1997
Received: from atreides.mindspring.com (qmailr@atreides.mindspring.com [204.180.142.236])
          by xemacs.cs.uiuc.edu (8.8.4/8.8.4) with SMTP
	  id QAA12645 for <xemacs-beta@xemacs.org>; Sun, 5 Jan 1997 16:01:13 -0600 (CST)
Received: (qmail 22311 invoked by uid 52477); 5 Jan 1997 22:01:16 -0000
Sender: sj@atreides.mindspring.com
To: XEmacs beta <xemacs-beta@xemacs.org>, Simon.Marshall@esrin.esa.it
Subject: lazy-lock 1.15 fixes
Mime-Version: 1.0 (generated by tm-edit 7.100)
Content-Type: text/plain; charset=US-ASCII
From: Sudish Joseph <sudish@mindspring.com>
Date: 05 Jan 1997 17:01:15 -0500
Message-ID: <yviasp4fu6hg.fsf@atreides.mindspring.com>
Lines: 41

The XEmacs 20.0-beta-34 lazy-lock 1.15 synch up broke lazy-lock coz
some of it's version tests assume a major version number of 19.

Patch follows,
-Sudish

--- lazy-lock.el.orig	Sat Jan  4 18:05:14 1997
+++ lazy-lock.el	Sun Jan  5 16:56:59 1997
@@ -874,7 +874,9 @@
 ;; These fix bugs in `text-property-any' and `text-property-not-all'.  They may
 ;; not work perfectly in 19.11 and below because `next-single-property-change'
 ;; is also broke and not easily fixable in Lisp.
-(if (and lazy-lock-running-xemacs-p (< emacs-minor-version 12))
+(if (and lazy-lock-running-xemacs-p 
+	 (= emacs-major-version 19)
+	 (< emacs-minor-version 12))
     (progn
       ;; Loop through property changes until found.  This fix includes a work
       ;; around which prevents a bug in `window-start' causing a barf here.
@@ -904,7 +906,9 @@
 ;; than `face'.  Since `font-lock-unfontify-region' only removes `face', and we
 ;; have non-font-lock properties hanging about, `text-prop' never gets removed.
 ;; Unfortunately `font-lock-any-extents-p' is inlined so we can't redefine it.
-(if (and lazy-lock-running-xemacs-p (< emacs-minor-version 12))
+(if (and lazy-lock-running-xemacs-p 
+	 (= emacs-major-version 19)
+	 (< emacs-minor-version 12))
     (add-hook 'font-lock-mode-hook
      (function (lambda ()
 	(remove-hook 'after-change-functions 'font-lock-after-change-function)
@@ -921,7 +925,9 @@
 		;; Now set `fontified' to t to stop `lazy-lock-fontify-window'.
 		(put-text-property beg end 'fontified t))))))))))
 
-(if (and lazy-lock-running-xemacs-p (>= emacs-minor-version 12))
+(if (and lazy-lock-running-xemacs-p
+	 (or (> emacs-major-version 19)
+	     (>= emacs-minor-version 12)))
     ;; XEmacs 19.12 font-lock.el's `font-lock-fontify-buffer' runs a hook.
     (add-hook 'font-lock-after-fontify-buffer-hook
 	      'lazy-lock-after-fontify-buffer))

