Received: by mail.netbsd.org (Postfix, from userid 605) id 24C8E84D5B; Sun, 19 Sep 2021 14:53:17 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5F64B84D41 for ; Sun, 19 Sep 2021 14:53:16 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id QIIORi0s6bJR for ; Sun, 19 Sep 2021 14:53:15 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 8A50484CED for ; Sun, 19 Sep 2021 14:53:15 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 83942FA97; Sun, 19 Sep 2021 14:53:15 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1632063195153180" MIME-Version: 1.0 Date: Sun, 19 Sep 2021 14:53:15 +0000 From: "Hauke Fath" Subject: CVS commit: pkgsrc/editors/xemacs-packages To: pkgsrc-changes@NetBSD.org Reply-To: hauke@netbsd.org X-Mailer: log_accum Message-Id: <20210919145315.83942FA97@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1632063195153180 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: hauke Date: Sun Sep 19 14:53:15 UTC 2021 Modified Files: pkgsrc/editors/xemacs-packages: Makefile distinfo pkgsrc/editors/xemacs-packages/patches: patch-lisp_w3_url.el Log Message: Providing functions missing from xemacs 21.4 (stable) with a conditional defun will be less intrusive, and shorten the patch. To generate a diff of this commit: cvs rdiff -u -r1.79 -r1.80 pkgsrc/editors/xemacs-packages/Makefile cvs rdiff -u -r1.27 -r1.28 pkgsrc/editors/xemacs-packages/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/editors/xemacs-packages/patches/patch-lisp_w3_url.el Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1632063195153180 Content-Disposition: inline Content-Length: 4210 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/editors/xemacs-packages/Makefile diff -u pkgsrc/editors/xemacs-packages/Makefile:1.79 pkgsrc/editors/xemacs-packages/Makefile:1.80 --- pkgsrc/editors/xemacs-packages/Makefile:1.79 Wed Sep 15 21:06:42 2021 +++ pkgsrc/editors/xemacs-packages/Makefile Sun Sep 19 14:53:15 2021 @@ -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}/} Index: pkgsrc/editors/xemacs-packages/distinfo diff -u pkgsrc/editors/xemacs-packages/distinfo:1.27 pkgsrc/editors/xemacs-packages/distinfo:1.28 --- pkgsrc/editors/xemacs-packages/distinfo:1.27 Wed Sep 15 21:06:42 2021 +++ pkgsrc/editors/xemacs-packages/distinfo Sun Sep 19 14:53:15 2021 @@ -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.ta 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 Index: pkgsrc/editors/xemacs-packages/patches/patch-lisp_w3_url.el diff -u pkgsrc/editors/xemacs-packages/patches/patch-lisp_w3_url.el:1.1 pkgsrc/editors/xemacs-packages/patches/patch-lisp_w3_url.el:1.2 --- pkgsrc/editors/xemacs-packages/patches/patch-lisp_w3_url.el:1.1 Wed Jul 31 14:04:40 2019 +++ pkgsrc/editors/xemacs-packages/patches/patch-lisp_w3_url.el Sun Sep 19 14:53:15 2021 @@ -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)) --_----------=_1632063195153180--