diff options
| author | João Távora | 2023-04-07 22:47:15 +0100 |
|---|---|---|
| committer | João Távora | 2023-04-07 22:47:15 +0100 |
| commit | cc288a0e331d09e3e0aebcb83769a513ecad236f (patch) | |
| tree | bee485183e152abbf0ead67aab5fe2f113ae4105 | |
| parent | 621e732ade0f3dc165498ebde4d55d5aacb05b56 (diff) | |
| download | emacs-cc288a0e331d09e3e0aebcb83769a513ecad236f.tar.gz emacs-cc288a0e331d09e3e0aebcb83769a513ecad236f.zip | |
Eglot: version strings must start with numbers (bug#62718)
Even though Eglot is a :core ELPA package and as such is on a
different release cycle than Emacs proper, the version strings used in
'defcustom' and 'make-obsolete' must still follow the numeric format.
* lisp/progmodes/eglot.el (eglot-report-progress): Adjust :version.
(eglot-lsp-abiding-column)
(eglot-current-column)
(eglot-current-column-function)
(eglot-move-to-current-column)
(eglot-move-to-lsp-abiding-column)
(eglot-move-to-column-function)
(eglot-ignored-server-capabilites)
(eglot-manual)
(eglot--managed-mode-hook): Update "obsolete" spec.
| -rw-r--r-- | lisp/progmodes/eglot.el | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index 1328c03a979..99b3925f05f 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el | |||
| @@ -403,7 +403,7 @@ done by `eglot-reconnect'." | |||
| 403 | If set to `messages', use *Messages* buffer, else use Eglot's | 403 | If set to `messages', use *Messages* buffer, else use Eglot's |
| 404 | mode line indicator." | 404 | mode line indicator." |
| 405 | :type 'boolean | 405 | :type 'boolean |
| 406 | :version "Eglot 1.10") | 406 | :version "1.10") |
| 407 | 407 | ||
| 408 | (defvar eglot-withhold-process-id nil | 408 | (defvar eglot-withhold-process-id nil |
| 409 | "If non-nil, Eglot will not send the Emacs process id to the language server. | 409 | "If non-nil, Eglot will not send the Emacs process id to the language server. |
| @@ -1480,11 +1480,11 @@ Unless IMMEDIATE, send pending changes before making request." | |||
| 1480 | ;;; Encoding fever | 1480 | ;;; Encoding fever |
| 1481 | ;;; | 1481 | ;;; |
| 1482 | (define-obsolete-function-alias | 1482 | (define-obsolete-function-alias |
| 1483 | 'eglot-lsp-abiding-column 'eglot-utf-16-linepos "Eglot 1.12") | 1483 | 'eglot-lsp-abiding-column 'eglot-utf-16-linepos "1.12") |
| 1484 | (define-obsolete-function-alias | 1484 | (define-obsolete-function-alias |
| 1485 | 'eglot-current-column 'eglot-utf-32-linepos "Eglot 1.12") | 1485 | 'eglot-current-column 'eglot-utf-32-linepos "1.12") |
| 1486 | (define-obsolete-variable-alias | 1486 | (define-obsolete-variable-alias |
| 1487 | 'eglot-current-column-function 'eglot-current-linepos-function "Eglot 1.12") | 1487 | 'eglot-current-column-function 'eglot-current-linepos-function "1.12") |
| 1488 | 1488 | ||
| 1489 | (defvar eglot-current-linepos-function #'eglot-utf-16-linepos | 1489 | (defvar eglot-current-linepos-function #'eglot-utf-16-linepos |
| 1490 | "Function calculating position relative to line beginning. | 1490 | "Function calculating position relative to line beginning. |
| @@ -1525,11 +1525,11 @@ LBP defaults to `eglot--bol'." | |||
| 1525 | (funcall eglot-current-linepos-function))))) | 1525 | (funcall eglot-current-linepos-function))))) |
| 1526 | 1526 | ||
| 1527 | (define-obsolete-function-alias | 1527 | (define-obsolete-function-alias |
| 1528 | 'eglot-move-to-current-column 'eglot-move-to-utf-32-linepos "Eglot 1.12") | 1528 | 'eglot-move-to-current-column 'eglot-move-to-utf-32-linepos "1.12") |
| 1529 | (define-obsolete-function-alias | 1529 | (define-obsolete-function-alias |
| 1530 | 'eglot-move-to-lsp-abiding-column 'eglot-move-to-utf-16-linepos "Eglot 1.12") | 1530 | 'eglot-move-to-lsp-abiding-column 'eglot-move-to-utf-16-linepos "1.12") |
| 1531 | (define-obsolete-variable-alias | 1531 | (define-obsolete-variable-alias |
| 1532 | 'eglot-move-to-column-function 'eglot-move-to-linepos-function "Eglot 1.12") | 1532 | 'eglot-move-to-column-function 'eglot-move-to-linepos-function "1.12") |
| 1533 | 1533 | ||
| 1534 | (defvar eglot-move-to-linepos-function #'eglot-move-to-utf-16-linepos | 1534 | (defvar eglot-move-to-linepos-function #'eglot-move-to-utf-16-linepos |
| 1535 | "Function to move to a position within a line reported by the LSP server. | 1535 | "Function to move to a position within a line reported by the LSP server. |
| @@ -1681,7 +1681,7 @@ Doubles as an indicator of snippet support." | |||
| 1681 | (string-trim (buffer-string)))))) | 1681 | (string-trim (buffer-string)))))) |
| 1682 | 1682 | ||
| 1683 | (define-obsolete-variable-alias 'eglot-ignored-server-capabilites | 1683 | (define-obsolete-variable-alias 'eglot-ignored-server-capabilites |
| 1684 | 'eglot-ignored-server-capabilities "Eglot 1.8") | 1684 | 'eglot-ignored-server-capabilities "1.8") |
| 1685 | 1685 | ||
| 1686 | (defcustom eglot-ignored-server-capabilities (list) | 1686 | (defcustom eglot-ignored-server-capabilities (list) |
| 1687 | "LSP server capabilities that Eglot could use, but won't. | 1687 | "LSP server capabilities that Eglot could use, but won't. |
| @@ -1989,7 +1989,7 @@ If it is activated, also signal textDocument/didOpen." | |||
| 1989 | (force-mode-line-update t))))))) | 1989 | (force-mode-line-update t))))))) |
| 1990 | 1990 | ||
| 1991 | (defun eglot-manual () "Read Eglot's manual." | 1991 | (defun eglot-manual () "Read Eglot's manual." |
| 1992 | (declare (obsolete info "Eglot 1.10")) | 1992 | (declare (obsolete info "1.10")) |
| 1993 | (interactive) (info "(eglot)")) | 1993 | (interactive) (info "(eglot)")) |
| 1994 | 1994 | ||
| 1995 | (easy-menu-define eglot-menu nil "Eglot" | 1995 | (easy-menu-define eglot-menu nil "Eglot" |
| @@ -3758,7 +3758,7 @@ If NOERROR, return predicate, else erroring function." | |||
| 3758 | ;;; | 3758 | ;;; |
| 3759 | 3759 | ||
| 3760 | (make-obsolete-variable 'eglot--managed-mode-hook | 3760 | (make-obsolete-variable 'eglot--managed-mode-hook |
| 3761 | 'eglot-managed-mode-hook "Eglot 1.6") | 3761 | 'eglot-managed-mode-hook "1.6") |
| 3762 | (provide 'eglot) | 3762 | (provide 'eglot) |
| 3763 | 3763 | ||
| 3764 | 3764 | ||