diff options
| author | Stefan Kangas <stefankangas@gmail.com> | 2022-11-11 15:46:23 +0100 |
|---|---|---|
| committer | Stefan Kangas <stefankangas@gmail.com> | 2022-11-11 15:52:37 +0100 |
| commit | 6f48b46b03cd58a541684c57e42eb4679794f0fd (patch) | |
| tree | f6ce4253af17cbe08c4521bfc60d52868c41d328 /lisp/progmodes | |
| parent | 014176f283aae2e0abc5138150f89afb6deb3d33 (diff) | |
| download | emacs-6f48b46b03cd58a541684c57e42eb4679794f0fd.tar.gz emacs-6f48b46b03cd58a541684c57e42eb4679794f0fd.tar.bz2 emacs-6f48b46b03cd58a541684c57e42eb4679794f0fd.zip | |
; Fix typos
Diffstat (limited to 'lisp/progmodes')
| -rw-r--r-- | lisp/progmodes/cc-bytecomp.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/cc-engine.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/cc-mode.el | 2 | ||||
| -rw-r--r-- | lisp/progmodes/eglot.el | 12 |
4 files changed, 9 insertions, 9 deletions
diff --git a/lisp/progmodes/cc-bytecomp.el b/lisp/progmodes/cc-bytecomp.el index 4b8154dafe4..735d829769b 100644 --- a/lisp/progmodes/cc-bytecomp.el +++ b/lisp/progmodes/cc-bytecomp.el @@ -287,7 +287,7 @@ perhaps a `cc-bytecomp-restore-environment' is forgotten somewhere")) (cons cc-file cc-bytecomp-loaded-files)) (cc-bytecomp-debug-msg "cc-bytecomp-load: Loading %S" cc-file) - ;; native-comp may async compile also intalled el.gz + ;; native-comp may async compile also installed el.gz ;; files therefore we may have to load here other el.gz. (load cc-part nil t) (cc-bytecomp-debug-msg diff --git a/lisp/progmodes/cc-engine.el b/lisp/progmodes/cc-engine.el index 0ea722a9225..5d3d2408869 100644 --- a/lisp/progmodes/cc-engine.el +++ b/lisp/progmodes/cc-engine.el @@ -7356,7 +7356,7 @@ multi-line strings (but not C++, for example)." (defun c-ml-string-opener-intersects-region (&optional start finish) ;; If any part of the region [START FINISH] is inside an ml-string opener, ;; return a dotted list of the start, end and double-quote position of that - ;; opener. That list wlll not include any "context characters" before or + ;; opener. That list will not include any "context characters" before or ;; after the opener. If an opener is found, the match-data will indicate ;; it, with (match-string 1) being the entire delimiter, and (match-string ;; 2) the "main" double-quote. Otherwise, the match-data is undefined. diff --git a/lisp/progmodes/cc-mode.el b/lisp/progmodes/cc-mode.el index 34ba97bb87f..fb5ef694138 100644 --- a/lisp/progmodes/cc-mode.el +++ b/lisp/progmodes/cc-mode.el @@ -2505,7 +2505,7 @@ with // and /*, not more generic line and block comments." (not (eobp))) (progn (c-forward-over-token) - ;; Cope with having POS withing a syntactically invalid + ;; Cope with having POS within a syntactically invalid ;; (...), by moving backward out of the parens and trying ;; again. (when (and (eq (char-before) ?\)) diff --git a/lisp/progmodes/eglot.el b/lisp/progmodes/eglot.el index a091d892b68..167fd129a5c 100644 --- a/lisp/progmodes/eglot.el +++ b/lisp/progmodes/eglot.el @@ -56,7 +56,7 @@ ;; available as GNU ELPA :core packages. Historically, a number of ;; :core packages were added or reworked in Emacs to make this ;; possible. This principle should be upheld when adding new LSP -;; features or tweaking exising ones. Design any new facilities in +;; features or tweaking existing ones. Design any new facilities in ;; a way that they could work in the absence of LSP or using some ;; different protocol, then make sure Eglot can link up LSP ;; information to it. @@ -586,7 +586,7 @@ on unknown notifications and errors on unknown requests.")) (cl-defmacro eglot--dbind (vars object &body body) "Destructure OBJECT, binding VARS in BODY. VARS is ([(INTERFACE)] SYMS...) -Honour `eglot-strict-mode'." +Honor `eglot-strict-mode'." (declare (indent 2) (debug (sexp sexp &rest form))) (let ((interface-name (if (consp (car vars)) (car (pop vars)))) @@ -613,7 +613,7 @@ Honour `eglot-strict-mode'." (cl-defmacro eglot--lambda (cl-lambda-list &body body) "Function of args CL-LAMBDA-LIST for processing INTERFACE objects. -Honour `eglot-strict-mode'." +Honor `eglot-strict-mode'." (declare (indent 1) (debug (sexp &rest form))) (let ((e (cl-gensym "jsonrpc-lambda-elem"))) `(lambda (,e) (eglot--dbind ,cl-lambda-list ,e ,@body)))) @@ -1249,7 +1249,7 @@ This docstring appeases checkdoc, that's all." (setf (eglot--language-id server) language-id) (setf (eglot--inferior-process server) autostart-inferior-process) (run-hook-with-args 'eglot-server-initialized-hook server) - ;; Now start the handshake. To honour `eglot-sync-connect' + ;; Now start the handshake. To honor `eglot-sync-connect' ;; maybe-sync-maybe-async semantics we use `jsonrpc-async-request' ;; and mimic most of `jsonrpc-request'. (unwind-protect @@ -1676,7 +1676,7 @@ against a variable's name. Examples include the string Before Eglot starts \"managing\" a particular buffer, it opinionatedly sets some peripheral Emacs facilities, such as Flymake, Xref and Company. These overriding settings help ensure -consistent Eglot behaviour and only stay in place until +consistent Eglot behavior and only stay in place until \"managing\" stops (usually via `eglot-shutdown'), whereupon the previous settings are restored. @@ -3140,7 +3140,7 @@ Returns a list as described in docstring of `imenu--index-alist'." (unless (y-or-n-p (format "[eglot] Server wants to edit:\n %s\n Proceed? " (mapconcat #'identity (mapcar #'car prepared) "\n "))) - (jsonrpc-error "User cancelled server edit"))) + (jsonrpc-error "User canceled server edit"))) (cl-loop for edit in prepared for (path edits version) = edit do (with-current-buffer (find-file-noselect path) |