Mercurial > vim
view src/po/Make_cyg.mak @ 34623:65e7eaf68f19 v9.1.0200
patch 9.1.0200: `gj`/`gk` not skipping over outer virtual text lines
Commit: https://github.com/vim/vim/commit/b2d124c6258ff41e1f951bf39a4afc386d79ddc4
Author: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Date: Sun Mar 24 09:43:25 2024 +0100
patch 9.1.0200: `gj`/`gk` not skipping over outer virtual text lines
Problem: `gj`/`gk` was updating the desired cursor virtual column to
the outer virtual text, even though the actual cursor position
was moved to not be on the virtual text, leading the need to
do an extra `gj`/`gk` to move past each virtual text line.
(rickhowe)
Solution: Exclude the outer virtual text when getting the line length
for moving the cursor with `gj`/`gk`, so that no extra
movement is needed to skip over virtual text lines.
(Dylan Thacker-Smith)
fixes: #12028
related: #14262
Signed-off-by: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 24 Mar 2024 10:00:05 +0100 |
parents | 695b50472e85 |
children | 4f63df5700aa |
line wrap: on
line source
# Makefile for the Vim message translations for Cygwin # by Tony Mechelynck <antoine.mechelynck@skynet.be> # after Make_ming.mak by # Eduardo F. Amatria <eferna1@platea.pntic.mec.es> # # Read the README_ming.txt file before using it. # # Use at your own risk but with care, it could even kill your canary. # ifndef VIMRUNTIME VIMRUNTIME = ../../runtime endif # get LANGUAGES, MOFILES and MOCONVERTED include Make_all.mak PACKAGE = vim VIM = ../vim # Uncomment one of the lines below or modify it to put the path to your # gettext binaries ifndef GETTEXT_PATH #GETTEXT_PATH = C:/gettext.win32/bin/ #GETTEXT_PATH = C:/gettext-0.10.35-w32/win32/Release/ GETTEXT_PATH = /bin/ endif # The OLD_PO_FILE_INPUT and OLD_PO_FILE_OUTPUT are for the new GNU gettext # tools 0.10.37, which use a slightly different .po file format that is not # compatible with Solaris (and old gettext implementations) unless these are # set. gettext 0.10.36 will not work! MSGFMT = OLD_PO_FILE_INPUT=yes $(GETTEXT_PATH)msgfmt -v XGETTEXT = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes $(GETTEXT_PATH)xgettext MSGMERGE = OLD_PO_FILE_INPUT=yes OLD_PO_FILE_OUTPUT=yes $(GETTEXT_PATH)msgmerge # MV = move # CP = copy # RM = del # MKD = mkdir MV = mv -f CP = cp -f RM = rm -f MKD = mkdir -p .SUFFIXES: .SUFFIXES: .po .mo .pot .PHONY: first_time all install install-all clean $(LANGUAGES) .po.mo: $(MSGFMT) -o $@ $< all: $(MOFILES) $(MOCONVERTED) PO_INPUTLIST = \ $(wildcard ../*.c) \ ../if_perl.xs \ ../GvimExt/gvimext.cpp \ ../errors.h \ ../globals.h \ ../if_py_both.h \ ../vim.h \ gvim.desktop.in \ vim.desktop.in first_time: $(PO_INPUTLIST) $(PO_VIM_INPUTLIST) $(VIM) -u NONE --not-a-term -S tojavascript.vim $(LANGUAGE).pot $(PO_VIM_INPUTLIST) $(XGETTEXT) --default-domain=$(LANGUAGE) \ --add-comments $(XGETTEXT_KEYWORDS) $(PO_INPUTLIST) $(PO_VIM_JSLIST) $(VIM) -u NONE --not-a-term -S fixfilenames.vim $(LANGUAGE).pot $(PO_VIM_INPUTLIST) $(RM) *.js $(PACKAGE).pot: $(PO_INPUTLIST) $(PO_VIM_INPUTLIST) $(VIM) -u NONE --not-a-term -S tojavascript.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST) $(XGETTEXT) --default-domain=$(PACKAGE) \ --add-comments $(XGETTEXT_KEYWORDS) $(PO_INPUTLIST) $(PO_VIM_JSLIST) $(MV) $(PACKAGE).po $(PACKAGE).pot $(VIM) -u NONE --not-a-term -S fixfilenames.vim $(PACKAGE).pot $(PO_VIM_INPUTLIST) $(RM) *.js # Don't add a dependency here, we only want to update the .po files manually $(LANGUAGES): @$(MAKE) -f Make_cyg.mak $(PACKAGE).pot GETTEXT_PATH=$(GETTEXT_PATH) $(CP) $@.po $@.po.orig $(MV) $@.po $@.po.old $(MSGMERGE) $@.po.old $(PACKAGE).pot -o $@.po $(RM) $@.po.old install: $(MOFILES) $(MOCONVERTED) for TARGET in $(LANGUAGES); do \ $(MKD) $(VIMRUNTIME)/lang/$$TARGET/LC_MESSAGES ; \ $(CP) $$TARGET.mo $(VIMRUNTIME)/lang/$$TARGET/LC_MESSAGES/$(PACKAGE).mo ; \ done install-all: install clean: $(RM) *.mo $(RM) *.pot