From: Michal Krzywkowski Date: Wed, 28 Nov 2018 18:53:35 +0000 (+0100) Subject: Touch up last commit X-Git-Tag: emacs-29.0.90~1616^2~524^2~4^2~384 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ad2efe30748d60cfe1e89030a2c649b02ad1ae33;p=emacs.git Touch up last commit * eglot.el (eglot-current-column): Rename from eglot--current-column. (eglot-current-column-function): Use it as value and mention in docstring. (eglot--xref-make): Use eglot-current-column. --- diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index 94de8d1bc48..2519189ca4d 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -811,16 +811,16 @@ CONNECT-ARGS are passed as additional arguments to (let ((warning-minimum-level :error)) (display-warning 'eglot (apply #'format format args) :warning))) -(defun eglot--current-column () (- (point) (point-at-bol))) +(defun eglot-current-column () (- (point) (point-at-bol))) -(defvar eglot-current-column-function #'eglot--current-column +(defvar eglot-current-column-function #'eglot-current-column "Function to calculate the current column. This is the inverse operation of `eglot-move-to-column-function' (which see). It is a function of no arguments returning a column number. For buffers managed by fully LSP-compliant servers, this should be set to -`eglot-lsp-abiding-column', and `current-column' (the default) +`eglot-lsp-abiding-column', and `eglot-current-column' (the default) for all others.") (defun eglot-lsp-abiding-column () @@ -1506,7 +1506,7 @@ Try to visit the target file for a richer summary line." (substring (buffer-substring bol (point-at-eol)))) (add-face-text-property (- beg bol) (- end bol) 'highlight t substring) - (list substring (1+ (current-line)) (eglot--current-column)))))) + (list substring (1+ (current-line)) (eglot-current-column)))))) (`(,summary ,line ,column) (cond (visiting (with-current-buffer visiting (funcall collect)))