Merge branch 'master' into builtin-elvdoc

.codespellrc

@@ -1,3 +1,3 @@
 [codespell]
-ignore-words-list = upto,nd,ba,doas,fo,struc,shouldbe,iterm,lates,testof
-skip = ./vscode/node_modules,./vscode/dist
+ignore-words-list = ro,upto,nd,doas,fo,shouldbe,iterm,lates,testof
+skip = ./.git,./vscode/node_modules,./vscode/dist,./website/_dst,./website/*.html

.github/workflows/ci.yml

@@ -143,7 +143,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
     - name: Install codespell
-      run: pip install codespell==2.1.0
+      run: pip install codespell==2.2.1
     - name: Run codespell
       run: codespell
 

CONTRIBUTING.md

@@ -184,7 +184,7 @@ Install [codespell](https://github.com/codespell-project/codespell) to check
 spelling:
 
 ```sh
-pip install --user codespell==2.1.0
+pip install --user codespell==2.2.1
 ```
 
 Use `make codespell` to run it.

pkg/cli/term/reader_unix.go

@@ -278,7 +278,7 @@ var g3Seq = map[rune]ui.Key{
 // expressible using the escape sequences described below.
 
 // CSI-style key sequences identified by the last rune. For instance, \e[A is
-// Up. When modified, two numerical arguments are added, the first always beging
+// Up. When modified, two numerical arguments are added, the first always being
 // 1 and the second identifying the modifier. For instance, \e[1;5A is Ctrl-Up.
 var csiSeqByLast = map[rune]ui.Key{
 	// xterm, urxvt, tmux

vscode/package.json

@@ -2,7 +2,7 @@
     "name": "elvish",
     "displayName": "Elvish",
     "description": "Elvish language support for Visual Studio Code",
-    "version": "0.1.3",
+    "version": "0.1.4",
     "publisher": "elves",
     "license": "BSD-2-Clause",
     "icon": "icon.png",

vscode/syntaxes/elvish.tmLanguage.json

@@ -56,7 +56,7 @@
 			}
 		},
 		{
-			"match": "}\\s+(catch|except)\\s+([\\w\\d_:~-]+)",
+			"match": "(?<=})\\s+(catch|except)\\s+([\\w\\d_:~-]+)",
 			"captures": {
 				"1": {
 					"name": "keyword.control.elvish"
@@ -101,7 +101,7 @@
 			}
 		},
 		{
-			"match": "}\\s+(elif|else|catch|except|finally)(?=[\\s)}<>;|&])",
+			"match": "(?<=})\\s+(elif|else|catch|except|finally)(?=[\\s)}<>;|&])",
 			"captures": {
 				"1": {
 					"name": "keyword.control.elvish"

website/blog/0.11-release-notes.md

@@ -130,7 +130,7 @@ As usual, prebuilt binaries can be found in [get](../get/).
 -   Elvish now handles SIGHUP by relaying it to the entire process group
     ([#494](https://github.com/elves/elvish/issues/494)).
 
--   The daemon now detects the path of the Elvish executable more reliabily,
+-   The daemon now detects the path of the Elvish executable more reliably,
     notably when Elvish is used as login shell
     ([#496](https://github.com/elves/elvish/issues/496)).