Merge branch 'release/v12.36.0'v12.36.0

* release/v12.36.0:
  Update spellfile_local.vim to v2.0.0
  Add Vim mapping to switch to French spelling
  Adjust order of profile subfiles creation

4 files changed, 15 insertions, 10 deletions

diff --git a/Makefile b/Makefile
index 38f674e6..f557e50c 100644
--- a/Makefile
+++ b/Makefile
@@ -572,11 +572,12 @@ install-scrot:
 	mkdir -p -- $(XDG_DATA_HOME)/scrot/screenshots
 
 install-sh: check-sh
-	mkdir -p -- $(HOME)/.profile.d $(HOME)/.shrc.d
 	cp -p -- sh/profile $(HOME)/.profile
+	mkdir -p -- $(HOME)/.profile.d
 	cp -p -- sh/profile.d/*.sh $(HOME)/.profile.d
 	cp -p -- sh/shinit $(HOME)/.shinit
 	cp -p -- sh/shrc $(HOME)/.shrc
+	mkdir -p -- $(HOME)/.shrc.d
 	cp -p -- sh/shrc.d/*.sh $(HOME)/.shrc.d
 
 install-subversion:
diff --git a/VERSION b/VERSION
index 7bc540f8..04793b1a 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v12.35.0
-Sat, 01 Apr 2023 07:00:19 +0000
+tejr dotfiles v12.36.0
+Thu, 06 Apr 2023 04:11:32 +0000
diff --git a/vim/bundle/spellfile_local b/vim/bundle/spellfile_local
-Subproject 0958f0f8d9754b2e7571b6a50f4db434b719564
+Subproject 6199ee785c6fb964292ec6e82c5b8a0f79e2606
diff --git a/vim/vimrc b/vim/vimrc
index c44d0c46..d32b437b 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -1240,13 +1240,6 @@ noremap <Leader>w
 ounmap <Leader>w
 sunmap <Leader>w
 
-" This next one just shows option state of the 'formatoptions' affecting how
-" text is automatically formatted; it doesn't change its value.
-
-"" Leader,f shows the current 'formatoptions' at a glance
-nnoremap <Leader>f
-      \ :<C-U>set formatoptions?<CR>
-
 " I often have to switch between US English and NZ English.  The latter is
 " almost exactly the same as UK English in most locales, although we use
 " dollars rather than pounds.  This is mostly so I remember things like
@@ -1258,6 +1251,17 @@ nnoremap <Leader>z
 nnoremap <Leader>u
       \ :<C-U>set spelllang=en_us<CR>
 
+" I've also been trying to learn French lately (2023-04-03), and having
+" a spelling check there is handy for doing my homework.
+"
+" This mapping used to show the state of 'formatoptions', but I haven't been
+" using that nearly as often lately.
+"
+" <https://sanctum.geek.nz/images/ze-cultured-frenchman.png>
+"
+nnoremap <Leader>f
+      \ :<C-U>set spelllang=fr<CR>
+
 " The next mapping is also for toggling an option, but it's more complicated;
 " it uses a simple plugin of mine called copy_linebreak.vim to manage several
 " options at once, related to the 'wrap' option that soft-wraps text.