Skip to content

Commit 4b47162

Browse files
committed
patch 8.1.0857: indent functionality is not separated
Problem: Ignore functionality is not separated. Solution: Move indent functionality into a new file. (Yegappan Lakshmanan, closes #3886)
1 parent bbb5f8d commit 4b47162

19 files changed

Lines changed: 4746 additions & 4689 deletions

Filelist

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@ SRC_ALL = \
4949
src/gui_beval.c \
5050
src/hardcopy.c \
5151
src/hashtab.c \
52+
src/indent.c \
5253
src/json.c \
5354
src/json_test.c \
5455
src/kword_test.c \
@@ -175,6 +176,7 @@ SRC_ALL = \
175176
src/proto/gui_beval.pro \
176177
src/proto/hardcopy.pro \
177178
src/proto/hashtab.pro \
179+
src/proto/indent.pro \
178180
src/proto/json.pro \
179181
src/proto/list.pro \
180182
src/proto/main.pro \

src/Make_bc5.mak

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -548,6 +548,7 @@ vimobj = \
548548
$(OBJDIR)\getchar.obj \
549549
$(OBJDIR)\hardcopy.obj \
550550
$(OBJDIR)\hashtab.obj \
551+
$(OBJDIR)\indent.obj \
551552
$(OBJDIR)\json.obj \
552553
$(OBJDIR)\list.obj \
553554
$(OBJDIR)\main.obj \

src/Make_cyg_ming.mak

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -720,6 +720,7 @@ OBJ = \
720720
$(OUTDIR)/getchar.o \
721721
$(OUTDIR)/hardcopy.o \
722722
$(OUTDIR)/hashtab.o \
723+
$(OUTDIR)/indent.o \
723724
$(OUTDIR)/json.o \
724725
$(OUTDIR)/list.o \
725726
$(OUTDIR)/main.o \

src/Make_dice.mak

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ SRC = \
5050
getchar.c \
5151
hardcopy.c \
5252
hashtab.c \
53+
indent.c \
5354
json.c \
5455
list.c \
5556
main.c \
@@ -108,6 +109,7 @@ OBJ = o/arabic.o \
108109
o/getchar.o \
109110
o/hardcopy.o \
110111
o/hashtab.o \
112+
o/indent.o \
111113
o/json.o \
112114
o/list.o \
113115
o/main.o \
@@ -209,6 +211,8 @@ o/hardcopy.o: hardcopy.c $(SYMS)
209211

210212
o/hashtab.o: hashtab.c $(SYMS)
211213

214+
o/indent.o: indent.c $(SYMS)
215+
212216
o/json.o: json.c $(SYMS)
213217

214218
o/list.o: list.c $(SYMS)

src/Make_ivc.mak

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -234,6 +234,7 @@ LINK32_OBJS= \
234234
"$(INTDIR)/getchar.obj" \
235235
"$(INTDIR)/hardcopy.obj" \
236236
"$(INTDIR)/hashtab.obj" \
237+
"$(INTDIR)/indent.obj" \
237238
"$(INTDIR)/json.obj" \
238239
"$(INTDIR)/list.obj" \
239240
"$(INTDIR)/main.obj" \
@@ -434,6 +435,10 @@ SOURCE=.\hardcopy.c
434435
SOURCE=.\hashtab.c
435436
# End Source File
436437
# Begin Source File
438+
#
439+
SOURCE=.\indent.c
440+
# End Source File
441+
# Begin Source File
437442

438443
SOURCE=.\gui.c
439444

src/Make_manx.mak

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ SRC = arabic.c \
6060
getchar.c \
6161
hardcopy.c \
6262
hashtab.c \
63+
indent.c \
6364
json.c \
6465
list.c \
6566
main.c \
@@ -120,6 +121,7 @@ OBJ = obj/arabic.o \
120121
obj/getchar.o \
121122
obj/hardcopy.o \
122123
obj/hashtab.o \
124+
obj/indent.o \
123125
obj/json.o \
124126
obj/list.o \
125127
obj/main.o \
@@ -178,6 +180,7 @@ PRO = proto/arabic.pro \
178180
proto/getchar.pro \
179181
proto/hardcopy.pro \
180182
proto/hashtab.pro \
183+
proto/indent.pro \
181184
proto/json.pro \
182185
proto/list.pro \
183186
proto/main.pro \
@@ -329,6 +332,9 @@ obj/hardcopy.o: hardcopy.c
329332
obj/hashtab.o: hashtab.c
330333
$(CCSYM) $@ hashtab.c
331334

335+
obj/indent.o: indent.c
336+
$(CCSYM) $@ indent.c
337+
332338
obj/json.o: json.c
333339
$(CCSYM) $@ json.c
334340

src/Make_morph.mak

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@ SRC = arabic.c \
4848
getchar.c \
4949
hardcopy.c \
5050
hashtab.c \
51+
indent.c \
5152
json.c \
5253
list.c \
5354
main.c \

src/Make_mvc.mak

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -725,6 +725,7 @@ OBJ = \
725725
$(OUTDIR)\getchar.obj \
726726
$(OUTDIR)\hardcopy.obj \
727727
$(OUTDIR)\hashtab.obj \
728+
$(OUTDIR)\indent.obj \
728729
$(OUTDIR)\json.obj \
729730
$(OUTDIR)\list.obj \
730731
$(OUTDIR)\main.obj \
@@ -1414,6 +1415,8 @@ $(OUTDIR)/hardcopy.obj: $(OUTDIR) hardcopy.c $(INCL)
14141415

14151416
$(OUTDIR)/hashtab.obj: $(OUTDIR) hashtab.c $(INCL)
14161417

1418+
$(OUTDIR)/indent.obj: $(OUTDIR) indent.c $(INCL)
1419+
14171420
$(OUTDIR)/gui.obj: $(OUTDIR) gui.c $(INCL) $(GUI_INCL)
14181421

14191422
$(OUTDIR)/gui_beval.obj: $(OUTDIR) gui_beval.c $(INCL) $(GUI_INCL)
@@ -1645,6 +1648,7 @@ proto.h: \
16451648
proto/getchar.pro \
16461649
proto/hardcopy.pro \
16471650
proto/hashtab.pro \
1651+
proto/indent.pro \
16481652
proto/json.pro \
16491653
proto/list.pro \
16501654
proto/main.pro \

src/Make_sas.mak

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,7 @@ SRC = \
113113
getchar.c \
114114
hardcopy.c \
115115
hashtab.c \
116+
indent.c \
116117
json.c \
117118
list.c \
118119
main.c \
@@ -172,6 +173,7 @@ OBJ = \
172173
getchar.o \
173174
hardcopy.o \
174175
hashtab.o \
176+
indent.o \
175177
json.o \
176178
list.o \
177179
main.o \
@@ -231,6 +233,7 @@ PRO = \
231233
proto/getchar.pro \
232234
proto/hardcopy.pro \
233235
proto/hashtab.pro \
236+
proto/indent.pro \
234237
proto/json.pro \
235238
proto/list.pro \
236239
proto/main.pro \
@@ -368,6 +371,8 @@ hardcopy.o: hardcopy.c
368371
proto/hardcopy.pro: hardcopy.c
369372
hashtab.o: hashtab.c
370373
proto/hashtab.pro: hashtab.c
374+
indent.o: indent.c
375+
proto/indent.pro: indent.c
371376
json.o: json.c
372377
proto/json.pro: json.c
373378
list.o: list.c

src/Make_vms.mms

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -314,7 +314,7 @@ ALL_LIBS = $(LIBS) $(GUI_LIB_DIR) $(GUI_LIB) \
314314

315315
SRC = arabic.c autocmd.c beval.c blob.c blowfish.c buffer.c charset.c crypt.c crypt_zip.c dict.c diff.c digraph.c edit.c eval.c \
316316
evalfunc.c ex_cmds.c ex_cmds2.c ex_docmd.c ex_eval.c ex_getln.c if_cscope.c if_xcmdsrv.c farsi.c fileio.c fold.c \
317-
getchar.c hardcopy.c hashtab.c json.c list.c main.c mark.c menu.c mbyte.c memfile.c memline.c message.c misc1.c \
317+
getchar.c hardcopy.c hashtab.c indent.c json.c list.c main.c mark.c menu.c mbyte.c memfile.c memline.c message.c misc1.c \
318318
misc2.c move.c normal.c ops.c option.c popupmnu.c quickfix.c regexp.c search.c sha256.c sign.c \
319319
spell.c spellfile.c syntax.c tag.c term.c termlib.c textprop.c ui.c undo.c userfunc.c version.c screen.c \
320320
window.c os_unix.c os_vms.c pathdef.c \
@@ -323,7 +323,7 @@ SRC = arabic.c autocmd.c beval.c blob.c blowfish.c buffer.c charset.c crypt.c cr
323323

324324
OBJ = arabic.obj autocmd.obj beval.obj blob.obj blowfish.obj buffer.obj charset.obj crypt.obj crypt_zip.obj dict.obj diff.obj digraph.obj \
325325
edit.obj eval.obj evalfunc.obj ex_cmds.obj ex_cmds2.obj ex_docmd.obj ex_eval.obj ex_getln.obj if_cscope.obj \
326-
if_xcmdsrv.obj farsi.obj fileio.obj fold.obj getchar.obj hardcopy.obj hashtab.obj json.obj list.obj main.obj mark.obj \
326+
if_xcmdsrv.obj farsi.obj fileio.obj fold.obj getchar.obj hardcopy.obj hashtab.obj indent.obj json.obj list.obj main.obj mark.obj \
327327
menu.obj memfile.obj memline.obj message.obj misc1.obj misc2.obj \
328328
move.obj mbyte.obj normal.obj ops.obj option.obj popupmnu.obj quickfix.obj \
329329
regexp.obj search.obj sha256.obj sign.obj spell.obj spellfile.obj syntax.obj tag.obj term.obj termlib.obj textprop.obj \
@@ -596,6 +596,7 @@ if_mzsch.obj : if_mzsch.c vim.h [.auto]config.h feature.h os_unix.h \
596596
ascii.h keymap.h term.h macros.h option.h structs.h \
597597
regexp.h gui.h beval.h [.proto]gui_beval.pro ex_cmds.h proto.h \
598598
globals.h farsi.h arabic.h if_mzsch.h
599+
indent.obj : indent.c vim.h [.auto]config.h feature.h os_unix.h
599600
json.obj : json.c vim.h [.auto]config.h feature.h os_unix.h \
600601
ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h beval.h \
601602
[.proto]gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \

0 commit comments

Comments
 (0)