diff options
Diffstat (limited to 'lisp/progmodes')
| -rw-r--r-- | lisp/progmodes/eglot.el | 10 | ||||
| -rw-r--r-- | lisp/progmodes/hideshow.el | 4 | ||||
| -rw-r--r-- | lisp/progmodes/prog-mode.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/verilog-mode.el | 2 |
4 files changed, 9 insertions, 9 deletions
diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index c2d7fc309d4..9555d21b00a 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -1238,7 +1238,7 @@ This docstring appeases checkdoc, that's all." :request-dispatcher (funcall spread #'eglot-handle-request) :on-shutdown #'eglot--on-shutdown initargs)) - (cancelled nil) + (canceled nil) (tag (make-symbol "connected-catch-tag"))) (when server-info (jsonrpc--debug server "Running language server: %s" @@ -1277,7 +1277,7 @@ This docstring appeases checkdoc, that's all." :workspaceFolders (eglot-workspace-folders server)) :success-fn (eglot--lambda ((InitializeResult) capabilities serverInfo) - (unless cancelled + (unless canceled (push server (gethash project eglot--servers-by-project)) (setf (eglot--capabilities server) capabilities) @@ -1315,13 +1315,13 @@ in project `%s'." (when tag (throw tag t)))) :timeout eglot-connect-timeout :error-fn (eglot--lambda ((ResponseError) code message) - (unless cancelled + (unless canceled (jsonrpc-shutdown server) (let ((msg (format "%s: %s" code message))) (if tag (throw tag `(error . ,msg)) (eglot--error msg))))) :timeout-fn (lambda () - (unless cancelled + (unless canceled (jsonrpc-shutdown server) (let ((msg (format "Timed out after %s seconds" eglot-connect-timeout))) @@ -1338,7 +1338,7 @@ in project `%s'." (jsonrpc-name server)) nil) (_ server))) - (quit (jsonrpc-shutdown server) (setq cancelled 'quit))) + (quit (jsonrpc-shutdown server) (setq canceled 'quit))) (setq tag nil)))) (defun eglot--inferior-bootstrap (name contact &optional connect-args) diff --git a/lisp/progmodes/hideshow.el b/lisp/progmodes/hideshow.el index 00507a3c1af..655dd6a5d94 100644 --- a/lisp/progmodes/hideshow.el +++ b/lisp/progmodes/hideshow.el @@ -276,7 +276,7 @@ START, END and COMMENT-START are regular expressions. A block is defined as text surrounded by START and END. As a special case, START may be a list of the form (COMPLEX-START -MDATA-SELECTOR), where COMPLEX-START is a regexp w/ multiple parts and +MDATA-SELECTOR), where COMPLEX-START is a regexp with multiple parts and MDATA-SELECTOR an integer that specifies which sub-match is the proper place to adjust point, before calling `hs-forward-sexp-func'. Point is adjusted to the beginning of the specified match. For example, @@ -576,7 +576,7 @@ property of an overlay." (save-match-data (not (nth 8 (syntax-ppss)))))) (defun hs-forward-sexp (match-data arg) - "Adjust point based on MATCH-DATA and call `hs-forward-sexp-func' w/ ARG. + "Adjust point based on MATCH-DATA and call `hs-forward-sexp-func' with ARG. Original match data is restored upon return." (save-match-data (set-match-data match-data) diff --git a/lisp/progmodes/prog-mode.el b/lisp/progmodes/prog-mode.el index f87230bd2f5..58cb48f1829 100644 --- a/lisp/progmodes/prog-mode.el +++ b/lisp/progmodes/prog-mode.el @@ -155,7 +155,7 @@ which case it will be used to compose the new symbol as per the third argument of `compose-region'.") (defun prettify-symbols-default-compose-p (start end _match) - "Return non-nil iff the symbol MATCH should be composed. + "Return non-nil if the symbol MATCH should be composed. The symbol starts at position START and ends at position END. This is the default for `prettify-symbols-compose-predicate' which is suitable for most programming languages such as C or Lisp." diff --git a/lisp/progmodes/verilog-mode.el b/lisp/progmodes/verilog-mode.el index 310a9be4f6e..e5458e6a07f 100644 --- a/lisp/progmodes/verilog-mode.el +++ b/lisp/progmodes/verilog-mode.el @@ -7719,7 +7719,7 @@ nil otherwise." (setq match t) (setq elm nil)) (setq elm (cdr elm))))) - ;; If this is a test just for exact match, return nil ot t + ;; If this is a test just for exact match, return nil or t (if (and (equal flag 'lambda) (not (equal match 't))) nil match)))) |