From xemacs-m  Wed Jan 29 15:02:54 1997
Received: from cdc.noaa.gov (manager.Colorado.EDU [128.138.218.210])
          by xemacs.org (8.8.4/8.8.4) with SMTP
	  id PAA04882 for <xemacs-beta@xemacs.org>; Wed, 29 Jan 1997 15:02:53 -0600 (CST)
Received: from suomi by cdc.noaa.gov (SMI-8.6/SMI-SVR4)
	id OAA22046; Wed, 29 Jan 1997 14:02:23 -0700
Received: by suomi (SMI-8.6) id OAA00150; Wed, 29 Jan 1997 14:02:23 -0700
Sender: mdb@cdc.noaa.gov
To: xemacs-beta@xemacs.org
Cc: gnus-bug@ifi.uio.no (Lars Magne Ingebrigtsen)
Subject: Re: [PATCH!] Re: [rgnus-0.83] mark behavior change?
References: <vkg1zqzx9u.fsf@cdc.noaa.gov> <m2n2tyt96a.fsf@proletcult.slip.ifi.uio.no> <vkn2tvf07k.fsf@cdc.noaa.gov> <m2zpxvklkq.fsf@proletcult.slip.ifi.uio.no> <vkafpu52qn.fsf@cdc.noaa.gov> <m2k9oylqub.fsf@proletcult.slip.ifi.uio.no> <vk20b5ad9x.fsf@cdc.noaa.gov> <m2ohe9y6pg.fsf@proletcult.slip.ifi.uio.no> <vkwwswkzd7.fsf_-_@cdc.noaa.gov> <m220b4kya2.fsf@altair.xemacs.org>
Organization: CIRES, University of Colorado
X-Attribution: mb
From: Mark Borges <mdb@cdc.noaa.gov>
Date: 29 Jan 1997 14:02:22 -0700
In-Reply-To: Steven L Baur's message of 29 Jan 1997 12:43:33 -0800
Message-ID: <vklo9cw5y9.fsf@cdc.noaa.gov>
Lines: 65
X-Mailer: Gnus v5.4.6/XEmacs 20.0

>> On 29 Jan 1997 12:43:33 -0800,
>> Steven L Baur(sb) wrote:
sb> Mark Borges writes:
>> Well, not really a patch. I didn't want to make a patch until Lars or
>> someone on the XEmacs development team blessed this. ;-).

sb> gnus-characterp was submitted by Sudish Joseph, (I thought) for
sb> 20.0 compatibility, so now I'm confused.

? Me too. (fset 'gnus-characterp 'characterp) definitely does not do the
right thing in 20.0, though

sb> We still need to a fix for the broken message-caesar-region.
sb> tm:caesar-region is not a substitute because it only accepts an active
sb> region as input.

And if we're making a list, this line in gnus-xmas.el doesn't do the
right thing in 20.0, either:

  (require 'text-props)
  (when (< emacs-minor-version 14)
    (fset 'gnus-set-text-properties 'gnus-xmas-set-text-properties))

[ Ben suggested this to make Gnus only use it for early versions of
  XEmacs ]

This is my interim patch, but it's no good to use unless you also use
Eric Eide's emacs-vers.el package. Otherwise you need to re-write it
to do the string-match/emacs-version thing.

suomi$ diff -u gnus-xmas.el.orig gnus-xmas.el                                         326
--- gnus-xmas.el.orig   Tue Jan 28 13:50:14 1997
+++ gnus-xmas.el        Wed Jan 29 14:01:22 1997
@@ -381,7 +381,6 @@
   (unless (face-differs-from-default-p 'underline)
     (funcall (intern "set-face-underline-p") 'underline t))
-  (fset 'gnus-characterp 'characterp)
   (fset 'gnus-make-overlay 'make-extent)
   (fset 'gnus-overlay-put 'set-extent-property)
   (fset 'gnus-move-overlay 'gnus-xmas-move-overlay)
@@ -391,8 +390,20 @@
   (fset 'gnus-put-text-property 'gnus-xmas-put-text-property)
   (require 'text-props)
-  (when (< emacs-minor-version 14)
-    (fset 'gnus-set-text-properties 'gnus-xmas-set-text-properties))
+  (cond
+   ((emacs-version>= 20)
+    ;; V20
+    (progn
+      (fset 'gnus-characterp 'char-int-p))
+    )
+    ;; V19
+   (t
+    (progn
+      (fset 'gnus-characterp 'characterp)
+      (when (< emacs-minor-version 14)
+       (fset 'gnus-set-text-properties 'gnus-xmas-set-text-properties))
+      )
+    ))
   (when (fboundp 'turn-off-scroll-in-place)
     (add-hook 'gnus-article-mode-hook 'turn-off-scroll-in-place))
$

-- 
  -mb-

