bug#66291: [Leo Vivier] [PATCH] orgalist: Update bug:31361 workaround for new upstream signature

[Stefan Kangas <stefankangas@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 490 bytes --]

The below patches were sent to emacs-devel, but got no followups.  I'm
forwarding it here so that we don't lose track of it.

Please in the future always direct patches to bug-gnu-emacs@gnu.org.

-------------------- Start of forwarded message --------------------
From: Leo Vivier <zaeph@zaeph.net>
To: emacs-devel@gnu.org
Cc: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Subject: [PATCH] orgalist: Update bug:31361 workaround for new upstream
 signature
Date: Thu, 09 Mar 2023 11:55:22 +0100

[-- Attachment #2: Type: text/plain, Size: 479 bytes --]

Hi,

This is a quick bug-fix patch for Nicolas’s orgalist (Cc’d):
- TINYCHANGE (but I’m CLA’d.).
- Tested on master and on 28.2; everything works.
- Bumped the copyright.

I’m not sure which way you intend ELPA patches to be submitted.  I’ve
based my commit on the externals/orgalist branch from emacs/elpa.git;
let me know if you’d want me to proceed differently.

Best,
-- 
Leo Vivier
Freelance Software Developer
Website: www.leovivier.com | Blog: www.zaeph.net

[-- Attachment #3: 0001-Update-bug-31361-workaround-for-new-upstream-signatu.patch --]
[-- Type: text/x-patch, Size: 1534 bytes --]

From 00803627bf22f00aa1666977d9d157d9bd1e6183 Mon Sep 17 00:00:00 2001
From: Leo Vivier <zaeph@zaeph.net>
Date: Thu, 9 Mar 2023 11:26:59 +0100
Subject: [PATCH 1/2] Update bug:31361 workaround for new upstream signature

Upstream, `indent-according-to-mode' has a new signature.
- Introduced: Thu Nov 18 08:11:26 2021 +0100
  f596f0db82c0b1ff3fe8e8f1d8b07d2fe7504ab6
- Still present in master: Thu Mar 9 12:04:52 2023 +0200
  8589de94d8a44cd566eb3fe128f8091d7e958ee9

The old signature raised wrong-number-of-arguments errors on `indent-region'.
---
 orgalist.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/orgalist.el b/orgalist.el
index 7bf27e2..6f1d2ec 100644
--- a/orgalist.el
+++ b/orgalist.el
@@ -880,12 +880,12 @@ C-c C-c         `orgalist-check-item'"
     ;; FIXME: Workaround bug#31361.
     (unless (advice-member-p 'orgalist-fix-bug:31361 'indent-according-to-mode)
       (advice-add 'indent-according-to-mode
-                  :around (lambda (old)
+                  :around (lambda (old &rest r)
                             "Workaround bug#31361."
                             (or (orgalist--indent-line)
                                 (let ((indent-line-function
                                        (advice--cd*r indent-line-function)))
-                                  (funcall old))))
+                                  (funcall old r))))
                   '((name . orgalist-fix-bug:31361)))))
    (t
     (remove-function (local 'fill-forward-paragraph-function)
-- 
2.39.2


[-- Attachment #4: 0002-Bump-copyright.patch --]
[-- Type: text/x-patch, Size: 710 bytes --]

From 03a82f3c925455f26dfdae87f8517f7294d6c806 Mon Sep 17 00:00:00 2001
From: Leo Vivier <zaeph@zaeph.net>
Date: Thu, 9 Mar 2023 11:40:12 +0100
Subject: [PATCH 2/2] Bump copyright

---
 orgalist.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/orgalist.el b/orgalist.el
index 6f1d2ec..045de9d 100644
--- a/orgalist.el
+++ b/orgalist.el
@@ -1,6 +1,6 @@
 ;;; orgalist.el --- Manage Org-like lists in non-Org buffers  -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2017-2020  Free Software Foundation, Inc.
+;; Copyright (C) 2017-2023  Free Software Foundation, Inc.
 
 ;; Author: Nicolas Goaziou <mail@nicolasgoaziou.fr>
 ;; Maintainer: Nicolas Goaziou <mail@nicolasgoaziou.fr>
-- 
2.39.2


[-- Attachment #5: Type: text/plain, Size: 67 bytes --]

-------------------- End of forwarded message --------------------