Skip to content

Commit

Permalink
patch 8.1.0914: code related to findfile() is spread out
Browse files Browse the repository at this point in the history
Problem:    Code related to findfile() is spread out.
Solution:   Put findfile() related code into a new source file. (Yegappan
            Lakshmanan, closes #3934)
  • Loading branch information
brammool committed Feb 13, 2019
1 parent 688b398 commit 5fd0f50
Show file tree
Hide file tree
Showing 22 changed files with 2,775 additions and 2,724 deletions.
2 changes: 2 additions & 0 deletions Filelist
Expand Up @@ -41,6 +41,7 @@ SRC_ALL = \
src/farsi.h \
src/feature.h \
src/fileio.c \
src/findfile.c \
src/fold.c \
src/getchar.c \
src/globals.h \
Expand Down Expand Up @@ -170,6 +171,7 @@ SRC_ALL = \
src/proto/ex_getln.pro \
src/proto/farsi.pro \
src/proto/fileio.pro \
src/proto/findfile.pro \
src/proto/fold.pro \
src/proto/getchar.pro \
src/proto/gui.pro \
Expand Down
1 change: 1 addition & 0 deletions src/Make_bc5.mak
Expand Up @@ -544,6 +544,7 @@ vimobj = \
$(OBJDIR)\ex_getln.obj \
$(OBJDIR)\farsi.obj \
$(OBJDIR)\fileio.obj \
$(OBJDIR)\findfile.obj \
$(OBJDIR)\fold.obj \
$(OBJDIR)\getchar.obj \
$(OBJDIR)\hardcopy.obj \
Expand Down
1 change: 1 addition & 0 deletions src/Make_cyg_ming.mak
Expand Up @@ -716,6 +716,7 @@ OBJ = \
$(OUTDIR)/ex_getln.o \
$(OUTDIR)/farsi.o \
$(OUTDIR)/fileio.o \
$(OUTDIR)/findfile.o \
$(OUTDIR)/fold.o \
$(OUTDIR)/getchar.o \
$(OUTDIR)/hardcopy.o \
Expand Down
4 changes: 4 additions & 0 deletions src/Make_dice.mak
Expand Up @@ -46,6 +46,7 @@ SRC = \
ex_getln.c \
farsi.c \
fileio.c \
findfile.c \
fold.c \
getchar.c \
hardcopy.c \
Expand Down Expand Up @@ -105,6 +106,7 @@ OBJ = o/arabic.o \
o/ex_getln.o \
o/farsi.o \
o/fileio.o \
o/findfile.o \
o/fold.o \
o/getchar.o \
o/hardcopy.o \
Expand Down Expand Up @@ -203,6 +205,8 @@ o/farsi.o: farsi.c $(SYMS)

o/fileio.o: fileio.c $(SYMS)

o/findfile.o: findfile.c $(SYMS)

o/fold.o: fold.c $(SYMS)

o/getchar.o: getchar.c $(SYMS)
Expand Down
5 changes: 5 additions & 0 deletions src/Make_ivc.mak
Expand Up @@ -230,6 +230,7 @@ LINK32_OBJS= \
"$(INTDIR)/ex_getln.obj" \
"$(INTDIR)/farsi.obj" \
"$(INTDIR)/fileio.obj" \
"$(INTDIR)/findfile.obj" \
"$(INTDIR)/fold.obj" \
"$(INTDIR)/getchar.obj" \
"$(INTDIR)/hardcopy.obj" \
Expand Down Expand Up @@ -419,6 +420,10 @@ SOURCE=.\farsi.c
SOURCE=.\fileio.c
# End Source File
# Begin Source File
#
SOURCE=.\findfile.c
# End Source File
# Begin Source File

SOURCE=.\fold.c
# End Source File
Expand Down
6 changes: 6 additions & 0 deletions src/Make_manx.mak
Expand Up @@ -56,6 +56,7 @@ SRC = arabic.c \
ex_getln.c \
farsi.c \
fileio.c \
findfile.c \
fold.c \
getchar.c \
hardcopy.c \
Expand Down Expand Up @@ -117,6 +118,7 @@ OBJ = obj/arabic.o \
obj/ex_getln.o \
obj/farsi.o \
obj/fileio.o \
obj/findfile.o \
obj/fold.o \
obj/getchar.o \
obj/hardcopy.o \
Expand Down Expand Up @@ -176,6 +178,7 @@ PRO = proto/arabic.pro \
proto/ex_getln.pro \
proto/farsi.pro \
proto/fileio.pro \
proto/findfile.pro \
proto/fold.pro \
proto/getchar.pro \
proto/hardcopy.pro \
Expand Down Expand Up @@ -320,6 +323,9 @@ obj/farsi.o: farsi.c
obj/fileio.o: fileio.c
$(CCSYM) $@ fileio.c

obj/findfile.o: findfile.c
$(CCSYM) $@ findfile.c

obj/fold.o: fold.c
$(CCSYM) $@ fold.c

Expand Down
1 change: 1 addition & 0 deletions src/Make_morph.mak
Expand Up @@ -44,6 +44,7 @@ SRC = arabic.c \
ex_getln.c \
farsi.c \
fileio.c \
findfile.c \
fold.c \
getchar.c \
hardcopy.c \
Expand Down
4 changes: 4 additions & 0 deletions src/Make_mvc.mak
Expand Up @@ -721,6 +721,7 @@ OBJ = \
$(OUTDIR)\ex_getln.obj \
$(OUTDIR)\farsi.obj \
$(OUTDIR)\fileio.obj \
$(OUTDIR)\findfile.obj \
$(OUTDIR)\fold.obj \
$(OUTDIR)\getchar.obj \
$(OUTDIR)\hardcopy.obj \
Expand Down Expand Up @@ -1407,6 +1408,8 @@ $(OUTDIR)/farsi.obj: $(OUTDIR) farsi.c $(INCL)

$(OUTDIR)/fileio.obj: $(OUTDIR) fileio.c $(INCL)

$(OUTDIR)/findfile.obj: $(OUTDIR) findfile.c $(INCL)

$(OUTDIR)/fold.obj: $(OUTDIR) fold.c $(INCL)

$(OUTDIR)/getchar.obj: $(OUTDIR) getchar.c $(INCL)
Expand Down Expand Up @@ -1645,6 +1648,7 @@ proto.h: \
proto/ex_getln.pro \
proto/farsi.pro \
proto/fileio.pro \
proto/findfile.pro \
proto/getchar.pro \
proto/hardcopy.pro \
proto/hashtab.pro \
Expand Down
5 changes: 5 additions & 0 deletions src/Make_sas.mak
Expand Up @@ -109,6 +109,7 @@ SRC = \
ex_getln.c \
farsi.c \
fileio.c \
findfile.c \
fold.c \
getchar.c \
hardcopy.c \
Expand Down Expand Up @@ -169,6 +170,7 @@ OBJ = \
ex_getln.o \
farsi.o \
fileio.o \
findfile.o \
fold.o \
getchar.o \
hardcopy.o \
Expand Down Expand Up @@ -229,6 +231,7 @@ PRO = \
proto/ex_getln.pro \
proto/farsi.pro \
proto/fileio.pro \
proto/findfile.pro \
proto/fold.pro \
proto/getchar.pro \
proto/hardcopy.pro \
Expand Down Expand Up @@ -363,6 +366,8 @@ farsi.o: farsi.c
proto/farsi.pro: farsi.c
fileio.o: fileio.c
proto/fileio.pro: fileio.c
findfile.o: findfile.c
proto/findfile.pro: findfile.c
fold.o: fold.c
proto/fold.pro: fold.c
getchar.o: getchar.c
Expand Down
40 changes: 26 additions & 14 deletions src/Make_vms.mms
Expand Up @@ -312,23 +312,31 @@ ALL_CFLAGS_VER = /def=($(MODEL_DEF)$(DEFS)$(DEBUG_DEF)$(PERL_DEF)$(PYTHON_DEF) -
ALL_LIBS = $(LIBS) $(GUI_LIB_DIR) $(GUI_LIB) \
$(PERL_LIB) $(PYTHON_LIB) $(TCL_LIB) $(RUBY_LIB)

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 \
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 \
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 \
misc2.c move.c normal.c ops.c option.c popupmnu.c quickfix.c regexp.c search.c sha256.c sign.c \
spell.c spellfile.c syntax.c tag.c term.c termlib.c textprop.c ui.c undo.c userfunc.c version.c screen.c \
window.c os_unix.c os_vms.c pathdef.c \
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 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 findfile.c fold.c 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 misc2.c move.c normal.c ops.c \
option.c popupmnu.c quickfix.c regexp.c search.c sha256.c sign.c \
spell.c spellfile.c syntax.c tag.c term.c termlib.c textprop.c ui.c \
undo.c userfunc.c version.c screen.c window.c os_unix.c os_vms.c \
pathdef.c
$(GUI_SRC) $(PERL_SRC) $(PYTHON_SRC) $(TCL_SRC) \
$(RUBY_SRC) $(HANGULIN_SRC) $(MZSCH_SRC) $(XDIFF_SRC)

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 \
edit.obj eval.obj evalfunc.obj ex_cmds.obj ex_cmds2.obj ex_docmd.obj ex_eval.obj ex_getln.obj if_cscope.obj \
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 \
menu.obj memfile.obj memline.obj message.obj misc1.obj misc2.obj \
move.obj mbyte.obj normal.obj ops.obj option.obj popupmnu.obj quickfix.obj \
regexp.obj search.obj sha256.obj sign.obj spell.obj spellfile.obj syntax.obj tag.obj term.obj termlib.obj textprop.obj \
ui.obj undo.obj userfunc.obj screen.obj version.obj window.obj os_unix.obj \
os_vms.obj pathdef.obj if_mzsch.obj\
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 \
edit.obj eval.obj evalfunc.obj ex_cmds.obj ex_cmds2.obj ex_docmd.obj \
ex_eval.obj ex_getln.obj if_cscope.obj if_xcmdsrv.obj farsi.obj \
fileio.obj findfile.obj fold.obj getchar.obj hardcopy.obj hashtab.obj \
indent.obj json.obj list.obj main.obj mark.obj menu.obj memfile.obj \
memline.obj message.obj misc1.obj misc2.obj move.obj mbyte.obj \
normal.obj ops.obj option.obj popupmnu.obj quickfix.obj regexp.obj \
search.obj sha256.obj sign.obj spell.obj spellfile.obj syntax.obj \
tag.obj term.obj termlib.obj textprop.obj ui.obj undo.obj \
userfunc.obj screen.obj version.obj window.obj os_unix.obj os_vms.obj \
pathdef.obj if_mzsch.obj \
$(GUI_OBJ) $(PERL_OBJ) $(PYTHON_OBJ) $(TCL_OBJ) \
$(RUBY_OBJ) $(HANGULIN_OBJ) $(MZSCH_OBJ) $(XDIFF_OBJ)

Expand Down Expand Up @@ -568,6 +576,10 @@ fileio.obj : fileio.c vim.h [.auto]config.h feature.h os_unix.h \
ascii.h keymap.h term.h macros.h structs.h regexp.h \
gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
globals.h farsi.h arabic.h
findfile.obj : findfile.c vim.h [.auto]config.h feature.h os_unix.h \
ascii.h keymap.h term.h macros.h structs.h regexp.h \
gui.h beval.h [.proto]gui_beval.pro option.h ex_cmds.h proto.h \
globals.h farsi.h arabic.h
fold.obj : fold.c vim.h [.auto]config.h feature.h os_unix.h \
ascii.h keymap.h term.h macros.h structs.h regexp.h gui.h beval.h \
[.proto]gui_beval.pro option.h ex_cmds.h proto.h globals.h farsi.h \
Expand Down
11 changes: 11 additions & 0 deletions src/Makefile
Expand Up @@ -1592,6 +1592,7 @@ BASIC_SRC = \
ex_getln.c \
farsi.c \
fileio.c \
findfile.c \
fold.c \
getchar.c \
hardcopy.c \
Expand Down Expand Up @@ -1705,6 +1706,7 @@ OBJ_COMMON = \
objects/ex_getln.o \
objects/farsi.o \
objects/fileio.o \
objects/findfile.o \
objects/fold.o \
objects/getchar.o \
objects/hardcopy.o \
Expand Down Expand Up @@ -1831,6 +1833,7 @@ PRO_AUTO = \
ex_getln.pro \
farsi.pro \
fileio.pro \
findfile.pro \
fold.pro \
getchar.pro \
hardcopy.pro \
Expand Down Expand Up @@ -2999,6 +3002,9 @@ objects/farsi.o: farsi.c
objects/fileio.o: fileio.c
$(CCC) -o $@ fileio.c

objects/findfile.o: findfile.c
$(CCC) -o $@ findfile.c

objects/fold.o: fold.c
$(CCC) -o $@ fold.c

Expand Down Expand Up @@ -3471,6 +3477,11 @@ objects/fileio.o: fileio.c vim.h protodef.h auto/config.h feature.h os_unix.h \
auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
proto.h globals.h farsi.h arabic.h
objects/findfile.o: findfile.c vim.h protodef.h auto/config.h feature.h \
os_unix.h auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
proto.h globals.h farsi.h arabic.h libvterm/include/vterm.h \
libvterm/include/vterm_keycodes.h
objects/fold.o: fold.c vim.h protodef.h auto/config.h feature.h os_unix.h \
auto/osdef.h ascii.h keymap.h term.h macros.h option.h beval.h \
proto/gui_beval.pro structs.h regexp.h gui.h alloc.h ex_cmds.h spell.h \
Expand Down
2 changes: 2 additions & 0 deletions src/README.txt
Expand Up @@ -22,8 +22,10 @@ Most code can be found in a file with an obvious name (incomplete list):
diff.c diff mode (vimdiff)
eval.c expression evaluation
fileio.c reading and writing files
findfile.c search for files in 'path'
fold.c folding
getchar.c getting characters and key mapping
indent.c C and Lisp indentation
mark.c marks
mbyte.c multi-byte character handling
memfile.c storing lines for buffers in a swapfile
Expand Down

0 comments on commit 5fd0f50

Please sign in to comment.