Providing functions missing from xemacs 21.4 (stable) with a

conditional defun will be less intrusive, and shorten the patch.

3 files changed, 15 insertions, 27 deletions

diff --git a/editors/xemacs-packages/Makefile b/editors/xemacs-packages/Makefile
index 9300468f28b..0b80d2dbdc5 100644
--- a/editors/xemacs-packages/Makefile
+++ b/editors/xemacs-packages/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.79 2021/09/15 21:06:42 hauke Exp $
+# $NetBSD: Makefile,v 1.80 2021/09/19 14:53:15 hauke Exp $
 
 DISTNAME=	xemacs-packages
 PKGNAME=	xemacs-packages-1.18
-PKGREVISION=	8
+PKGREVISION=	9
 
 CATEGORIES=	editors
 MASTER_SITES=	${MASTER_SITE_XEMACS:=${XEMACSPKG_PATH}/}
diff --git a/editors/xemacs-packages/distinfo b/editors/xemacs-packages/distinfo
index 449c28279d3..6986491aadb 100644
--- a/editors/xemacs-packages/distinfo
+++ b/editors/xemacs-packages/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.27 2021/09/15 21:06:42 hauke Exp $
+$NetBSD: distinfo,v 1.28 2021/09/19 14:53:15 hauke Exp $
 
 SHA1 (xemacs-packages/Sun-1.19-pkg.tar.gz) = de24d0bf78e753e733138c6a2bec0ecf414511e0
 RMD160 (xemacs-packages/Sun-1.19-pkg.tar.gz) = 5f6bec6276f8b5a59ea6532f12c06a474571a274
@@ -519,5 +519,5 @@ Size (xemacs-packages/zenirc-1.18-pkg.tar.gz) = 278677 bytes
 SHA1 (patch-lisp_guided-tour_guided-tour.el) = 28556cc7fbb9a18ba88d6e2cf23f3b517461f580
 SHA1 (patch-lisp_vc_vc-git.el) = 8b5aa902cc56a256c9c2210b49437bf7929f6e30
 SHA1 (patch-lisp_vc_vc.el) = ec13ecf02b41dca5bb80afc63ee4fb9f0b283a45
-SHA1 (patch-lisp_w3_url.el) = 551e11abffe6df7693003ca2aad5238fbd6c0116
+SHA1 (patch-lisp_w3_url.el) = 14c9d20ed501fc5fc6fe28225b9a9a40accec766
 SHA1 (patch-lisp_xemacs-base_simple-more.el) = 20ccf1afff6b69f33209f179e96822cce8f25a26
diff --git a/editors/xemacs-packages/patches/patch-lisp_w3_url.el b/editors/xemacs-packages/patches/patch-lisp_w3_url.el
index 8bcc0dbd0db..ffd2df70246 100644
--- a/editors/xemacs-packages/patches/patch-lisp_w3_url.el
+++ b/editors/xemacs-packages/patches/patch-lisp_w3_url.el
@@ -1,36 +1,24 @@
-$NetBSD: patch-lisp_w3_url.el,v 1.1 2019/07/31 14:04:40 hauke Exp $
+$NetBSD: patch-lisp_w3_url.el,v 1.2 2021/09/19 14:53:15 hauke Exp $
 
 Provide buffer-local-value for the sake of XEmacs 21.4
 
 --- lisp/w3/url.el.orig	2015-12-14 21:38:21.000000000 +0000
 +++ lisp/w3/url.el
-@@ -57,6 +57,16 @@
+@@ -57,6 +57,17 @@
    :type 'directory
    :group 'url)
  
-+(defun url-buffer-local-value (sym buffer)
-+  "Get the buffer-local value of variable SYM in BUFFER. If there is no
-+buffer-local value in BUFFER then the global value of SYM is used."
-+  (if (fboundp 'buffer-local-value)
++(if (not (fboundp 'buffer-local-value))
++    (defun url-buffer-local-value (sym buffer)
++      "Get the buffer-local value of variable SYM in BUFFER. If there
++is no buffer-local value in BUFFER then the global value of SYM is
++used."
 +      (buffer-local-value sym buffer)
-+    (or (cdr (assoc sym (buffer-local-variables buffer)))
-+        (save-excursion
-+          (set-buffer buffer)
-+          (symbol-value sym)))))
++      (or (cdr (assoc sym (buffer-local-variables buffer)))
++	  (save-excursion
++	    (set-buffer buffer)
++	    (symbol-value sym)))))
 +
  (defun url-do-setup ()
    "Setup the URL package.
  This is to avoid conflict with user settings if URL is dumped with
-@@ -256,10 +266,10 @@ no further processing).  URL is either a
- 	  (url-debug 'retrieval
- 		     "Spinning in url-retrieve-synchronously: %S (%S)"
- 		     retrieval-done asynch-buffer)
--          (if (buffer-local-value 'url-redirect-buffer asynch-buffer)
-+          (if (url-buffer-local-value 'url-redirect-buffer asynch-buffer)
-               (setq proc (get-buffer-process
-                           (setq asynch-buffer
--                                (buffer-local-value 'url-redirect-buffer
-+                                (url-buffer-local-value 'url-redirect-buffer
-                                                     asynch-buffer))))
-             (if (and proc (memq (process-status proc)
-                                 '(closed exit signal failed))