Mercurial > vim
view src/Make_ami.mak @ 33872:2c5ae1ce5af2 v9.0.2146
patch 9.0.2146: text-property without type errors when joining
Commit: https://github.com/vim/vim/commit/0d0b3b19517c321b089d637919e88e49a07a3d85
Author: Christian Brabandt <cb@256bit.org>
Date: Sun Dec 3 17:56:43 2023 +0100
patch 9.0.2146: text-property without type errors when joining
Problem: text-property without type errors when joining
Solution: count all text-properties, with or without type
before joining lines
Error when joining lines with text properties without a proper type
When joining lines, we need to consider all text properties that are
attached to a line, even when those text properties are invalid and do
not have a type attached to them.
However, since patch v9.0.0993
(commit: 89469d157aea01513bde826b4519dd6b5fbceae4)
those text properties won't be counted when joining lines and therefore
this will cause the adjustment for text properties on joining to go
wrong (and may later cause SIGABRT with an invalid free pointer)
I am not sure, why the condition to not count text properties with a
valid type was added in patch v9.0.993, because no test fails if those
condition is removed. So let's just remove this condition and add a test
that verifies, that we are able to join lines, even when the text
properties attached to it do not have a valid type.
fixes: #13609
closes: #13614
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Sun, 10 Dec 2023 15:16:11 +0100 |
parents | 5acc0d2cf4f7 |
children | 500731fe8161 |
line wrap: on
line source
# # Makefile for AROS, AmigaOS4 and MorphOS. # BIN = vim CC ?= gcc LD = $(CC) UNM ?= $(shell uname) DEBUG ?= no BUILD ?= huge CFLAGS = -c -O3 # Common compiler flags CFLAGS += \ -DNO_ARP \ -DUSE_TMPNAM \ -DHAVE_STDARG_H \ -DHAVE_TGETENT \ -DHAVE_TERMCAP \ -DNEW_SHELLSIZE \ -I proto \ -Wno-attributes \ -Wextra # Vim 'huge' build ifeq ($(BUILD),huge) CFLAGS += \ -DFEAT_BROWSE \ -DFEAT_MOUSE \ -DFEAT_HUGE else # Vim 'normal' build ifeq ($(BUILD),normal) CFLAGS +=\ -DFEAT_BROWSE \ -DFEAT_MOUSE \ -DFEAT_NORMAL else # Vim 'small' build - now an alias for 'tiny' ifeq ($(BUILD),small) CFLAGS += -DFEAT_TINY else # Vim 'tiny' build ifeq ($(BUILD),tiny) CFLAGS += -DFEAT_TINY endif endif endif endif endif # OS specific compiler flags ifeq ($(UNM),AmigaOS) LDFLAGS = -mcrt=clib2 -lauto -lm -lnet CFLAGS += -DHAVE_FSYNC -D__USE_INLINE__ -mcrt=clib2 else ifeq ($(UNM),AROS) LDFLAGS = -DHAVE_FSYNC -ldebug else ifeq ($(UNM),MorphOS) CFLAGS += -noixemul LDFLAGS = -ldebug -lm -noixemul endif endif endif # Patch level used for Amiga style version string ifdef PATCHLEVEL CFLAGS += -DPATCHLEVEL=\"$(PATCHLEVEL)\" endif # Common sources SRC += \ alloc.c \ arabic.c \ arglist.c \ autocmd.c \ beval.c \ blob.c \ blowfish.c \ buffer.c \ bufwrite.c \ change.c \ charset.c \ cindent.c \ clientserver.c \ clipboard.c \ cmdhist.c \ cmdexpand.c \ crypt.c \ crypt_zip.c \ debugger.c \ dict.c \ diff.c \ digraph.c \ drawline.c \ drawscreen.c \ edit.c \ eval.c \ evalbuffer.c \ evalfunc.c \ evalvars.c \ evalwindow.c \ ex_cmds.c \ ex_cmds2.c \ ex_docmd.c \ ex_eval.c \ ex_getln.c \ fileio.c \ filepath.c \ findfile.c \ float.c \ fold.c \ getchar.c \ hardcopy.c \ hashtab.c \ help.c \ highlight.c \ if_cscope.c \ indent.c \ insexpand.c \ json.c \ list.c \ locale.c \ logfile.c \ main.c \ mark.c \ map.c \ match.c \ mbyte.c \ memfile.c \ memline.c \ menu.c \ message.c \ misc1.c \ misc2.c \ mouse.c \ move.c \ normal.c \ ops.c \ option.c \ optionstr.c \ os_amiga.c \ popupmenu.c \ popupwin.c \ quickfix.c \ regexp.c \ register.c \ screen.c \ scriptfile.c \ search.c \ session.c \ sha256.c \ sign.c \ spell.c \ spellfile.c \ spellsuggest.c \ strings.c \ syntax.c \ tag.c \ term.c \ termlib.c \ testing.c \ textformat.c \ textobject.c \ textprop.c \ time.c \ typval.c \ ui.c \ undo.c \ usercmd.c \ userfunc.c \ version.c \ viminfo.c \ vim9class.c \ vim9cmds.c \ vim9compile.c \ vim9execute.c \ vim9expr.c \ vim9instr.c \ vim9script.c \ vim9type.c \ window.c \ xdiff/xdiffi.c \ xdiff/xemit.c \ xdiff/xhistogram.c \ xdiff/xpatience.c \ xdiff/xprepare.c \ xdiff/xutils.c OBJ = $(SRC:.c=.o) # Build everything - Ignoring header dependencies. $(BIN): $(OBJ) ${LD} -o $(BIN) $(OBJ) $(LDFLAGS) # Clean up .PHONY: clean clean: $(RM) -fv $(OBJ) $(BIN)