From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Philip Kaludercic Newsgroups: gmane.emacs.bugs Subject: bug#69989: [PATCH] Fix invocation of Java Language Server Date: Sun, 24 Mar 2024 20:45:04 +0000 Message-ID: <87ttkv8ilr.fsf@posteo.net> References: <87y1a78j3h.fsf@posteo.net> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="32554"; mail-complaints-to="usenet@ciao.gmane.io" Cc: =?UTF-8?Q?Jo=C3=A3o_?= =?UTF-8?Q?T=C3=A1vora?= To: 69989@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Mar 24 21:46:00 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1roUjA-0008F1-51 for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 24 Mar 2024 21:46:00 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1roUiZ-00036u-9F; Sun, 24 Mar 2024 16:45:23 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1roUiX-00036l-55 for bug-gnu-emacs@gnu.org; Sun, 24 Mar 2024 16:45:21 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1roUiW-00051L-Pd for bug-gnu-emacs@gnu.org; Sun, 24 Mar 2024 16:45:20 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1roUjC-0002fC-92 for bug-gnu-emacs@gnu.org; Sun, 24 Mar 2024 16:46:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Philip Kaludercic Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 24 Mar 2024 20:46:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 69989 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 69989-submit@debbugs.gnu.org id=B69989.171131315710227 (code B ref 69989); Sun, 24 Mar 2024 20:46:02 +0000 Original-Received: (at 69989) by debbugs.gnu.org; 24 Mar 2024 20:45:57 +0000 Original-Received: from localhost ([127.0.0.1]:47466 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1roUj6-0002et-Pv for submit@debbugs.gnu.org; Sun, 24 Mar 2024 16:45:57 -0400 Original-Received: from mout02.posteo.de ([185.67.36.66]:58631) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1roUj4-0002eZ-5k for 69989@debbugs.gnu.org; Sun, 24 Mar 2024 16:45:55 -0400 Original-Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id C51F7240105 for <69989@debbugs.gnu.org>; Sun, 24 Mar 2024 21:45:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1711313105; bh=JHqz5sZoNVACjrDV9FWMmGm+RCf7/MB451C0PM0GagA=; h=From:To:Cc:Subject:Date:Message-ID:MIME-Version:Content-Type: From; b=TRt084CygXyTE5GCBjKtkZNunQzVwz3s3oxpQo6aDutdQpGTPntrv3bwlTOp75Qxe Gv85nl9wXJ5rTdEU/FZmzvQjiYScHRCyBDMoutwqLRpxK3Si7U2ki7S2JA+uepIZgU pGfgK1//tZb4Ki0xLsF968eHsPrGWOZ3YpoABkWj4CoYEpPmHFAjihGaDMeN0AH6YQ bZiX1QpyTrt8//qRgYAy6G+RnbCXWEulNSQJzAw2hLkJCftx1sXfU0tA6oTtG2ube6 X3A00l8uIuqPUFZ48FRwlC+FaBwjJR1WrM/mp2Bfk3ywCFB0yy1w6c0OWNsFBvsO+d 4LfJoKflLeVFQ== Original-Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4V2p3P1TbNz6twB; Sun, 24 Mar 2024 21:45:05 +0100 (CET) In-Reply-To: <87y1a78j3h.fsf@posteo.net> (Philip Kaludercic's message of "Sun, 24 Mar 2024 20:34:26 +0000") X-Hashcash: 1:20:240324:69989@debbugs.gnu.org::heqDi5rGHu6QPu4g:No9 X-Hashcash: 1:20:240324:joaotavora@gmail.com::K9MZJQeClxYFBIVB:16L2 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:282035 Archived-At: --=-=-= Content-Type: text/plain Philip Kaludercic writes: > Oh and this patch uses functions that are not available in Emacs 26.3, > so it would make sense to apply my patch that adds Compat support to > Eglot first. Apparently my patch did not arrive on the mailing list, so I am attaching it again here: --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0001-Add-Compat-as-an-Eglot-dependency.patch Content-Transfer-Encoding: quoted-printable >From 8c1613a500a617c72b49905968c04e855fee9ee5 Mon Sep 17 00:00:00 2001 From: Philip Kaludercic Date: Sat, 9 Mar 2024 08:11:03 +0100 Subject: [PATCH] Add Compat as an Eglot dependency * lisp/progmodes/eglot.el (eglot--format-markup): Remove fboundp check for 'text-property-search-forward'. Additionally this should make 'package-get-version' available for releases of Emacs previous to 27.1. (bug#62198) --- lisp/progmodes/eglot.el | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index 50820e81107..62606d8dbb2 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -7,7 +7,7 @@ ;; Maintainer: Jo=C3=A3o T=C3=A1vora ;; URL: https://github.com/joaotavora/eglot ;; Keywords: convenience, languages -;; Package-Requires: ((emacs "26.3") (jsonrpc "1.0.24") (flymake "1.2.1") = (project "0.9.8") (xref "1.6.2") (eldoc "1.14.0") (seq "2.23") (external-co= mpletion "0.1")) +;; Package-Requires: ((emacs "26.1") (jsonrpc "1.0.24") (flymake "1.2.1") = (project "0.9.8") (xref "1.6.2") (eldoc "1.14.0") (seq "2.23") (external-co= mpletion "0.1") (compat "27.1")) =20 ;; This is a GNU ELPA :core package. Avoid adding functionality ;; that is not available in the version of Emacs recorded above or any @@ -110,6 +110,7 @@ (require 'text-property-search nil t) (require 'diff-mode) (require 'diff) +(require 'compat) =20 ;; These dependencies are also GNU ELPA core packages. Because of ;; bug#62576, since there is a risk that M-x package-install, despite @@ -1831,10 +1832,9 @@ eglot--format-markup (font-lock-ensure) (goto-char (point-min)) (let ((inhibit-read-only t)) - (when (fboundp 'text-property-search-forward) ;; FIXME: use comp= at - (while (setq match (text-property-search-forward 'invisible)) - (delete-region (prop-match-beginning match) - (prop-match-end match))))) + (while (setq match (text-property-search-forward 'invisible)) + (delete-region (prop-match-beginning match) + (prop-match-end match)))) (string-trim (buffer-string)))))) =20 (defun eglot--read-server (prompt &optional dont-if-just-the-one) --=20 2.44.0 --=-=-= Content-Type: text/plain -- Philip Kaludercic on icterid --=-=-=--