From b2a923db3e453eb671bf71125f228a46b1c86ebc Mon Sep 17 00:00:00 2001
From: Ulrich Müller <ulm@gentoo.org>
Date: Wed, 23 Oct 2024 11:21:45 +0200
Subject: app-emacs/rnc-mode: Suppress warning about missing jing
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Ulrich Müller <ulm@gentoo.org>
---
 .../rnc-mode/files/rnc-mode-1.0.6-flymake.patch    | 16 +++++++++++++++-
 app-emacs/rnc-mode/rnc-mode-1.0.6-r1.ebuild        | 22 ----------------------
 app-emacs/rnc-mode/rnc-mode-1.0.6-r2.ebuild        | 22 ++++++++++++++++++++++
 3 files changed, 37 insertions(+), 23 deletions(-)
 delete mode 100644 app-emacs/rnc-mode/rnc-mode-1.0.6-r1.ebuild
 create mode 100644 app-emacs/rnc-mode/rnc-mode-1.0.6-r2.ebuild

(limited to 'app-emacs')

diff --git a/app-emacs/rnc-mode/files/rnc-mode-1.0.6-flymake.patch b/app-emacs/rnc-mode/files/rnc-mode-1.0.6-flymake.patch
index 6904a063c682..641fc7fb56fb 100644
--- a/app-emacs/rnc-mode/files/rnc-mode-1.0.6-flymake.patch
+++ b/app-emacs/rnc-mode/files/rnc-mode-1.0.6-flymake.patch
@@ -1,4 +1,5 @@
-Update function and variable names that are obsolete since Emacs 26
+Update function and variable names that are obsolete since Emacs 26.
+Don't try to configure flymake without a jing jar file.
 
 --- rnc-mode-1.0.6/rnc-mode.el
 +++ rnc-mode-1.0.6/rnc-mode.el
@@ -28,3 +29,16 @@ Update function and variable names that are obsolete since Emacs 26
      (message "RNC flymake not enabled because the Jing jar could not be found")))
  
  ;;; Imenu support
+@@ -329,8 +329,9 @@
+     (modify-syntax-entry ?_ "w   " rnc-syntax-table)
+     (set-syntax-table rnc-syntax-table))
+ 
+-  (rnc-configure-flymake)
+-  (when rnc-enable-flymake
+-    (flymake-mode))
++  (when rnc-jing-jar-file
++    (rnc-configure-flymake)
++    (when rnc-enable-flymake
++      (flymake-mode)))
+   (when rnc-enable-imenu
+     (rnc-configure-imenu))
diff --git a/app-emacs/rnc-mode/rnc-mode-1.0.6-r1.ebuild b/app-emacs/rnc-mode/rnc-mode-1.0.6-r1.ebuild
deleted file mode 100644
index 820aaf70cc00..000000000000
--- a/app-emacs/rnc-mode/rnc-mode-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp
-
-DESCRIPTION="An Emacs mode for editing Relax NG compact schema files"
-HOMEPAGE="https://github.com/TreeRex/rnc-mode
-	https://www.emacswiki.org/emacs/RELAX_NG"
-SRC_URI="https://github.com/TreeRex/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
-
-PATCHES=(
-	"${FILESDIR}/${P}-flymake.patch"
-	"${FILESDIR}/${P}-font-lock.patch"
-)
-SITEFILE="50${PN}-gentoo.el"
-DOCS="README.md"
diff --git a/app-emacs/rnc-mode/rnc-mode-1.0.6-r2.ebuild b/app-emacs/rnc-mode/rnc-mode-1.0.6-r2.ebuild
new file mode 100644
index 000000000000..820aaf70cc00
--- /dev/null
+++ b/app-emacs/rnc-mode/rnc-mode-1.0.6-r2.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="An Emacs mode for editing Relax NG compact schema files"
+HOMEPAGE="https://github.com/TreeRex/rnc-mode
+	https://www.emacswiki.org/emacs/RELAX_NG"
+SRC_URI="https://github.com/TreeRex/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+PATCHES=(
+	"${FILESDIR}/${P}-flymake.patch"
+	"${FILESDIR}/${P}-font-lock.patch"
+)
+SITEFILE="50${PN}-gentoo.el"
+DOCS="README.md"
-- 
cgit v1.2.3-65-gdbad