Skip to content

Commit

Permalink
patch 8.2.0443: clipboard code is spread out
Browse files Browse the repository at this point in the history
Problem:    Clipboard code is spread out.
Solution:   Move clipboard code to its own file. (Yegappan Lakshmanan,
            closes vim#5827)
  • Loading branch information
brammool committed Mar 24, 2020
1 parent 71658f7 commit 45fffdf
Show file tree
Hide file tree
Showing 17 changed files with 2,462 additions and 2,432 deletions.
2 changes: 2 additions & 0 deletions Filelist
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ SRC_ALL = \
src/channel.c \
src/charset.c \
src/cindent.c \
src/clipboard.c \
src/cmdexpand.c \
src/cmdhist.c \
src/crypt.c \
Expand Down Expand Up @@ -200,6 +201,7 @@ SRC_ALL = \
src/proto/channel.pro \
src/proto/charset.pro \
src/proto/cindent.pro \
src/proto/clipboard.pro \
src/proto/cmdexpand.pro \
src/proto/cmdhist.pro \
src/proto/crypt.pro \
Expand Down
1 change: 1 addition & 0 deletions src/Make_cyg_ming.mak
Original file line number Diff line number Diff line change
Expand Up @@ -710,6 +710,7 @@ OBJ = \
$(OUTDIR)/change.o \
$(OUTDIR)/charset.o \
$(OUTDIR)/cindent.o \
$(OUTDIR)/clipboard.o \
$(OUTDIR)/cmdexpand.o \
$(OUTDIR)/cmdhist.o \
$(OUTDIR)/crypt.o \
Expand Down
1 change: 1 addition & 0 deletions src/Make_morph.mak
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ SRC = arabic.c \
change.c \
charset.c \
cindent.c \
clipboard.c \
cmdexpand.c \
cmdhist.c \
crypt.c \
Expand Down
4 changes: 4 additions & 0 deletions src/Make_mvc.mak
Original file line number Diff line number Diff line change
Expand Up @@ -730,6 +730,7 @@ OBJ = \
$(OUTDIR)\change.obj \
$(OUTDIR)\charset.obj \
$(OUTDIR)\cindent.obj \
$(OUTDIR)\clipboard.obj \
$(OUTDIR)\cmdexpand.obj \
$(OUTDIR)\cmdhist.obj \
$(OUTDIR)\crypt.obj \
Expand Down Expand Up @@ -1515,6 +1516,8 @@ $(OUTDIR)/charset.obj: $(OUTDIR) charset.c $(INCL)

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

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

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

$(OUTDIR)/cmdhist.obj: $(OUTDIR) cmdhist.c $(INCL)
Expand Down Expand Up @@ -1862,6 +1865,7 @@ proto.h: \
proto/change.pro \
proto/charset.pro \
proto/cindent.pro \
proto/clipboard.pro \
proto/cmdexpand.pro \
proto/cmdhist.pro \
proto/crypt.pro \
Expand Down
6 changes: 6 additions & 0 deletions src/Make_vms.mms
Original file line number Diff line number Diff line change
Expand Up @@ -306,6 +306,7 @@ SRC = \
change.c \
charset.c \
cindent.c \
clipboard.c \
cmdexpand.c \
cmdhist.c \
crypt.c \
Expand Down Expand Up @@ -412,6 +413,7 @@ OBJ = \
change.obj \
charset.obj \
cindent.obj \
clipboard.obj \
cmdexpand.obj \
cmdhist.obj \
crypt.obj \
Expand Down Expand Up @@ -700,6 +702,10 @@ cindent.obj : cindent.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
clipboard.obj : clipboard.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
cmdexpand.obj : cmdexpand.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 \
Expand Down
10 changes: 10 additions & 0 deletions src/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -1599,6 +1599,7 @@ BASIC_SRC = \
change.c \
charset.c \
cindent.c \
clipboard.c \
cmdexpand.c \
cmdhist.c \
crypt.c \
Expand Down Expand Up @@ -1743,6 +1744,7 @@ OBJ_COMMON = \
objects/blob.o \
objects/blowfish.o \
objects/cindent.o \
objects/clipboard.o \
objects/cmdexpand.o \
objects/cmdhist.o \
objects/crypt.o \
Expand Down Expand Up @@ -1903,6 +1905,7 @@ PRO_AUTO = \
channel.pro \
charset.pro \
cindent.pro \
clipboard.pro \
cmdexpand.pro \
cmdhist.pro \
crypt.pro \
Expand Down Expand Up @@ -3117,6 +3120,9 @@ objects/charset.o: charset.c
objects/cindent.o: cindent.c
$(CCC) -o $@ cindent.c

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

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

Expand Down Expand Up @@ -3734,6 +3740,10 @@ objects/cindent.o: cindent.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
objects/clipboard.o: clipboard.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
objects/cmdexpand.o: cmdexpand.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
1 change: 1 addition & 0 deletions src/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ buffer.c | manipulating buffers (loaded files)
bufwrite.c | writing a buffer to file
change.c | handling changes to text
cindent.c | C and Lisp indentation
clipboard.c | handling the clipboard
cmdexpand.c | command-line completion
cmdhist.c | command-line history
debugger.c | vim script debugger
Expand Down
Loading

0 comments on commit 45fffdf

Please sign in to comment.