The home of Mikael Jansson, hacker, hobby chef & adrenaline junkie based in Sweden. More…

Mikael Jansson.be » Hacking

Ticket #36 (closed enhancement: fixed)

Opened 2 years ago

Last modified 2 years ago

[Patch] Initial Vim 7.2 Patch

Reported by: Si Owned by: mikael
Priority: major Milestone:
Component: lisp mode Version: 0.3.4
Keywords: Cc:

Description

This is an initial patch to get up and running with ECL 0.9l + Vim 7.2 from the Vim.org site sources. Passes the basic ecl test on OSX.

The existing existing patches were pretty much fine, and only a couple needed any significant tweaking.

This is a Git patch, containing all kinds of cruft right now, but I wanted to chuck it up to play on the safe side. You could probably dig out the relevant changes fairly simply, as no extra files were patched.

Attachments

vim72-git.diff (115.5 kB) - added by Si 2 years ago.
configure.txt (10.4 kB) - added by Si 2 years ago.
OSX Make Output
make.txt (14.4 kB) - added by Si 2 years ago.
OSX Make Output

Change History

Changed 2 years ago by Si

Changed 2 years ago by mikael

  • owner set to mikael
  • status changed from new to accepted

Did you add features or fix bugs in if_ecl when moving it to 7.2?

Changed 2 years ago by Si

Hiya,

No, it was a straight patch to support the 0.9L ECL integration. There's all kinds of rubbish in the diff, but I don't think the actual if_ecl code was touched:

