Mercurial > vim
view src/os_amiga.h @ 34680:2fd4ce2a5058 v9.1.0221
patch 9.1.0221: lines following virt text (that fills the window) might be truncated
Commit: https://github.com/vim/vim/commit/b6fac4db3647179671d3267a4bcd418e92cd4572
Author: Dylan Thacker-Smith <dylan.ah.smith@gmail.com>
Date: Thu Mar 28 11:40:41 2024 +0100
patch 9.1.0221: lines following virt text (that fills the window) might be truncated
Problem: The if branch to set `text_prop_follows` was both checking if
it was at the end of the buffer text line or if it was at the
end of the screen line, but the former being true skipped
a guard condition in the latter to only consider 'below'
virtual text to follow. `text_prop_follows` being improperly
set caused it to skip a conditional block to break at the end
as well as one to move `ptr` to the end of the text line,
while repeated for each following line of the window.
Solution: Move the check for whether 'below' virtual text should follow
so it is also used when at the end of the buffer text line.
(Dylan Thacker-Smith)
fixes: #12213
related: #14307
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 | Thu, 28 Mar 2024 12:00:03 +0100 |
parents | 695b50472e85 |
children |
line wrap: on
line source
/* vi:set ts=8 sts=4 sw=4 noet: * * VIM - Vi IMproved by Bram Moolenaar * * Do ":help uganda" in Vim to read copying and usage conditions. * Do ":help credits" in Vim to see a list of people who contributed. */ /* * Amiga Machine-dependent things */ #define CASE_INSENSITIVE_FILENAME // ignore case when comparing file names #define SPACE_IN_FILENAME #define USE_FNAME_CASE // adjust case of file names #define USE_TERM_CONSOLE #define HAVE_AVAIL_MEM #ifndef HAVE_CONFIG_H # if defined(AZTEC_C) || defined(__amigaos4__) # define HAVE_STAT_H # endif # define HAVE_STDLIB_H # define HAVE_STRING_H # define HAVE_FCNTL_H # define HAVE_STRCSPN # define HAVE_STRICMP # define HAVE_STRNICMP # define HAVE_STRFTIME // guessed # define HAVE_SETENV # define HAVE_MEMSET # define HAVE_QSORT # if defined(__DATE__) && defined(__TIME__) # define HAVE_DATE_TIME # endif #endif // HAVE_CONFIG_H #ifndef DFLT_ERRORFILE # define DFLT_ERRORFILE "AztecC.Err" // Should this change? #endif #ifndef DFLT_RUNTIMEPATH # define DFLT_RUNTIMEPATH "home:vimfiles,$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after,home:vimfiles/after" #endif #ifndef CLEAN_RUNTIMEPATH # define CLEAN_RUNTIMEPATH "$VIM/vimfiles,$VIMRUNTIME,$VIM/vimfiles/after" #endif #ifndef BASENAMELEN # define BASENAMELEN 26 // Amiga #endif #ifndef TEMPNAME # define TEMPNAME "t:v?XXXXXX" # define TEMPNAMELEN 12 #endif // cproto fails on missing include files #ifndef PROTO #include <exec/types.h> #include <libraries/dos.h> #include <libraries/dosextens.h> // Currently, all Amiga compilers except AZTEC C have these... #ifndef AZTEC_C # include <proto/exec.h> # include <proto/dos.h> # include <proto/intuition.h> #endif #endif // PROTO #define FNAME_ILLEGAL ";*?`#%" // illegal characters in a file name /* * Manx doesn't have off_t, define it here. */ #ifdef AZTEC_C typedef long off_t; #endif #ifdef LATTICE # define USE_TMPNAM // use tmpnam() instead of mktemp() #endif #ifdef __GNUC__ # include <sys/stat.h> # include <unistd.h> # include <limits.h> # include <errno.h> # include <pwd.h> # include <grp.h> # include <dirent.h> #endif #include <time.h> // for strftime() and others #ifndef PROTO /* * arpbase.h must be included before functions.h */ #ifdef FEAT_ARP # include <libraries/arpbase.h> #endif #endif // PROTO /* * This won't be needed if you have a version of Lattice 4.01 without broken * break signal handling. */ #include <signal.h> /* * Names for the EXRC, HELP and temporary files. * Some of these may have been defined in the makefile. */ #ifndef SYS_VIMRC_FILE # define SYS_VIMRC_FILE "$VIM/vimrc" #endif #ifndef SYS_GVIMRC_FILE # define SYS_GVIMRC_FILE "$VIM/gvimrc" #endif #ifndef SYS_MENU_FILE # define SYS_MENU_FILE "$VIMRUNTIME/menu.vim" #endif #ifndef DFLT_HELPFILE # define DFLT_HELPFILE "$VIMRUNTIME/doc/help.txt" #endif #ifndef SYNTAX_FNAME # define SYNTAX_FNAME "$VIMRUNTIME/syntax/%s.vim" #endif #ifndef USR_EXRC_FILE # define USR_EXRC_FILE "s:.exrc" #endif #ifndef USR_EXRC_FILE2 # define USR_EXRC_FILE2 "home:.exrc" #endif #ifndef USR_VIMRC_FILE # define USR_VIMRC_FILE "s:.vimrc" #endif #ifndef USR_VIMRC_FILE2 # define USR_VIMRC_FILE2 "home:.vimrc" #endif #ifndef USR_VIMRC_FILE3 # define USR_VIMRC_FILE3 "home:vimfiles:vimrc" #endif #ifndef USR_VIMRC_FILE4 # define USR_VIMRC_FILE4 "$VIM/.vimrc" #endif #ifndef VIM_DEFAULTS_FILE # define VIM_DEFAULTS_FILE "$VIMRUNTIME/defaults.vim" #endif #ifndef EVIM_FILE # define EVIM_FILE "$VIMRUNTIME/evim.vim" #endif #ifndef USR_GVIMRC_FILE # define USR_GVIMRC_FILE "s:.gvimrc" #endif #ifndef USR_GVIMRC_FILE2 # define USR_GVIMRC_FILE2 "home:.gvimrc" #endif #ifndef USR_GVIMRC_FILE3 # define USR_GVIMRC_FILE3 "home:vimfiles:gvimrc" #endif #ifndef USR_GVIMRC_FILE4 # define USR_GVIMRC_FILE4 "$VIM/.gvimrc" #endif #ifdef FEAT_VIMINFO # ifndef VIMINFO_FILE # define VIMINFO_FILE "s:.viminfo" # endif #endif #ifndef EXRC_FILE # define EXRC_FILE ".exrc" #endif #ifndef VIMRC_FILE # define VIMRC_FILE ".vimrc" #endif #ifndef GVIMRC_FILE # define GVIMRC_FILE ".gvimrc" #endif #ifndef DFLT_BDIR # define DFLT_BDIR ".,t:" // default for 'backupdir' #endif #ifndef DFLT_DIR # define DFLT_DIR ".,t:" // default for 'directory' #endif #ifndef DFLT_VDIR # define DFLT_VDIR "home:vimfiles/view" // default for 'viewdir' #endif #ifndef DFLT_MAXMEM # define DFLT_MAXMEM 256 // use up to 256Kbyte for buffer #endif #ifndef DFLT_MAXMEMTOT # define DFLT_MAXMEMTOT 0 // decide in set_init #endif #if defined(SASC) int setenv(const char *, const char *); #endif #define mch_remove(x) remove((char *)(x)) #define mch_rename(src, dst) rename(src, dst) #define mch_chdir(s) chdir(s) #define vim_mkdir(x, y) mch_mkdir(x)