Mercurial > vim
view runtime/tools/vimspell.sh @ 34536:ad6cd802579d v9.1.0170
patch 9.1.0170: Re-allow curwin == prevwin, but document it instead
Commit: https://github.com/vim/vim/commit/d64801e913314d2e19dbb38f60e6d285238debff
Author: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Date: Tue Mar 12 20:46:12 2024 +0100
patch 9.1.0170: Re-allow curwin == prevwin, but document it instead
Problem: more places exist where curwin == prevwin, and it may even be
expected in some cases.
Solution: revert v9.1.0001, but document that it's possible instead.
(Sean Dewar)
I've had a change of heart for the following reasons:
- A quick 'n dirty [GitHub code
search](https://github.com/search?q=%2F%28winnr%5C%28%5C%29%5Cs*%3D%3D%5Cs*winnr%5C%28%5B%27%22%5D%23%5B%27%22%5D%5C%29%7Cwinnr%5C%28%5B%27%22%5D%23%5B%27%22%5D%5C%29%5Cs*%3D%3D%5Cs*winnr%5C%28%5C%29%29%2F&type=code)
reveals some cases where it's expected in the wild.
Particularly, it made me aware `winnr() == winnr('#')` is possible when curwin
is changed temporarily during the evaluation of a &statusline expression item
(`%{...}`), and is used to show something different on the statusline
belonging to the previous window; that behaviour wasn't changed in v9.1.0001,
but it means curwin == prevwin makes sense in some cases.
- The definition and call sites of back_to_prevwin imply some expectation that
prevwin == wp (== curwin) is possible, as it's used to skip entering the
prevwin in that case.
- Prior to v9.1.0001, `:wincmd p` would not beep in the case that was patched in
v9.1.0001, but now does. That resulted in #14047 being opened, as it affected
the CtrlP plugin.
I find it odd that `:wincmd p` had cases where it wouldn't beep despite doing
nothing, but it may be preferable to keep things that way (or instead also
beep if curwin == prevwin, if that's preferred).
- After more digging, I found cases in win_free_mem, enter_tabpage,
aucmd_restbuf and qf_open_new_cwindow where curwin == prevwin is possible
(many of them from autocommands). Others probably exist too, especially in
places where curwin is changed temporarily.
fixes: #14047
closes: #14186
Signed-off-by: Sean Dewar <6256228+seandewar@users.noreply.github.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Tue, 12 Mar 2024 21:00:11 +0100 |
parents | f4f8014d516e |
children |
line wrap: on
line source
#!/bin/sh # # Spell a file & generate the syntax statements necessary to # highlight in vim. Based on a program from Krishna Gadepalli # <krishna@stdavids.picker.com>. # # I use the following mappings (in .vimrc): # # noremap <F8> :so `vimspell.sh %`<CR><CR> # noremap <F7> :syntax clear SpellErrors<CR> # # Neil Schemenauer <nascheme@ucalgary.ca> # March 1999 # updated 2008 Jul 17 by Bram # # Safe method for the temp file by Javier Fernández-Sanguino_Peña INFILE=$1 tmp="${TMPDIR-/tmp}" OUTFILE=`mktemp -t vimspellXXXXXX || tempfile -p vimspell || echo none` # If the standard commands failed then create the file # since we cannot create a directory (we cannot remove it on exit) # create a file in the safest way possible. if test "$OUTFILE" = none; then OUTFILE=$tmp/vimspell$$ [ -e $OUTFILE ] && { echo "Cannot use temporary file $OUTFILE, it already exists!"; exit 1 ; } (umask 077; touch $OUTFILE) fi # Note the copy of vimspell cannot be deleted on exit since it is # used by vim, otherwise it should do this: # trap "rm -f $OUTFILE" 0 1 2 3 9 11 13 15 # # local spellings # LOCAL_DICT=${LOCAL_DICT-$HOME/local/lib/local_dict} if [ -f $LOCAL_DICT ] then SPELL_ARGS="+$LOCAL_DICT" fi spell $SPELL_ARGS $INFILE | sort -u | awk ' { printf "syntax match SpellErrors \"\\<%s\\>\"\n", $0 ; } END { printf "highlight link SpellErrors ErrorMsg\n\n" ; } ' > $OUTFILE echo "!rm $OUTFILE" >> $OUTFILE echo $OUTFILE