Caemlyn:~ Si$ grep "diff --git" ~/Desktop/vim72-git.diff 
diff --git a/runtime/doc/tags b/runtime/doc/tags
diff --git a/src/Makefile b/src/Makefile
diff --git a/src/Vim.app/Contents/Info.plist b/src/Vim.app/Contents/Info.plist
diff --git a/src/Vim.app/Contents/MacOS/Vim b/src/Vim.app/Contents/MacOS/Vim
diff --git a/src/Vim.app/Contents/PkgInfo b/src/Vim.app/Contents/PkgInfo
diff --git a/src/Vim.app/Contents/Resources/Vim.rsrc b/src/Vim.app/Contents/Resources/Vim.rsrc
diff --git a/src/Vim.app/Contents/Resources/app.icns b/src/Vim.app/Contents/Resources/app.icns
diff --git a/src/Vim.app/Contents/Resources/doc-txt.icns b/src/Vim.app/Contents/Resources/doc-txt.icns
diff --git a/src/Vim.app/Contents/Resources/doc.icns b/src/Vim.app/Contents/Resources/doc.icns
diff --git a/src/Vim.app/Contents/Resources/vim/runtime b/src/Vim.app/Contents/Resources/vim/runtime
diff --git a/src/auto/config.cache b/src/auto/config.cache
diff --git a/src/auto/config.h b/src/auto/config.h
diff --git a/src/auto/config.log b/src/auto/config.log
diff --git a/src/auto/config.mk b/src/auto/config.mk
diff --git a/src/auto/config.status b/src/auto/config.status
diff --git a/src/auto/configure b/src/auto/configure
diff --git a/src/auto/link.log b/src/auto/link.log
diff --git a/src/auto/link.sed b/src/auto/link.sed
diff --git a/src/auto/pathdef.c b/src/auto/pathdef.c
diff --git a/src/config.h.in b/src/config.h.in
diff --git a/src/config.mk.in b/src/config.mk.in
diff --git a/src/configure.in b/src/configure.in
diff --git a/src/ex_cmds.h b/src/ex_cmds.h
diff --git a/src/ex_docmd.c b/src/ex_docmd.c
diff --git a/src/feature.h b/src/feature.h
diff --git a/src/main.c b/src/main.c
diff --git a/src/memline.c b/src/memline.c
diff --git a/src/objects/buffer.o b/src/objects/buffer.o
diff --git a/src/objects/charset.o b/src/objects/charset.o
diff --git a/src/objects/diff.o b/src/objects/diff.o
diff --git a/src/objects/digraph.o b/src/objects/digraph.o
diff --git a/src/objects/edit.o b/src/objects/edit.o
diff --git a/src/objects/eval.o b/src/objects/eval.o
diff --git a/src/objects/ex_cmds.o b/src/objects/ex_cmds.o
diff --git a/src/objects/ex_cmds2.o b/src/objects/ex_cmds2.o
diff --git a/src/objects/ex_docmd.o b/src/objects/ex_docmd.o
diff --git a/src/objects/ex_eval.o b/src/objects/ex_eval.o
diff --git a/src/objects/ex_getln.o b/src/objects/ex_getln.o
diff --git a/src/objects/fileio.o b/src/objects/fileio.o
diff --git a/src/objects/fold.o b/src/objects/fold.o
diff --git a/src/objects/getchar.o b/src/objects/getchar.o
diff --git a/src/objects/gui.o b/src/objects/gui.o
diff --git a/src/objects/gui_mac.o b/src/objects/gui_mac.o
diff --git a/src/objects/hardcopy.o b/src/objects/hardcopy.o
diff --git a/src/objects/hashtab.o b/src/objects/hashtab.o
diff --git a/src/objects/if_xcmdsrv.o b/src/objects/if_xcmdsrv.o
diff --git a/src/objects/main.o b/src/objects/main.o
diff --git a/src/objects/mark.o b/src/objects/mark.o
diff --git a/src/objects/mbyte.o b/src/objects/mbyte.o
diff --git a/src/objects/memfile.o b/src/objects/memfile.o
diff --git a/src/objects/memline.o b/src/objects/memline.o
diff --git a/src/objects/menu.o b/src/objects/menu.o
diff --git a/src/objects/message.o b/src/objects/message.o
diff --git a/src/objects/misc1.o b/src/objects/misc1.o
diff --git a/src/objects/misc2.o b/src/objects/misc2.o
diff --git a/src/objects/move.o b/src/objects/move.o
diff --git a/src/objects/normal.o b/src/objects/normal.o
diff --git a/src/objects/ops.o b/src/objects/ops.o
diff --git a/src/objects/option.o b/src/objects/option.o
diff --git a/src/objects/os_mac_conv.o b/src/objects/os_mac_conv.o
diff --git a/src/objects/os_macosx.o b/src/objects/os_macosx.o
diff --git a/src/objects/os_unix.o b/src/objects/os_unix.o
diff --git a/src/objects/pathdef.o b/src/objects/pathdef.o
diff --git a/src/objects/popupmnu.o b/src/objects/popupmnu.o
diff --git a/src/objects/pty.o b/src/objects/pty.o
diff --git a/src/objects/quickfix.o b/src/objects/quickfix.o
diff --git a/src/objects/regexp.o b/src/objects/regexp.o
diff --git a/src/objects/screen.o b/src/objects/screen.o
diff --git a/src/objects/search.o b/src/objects/search.o
diff --git a/src/objects/spell.o b/src/objects/spell.o
diff --git a/src/objects/syntax.o b/src/objects/syntax.o
diff --git a/src/objects/tag.o b/src/objects/tag.o
diff --git a/src/objects/term.o b/src/objects/term.o
diff --git a/src/objects/ui.o b/src/objects/ui.o
diff --git a/src/objects/undo.o b/src/objects/undo.o
diff --git a/src/objects/version.o b/src/objects/version.o
diff --git a/src/objects/window.o b/src/objects/window.o
diff --git a/src/proto.h b/src/proto.h
diff --git a/src/proto/memline.pro b/src/proto/memline.pro
diff --git a/src/structs.h b/src/structs.h
diff --git a/src/version.c b/src/version.c
diff --git a/src/vim b/src/vim
diff --git a/src/vim.h b/src/vim.h
diff --git a/src/xxd/xxd b/src/xxd/xxd
diff --git a/src/xxd/xxd.dSYM/Contents/Info.plist b/src/xxd/xxd.dSYM/Contents/Info.plist
diff --git a/src/xxd/xxd.dSYM/Contents/Resources/DWARF/xxd b/src/xxd/xxd.dSYM/Contents/Resources/DWARF/xxd

I guess we need a version of Vim 7.2 in the repo to properly patch against.

Changed 2 years ago by mikael

Working on it. I've tagged 7.2 in the repos.

Currently trying to figure out why @ECL_OBJ@ isn't substituted properly when Makefile is generated.

Changed 2 years ago by Si

My mind is a bit hazy about it all now. One thing I do remember was that the Make configuration had been simplified in one area, so I didn't need to apply the changes, and in another area it seemed overly whitespace sensitive.

Changed 2 years ago by Si

OSX Make Output

Changed 2 years ago by Si

OSX Make Output

Changed 2 years ago by mikael

  • status changed from accepted to closed
  • resolution set to fixed

Turned out to be a railing space in configure.

[361] Merged changes between r314 (r1024/) and r359 (current, aka 7.2)

Note: See TracTickets for help on using tickets.
'