[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
bug#69989: [PATCH] Fix invocation of Java Language Server
From: |
Philip Kaludercic |
Subject: |
bug#69989: [PATCH] Fix invocation of Java Language Server |
Date: |
Sun, 24 Mar 2024 20:45:04 +0000 |
Philip Kaludercic <philipk@posteo.net> 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:
>From 8c1613a500a617c72b49905968c04e855fee9ee5 Mon Sep 17 00:00:00 2001
From: Philip Kaludercic <philipk@posteo.net>
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ão Távora <joaotavora@gmail.com>
;; 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-completion "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-completion "0.1") (compat "27.1"))
;; 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)
;; 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 compat
- (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))))))
(defun eglot--read-server (prompt &optional dont-if-just-the-one)
--
2.44.0
--
Philip Kaludercic on icterid