Skip to search.

Breaking News Visit Yahoo! News for the latest.

×Close this window

vim-mac · Vim (Vi IMproved) text editor Macintosh list

The Yahoo! Groups Product Blog

Check it out!

Group Information

? Already a member? Sign in to Yahoo!

Yahoo! Groups Tips

Did you know...
Message search is now enhanced, find messages faster. Take it for a spin.

Messages

Advanced
Messages Help
Messages 1051 - 1080 of 13685   Oldest  |  < Older  |  Newer >  |  Newest
Messages: Show Message Summaries Sort by Date ^  
#1051 From: "The Shrubber" <m5a08d7bsbdi001@...>
Date: Wed Jul 23, 2003 12:08 pm
Subject: malloc error with silent remove
m5a08d7bsbdi001@...
Send Email Send Email
 
Hi list,

I was wondering if people would mind reproducing this error and
fixing the relevant bugs.

1) start vim (GUI)
2) :silent g/^\\s*$/d

You should get an error like:
    *** malloc[7051]: Deallocation of a pointer not malloced: 0x1ff5c8;
    This could be a double free(), or free() called with the middle of an
    allocated block; Try setting environment variable MallocHelp to see
    tools to help debug

Also, vim starts at some point starts putting garbage on the screen (Ctrl-L
makes it go away) and eventually crashing.  But i have not reproduced it
yet and it may not be related.

Before anyone asks, i've tested this without any vimrc or gvimrc to
avoid there being any third-party interference.

Thanks,

(-S-)

#1052 From: Bram Moolenaar <Bram@...>
Date: Wed Jul 23, 2003 12:37 pm
Subject: Re: malloc error with silent remove
Bram@...
Send Email Send Email
 
The Shrubber wrote:

> I was wondering if people would mind reproducing this error and
> fixing the relevant bugs.
>
> 1) start vim (GUI)
> 2) :silent g/^\\s*$/d
>
> You should get an error like:
>    *** malloc[7051]: Deallocation of a pointer not malloced: 0x1ff5c8;
>    This could be a double free(), or free() called with the middle of an
>    allocated block; Try setting environment variable MallocHelp to see
>    tools to help debug
>
> Also, vim starts at some point starts putting garbage on the screen (Ctrl-L
> makes it go away) and eventually crashing.  But i have not reproduced it
> yet and it may not be related.
>
> Before anyone asks, i've tested this without any vimrc or gvimrc to
> avoid there being any third-party interference.

This should not depend on the Mac-specific code, but I can't reproduce
this anyway.

What version of Vim?  How was it compiled?

--
BEDEVERE: Stand by for attack!!
    [CUT TO enormous army forming up.  Trebuchets, rows of PIKEMEN, siege
    towers, pennants flying, shouts of "Stand by for attack!"  Traditional
    army build-up shots.  The shouts echo across the ranks of the army.
    We see various groups reacting, and stirring themselves in readiness.]
ARTHUR:   Who are they?
BEDEVERE: Oh, just some friends!
                  "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

  /// Bram Moolenaar -- Bram@... -- http://www.Moolenaar.net   \\\
///          Creator of Vim - Vi IMproved -- http://www.Vim.org          \\\
\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
  \\\  Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html  ///

#1053 From: "The Shrubber" <m5a08d7bsbdi001@...>
Date: Wed Jul 23, 2003 1:06 pm
Subject: Re: malloc error with silent remove
m5a08d7bsbdi001@...
Send Email Send Email
 
This for Benji Fisher's distribution of Carbon vim (v 6.2.11 and 6.2.14)
that i got from http://macvim.swdev.org/OSX/files/vimJag.tar.bz2.

You have to run gvim or Vim.app/Contents/MacOS/Vim -v -g
to reproduce this.  The error shows in your terminal.

BTW: gvim and Vim.app/Contents/MacOs/Vim are different versions
      (6.2.11 and 6.2.14 respectively).  Is this intentional, or
      is there a Makefile to be fixed?

Best,

(-S-)

#1054 From: "The Shrubber" <m5a08d7bsbdi001@...>
Date: Thu Jul 24, 2003 8:18 am
Subject: Re: malloc error with silent remove
m5a08d7bsbdi001@...
Send Email Send Email
 
Sorry for the clutter, just sending a clearer version of my earlier
response.

> > 1) start vim (GUI)
> > 2) :silent g/^\\s*$/d

This error occurs for Benji Fisher's Carbon vim 6.2.11 and 6.2.14 which
i found http://macvim.swdev.org/OSX.  To reproduce the error, you must
launch gvim from the command line (gvim or
vim/Vim.app/Contents/MacOS/Vim -v -g); the error will appear on the
terminal.

Can you reproduce it now?

Thanks,

--eric

On Wed, Jul 23, 2003 at 14:37:06 +0200, Bram Moolenaar Bram-at-moolenaar.net
|vim-mac@.../1.0-Allow| wrote:
> This should not depend on the Mac-specific code, but I can't reproduce
> this anyway.
>
> What version of Vim?  How was it compiled?

#1055 From: Bram Moolenaar <Bram@...>
Date: Fri Jul 25, 2003 8:39 pm
Subject: Vim Mac patches sent out
Bram@...
Send Email Send Email
 
I have just sent out a few patches specifically for the Mac.  Please try
them out asap and report any problems you notice.

--
CART DRIVER: Bring out your dead!
LARGE MAN:   Here's one!
CART DRIVER: Ninepence.
BODY:        I'm not dead!
                  "Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD

  /// Bram Moolenaar -- Bram@... -- http://www.Moolenaar.net   \\\
///          Creator of Vim - Vi IMproved -- http://www.Vim.org          \\\
\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
  \\\  Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html  ///

#1056 From: Benji Fisher <benji@...>
Date: Mon Jul 28, 2003 1:06 am
Subject: vim 6.2.056 +python for OS X (Carbon)
benji@...
Send Email Send Email
 
I have compiled vim 6.2.056 for OS X (Carbon, Aqua interface).
I have not yet tested the binary much.  That's your job!  Please help
test this, especially since Bram just asked us to test these
Mac-specific changes.

       There are no new features except for the latest official patches.
   These include most of the custom patches that I have been using, so
the build process is simpler for those who compile on their own.  (The
only unofficial patch left at the moment is HitReturn.diff .)

        As always, you can find my binary at
http://macvim.swdev.org/OSX/
If I messed anyhting up, let me know!  (I was interrupted after changing
the link text and before updating the binary, so if you happen to have
downloaded at the wrong time, you may be annoyed to have 6.2.014 instead
of 6.2.056 ...)

					 --Benji Fisher

#1057 From: Jason McIntosh <jmcintosh@...>
Date: Fri Aug 1, 2003 3:51 pm
Subject: Panther?
jmcintosh@...
Send Email Send Email
 
I was looking through the archives, and couldn't find much information,
so I thought I'd ask:
Any word on a version for Panther?  Particularly the carbonized
version.  If not, I'll work on getting a version compiled, but I
thought I'd ask first.
Thanks!
Jason

Jason McIntosh
Programmer/Analyst
University of Missouri
573-884-3865
GnuPG Key: http://poetshome.com/pubkey.asc

#1058 From: Bob Ippolito <bob@...>
Date: Fri Aug 1, 2003 6:37 pm
Subject: Re: Panther?
bob@...
Send Email Send Email
 
Did you try it?  Most things will just work in Panther.

On Friday, Aug 1, 2003, at 11:51 America/New_York, Jason McIntosh wrote:

> I was looking through the archives, and couldn't find much
> information, so I thought I'd ask:
> Any word on a version for Panther?  Particularly the carbonized
> version.  If not, I'll work on getting a version compiled, but I
> thought I'd ask first.
> Thanks!
> Jason
>
> Jason McIntosh
> Programmer/Analyst
> University of Missouri
> 573-884-3865
> GnuPG Key: http://poetshome.com/pubkey.asc

#1059 From: Bob Ippolito <bob@...>
Date: Fri Aug 1, 2003 6:40 pm
Subject: Re: Panther?
bob@...
Send Email Send Email
 
Also note that the DP of Panther came with a unix version of vim 6.1,
and the latest seed comes with unix vim 6.2.  You should be able to
verify this independently by looking at Darwin CVS (7.0.0b1 I believe).

On Friday, Aug 1, 2003, at 14:37 America/New_York, Bob Ippolito wrote:

> Did you try it?  Most things will just work in Panther.
>
> On Friday, Aug 1, 2003, at 11:51 America/New_York, Jason McIntosh
> wrote:
>
>> I was looking through the archives, and couldn't find much
>> information, so I thought I'd ask:
>> Any word on a version for Panther?  Particularly the carbonized
>> version.  If not, I'll work on getting a version compiled, but I
>> thought I'd ask first.
>> Thanks!
>> Jason
>>
>> Jason McIntosh
>> Programmer/Analyst
>> University of Missouri
>> 573-884-3865
>> GnuPG Key: http://poetshome.com/pubkey.asc
>

#1060 From: Jason McIntosh <jmcintosh@...>
Date: Fri Aug 1, 2003 6:58 pm
Subject: Re: Panther?
jmcintosh@...
Send Email Send Email
 
Well, I got it working with a recompile of vim.  The thing that doesn't
work is the carbonized graphical display.  It throws an error due to
perl not being in the same place, and some differences in the library
versions.
In the earlier version of OS X, /System/Library/Perl/darwin was what
was referenced.  Panther is using 5.8.1 and is found in
/System/Library/Perl/5.8.1
There's a whole host of library failures.  If someone has the
carbonized version of Vim with a decent Makefile, I can try recompiling
it to get it to work.  I tried using the instructions found on the
website
http://macvim.swdev.org/OSX/ but the make doesn't even get very far -
but throws an error on the "--dump-pch" option.
The only way to get around this thus far is to make a link in
/System/Library/Perl to the old version.  i.e. sudo ln -s /Previous\
Systems/Previous\ System\ 1/System/Library/Perl/darwin
/System/Library/Perl/darwin  The above enables the carbonized version
to work.

As an aside to that, for those who use the command line, if you setup a
shell script with the following:
#!/bin/bash
/Applications/vim/Vim.app/Contents/MacOS/Vim -g $1 &

and make it executable, then you can do "mvim ~/Documents/myfile.txt"
and "mvim ~/Documents/myfile2.txt" and get two graphical vims.  It's a
bit easier than some other methods of getting it to work.  A bit simple
perhaps, but effective.
Cheers!
Jason


Jason McIntosh
Programmer/Analyst
University of Missouri
573-884-3865
GnuPG Key: http://poetshome.com/pubkey.asc

On Friday, August 1, 2003, at 1:40 PM, Bob Ippolito wrote:

> Also note that the DP of Panther came with a unix version of vim 6.1,
> and the latest seed comes with unix vim 6.2.  You should be able to
> verify this independently by looking at Darwin CVS (7.0.0b1 I
> believe).
>
> On Friday, Aug 1, 2003, at 14:37 America/New_York, Bob Ippolito wrote:
>
>> Did you try it?  Most things will just work in Panther.
>>
>> On Friday, Aug 1, 2003, at 11:51 America/New_York, Jason McIntosh
>> wrote:
>>
>>> I was looking through the archives, and couldn't find much
>>> information, so I thought I'd ask:
>>> Any word on a version for Panther?  Particularly the carbonized
>>> version.  If not, I'll work on getting a version compiled, but I
>>> thought I'd ask first.
>>> Thanks!
>>> Jason
>>>
>>> Jason McIntosh
>>> Programmer/Analyst
>>> University of Missouri
>>> 573-884-3865
>>> GnuPG Key: http://poetshome.com/pubkey.asc
>>

#1061 From: Bob Ippolito <bob@...>
Date: Fri Aug 1, 2003 7:11 pm
Subject: Re: Panther?
bob@...
Send Email Send Email
 
Ah, right, forgot about the dynamic perl dependency (yuck)

What you could also do, is rewrite the Mach-O header for the binary..
you obviously have dev tools installed, so try this:
install_name_tool -change
"/System/Library/Perl/darwin/CORE/libperl.dylib" "/Previous
Systems/Previous System
1/System/Library/Perl/darwin/CORE/libperl.dylib"
/Applications/vim/Vim.app/Contents/MacOS/Vim

Which will rewrite the path it's looking for libperl, rather than
making symlinks everywhere.  You could also try :
install_name_tool -change
"/System/Library/Perl/darwin/CORE/libperl.dylib"
"/System/Library/Perl/5.8.1//darwin-thread-multi-2level/CORE/
libperl.dylib" /Applications/vim/Vim.app/Contents/MacOS/Vim

But that's really pressing your luck :)

The perl thing has been causing issues forever, it finally looks like
they're following their own rules now and versioning the folder.  I
dunno why the hell they're not just putting it in a framework, like
Python is.

On Friday, Aug 1, 2003, at 14:58 America/New_York, Jason McIntosh wrote:

> Well, I got it working with a recompile of vim.  The thing that
> doesn't work is the carbonized graphical display.  It throws an error
> due to perl not being in the same place, and some differences in the
> library versions.
> In the earlier version of OS X, /System/Library/Perl/darwin was what
> was referenced.  Panther is using 5.8.1 and is found in
> /System/Library/Perl/5.8.1
> There's a whole host of library failures.  If someone has the
> carbonized version of Vim with a decent Makefile, I can try
> recompiling it to get it to work.  I tried using the instructions
> found on the website
> http://macvim.swdev.org/OSX/ but the make doesn't even get very far -
> but throws an error on the "--dump-pch" option.
> The only way to get around this thus far is to make a link in
> /System/Library/Perl to the old version.  i.e. sudo ln -s /Previous\
> Systems/Previous\ System\ 1/System/Library/Perl/darwin
> /System/Library/Perl/darwin  The above enables the carbonized version
> to work.
>
> As an aside to that, for those who use the command line, if you setup
> a shell script with the following:
> #!/bin/bash
> /Applications/vim/Vim.app/Contents/MacOS/Vim -g $1 &
>
> and make it executable, then you can do "mvim ~/Documents/myfile.txt"
> and "mvim ~/Documents/myfile2.txt" and get two graphical vims.  It's a
> bit easier than some other methods of getting it to work.  A bit
> simple perhaps, but effective.
> Cheers!
> Jason
>
>
> Jason McIntosh
> Programmer/Analyst
> University of Missouri
> 573-884-3865
> GnuPG Key: http://poetshome.com/pubkey.asc
>
> On Friday, August 1, 2003, at 1:40 PM, Bob Ippolito wrote:
>
>> Also note that the DP of Panther came with a unix version of vim 6.1,
>> and the latest seed comes with unix vim 6.2.  You should be able to
>> verify this independently by looking at Darwin CVS (7.0.0b1 I
>> believe).
>>
>> On Friday, Aug 1, 2003, at 14:37 America/New_York, Bob Ippolito wrote:
>>
>>> Did you try it?  Most things will just work in Panther.
>>>
>>> On Friday, Aug 1, 2003, at 11:51 America/New_York, Jason McIntosh
>>> wrote:
>>>
>>>> I was looking through the archives, and couldn't find much
>>>> information, so I thought I'd ask:
>>>> Any word on a version for Panther?  Particularly the carbonized
>>>> version.  If not, I'll work on getting a version compiled, but I
>>>> thought I'd ask first.
>>>> Thanks!
>>>> Jason
>>>>
>>>> Jason McIntosh
>>>> Programmer/Analyst
>>>> University of Missouri
>>>> 573-884-3865
>>>> GnuPG Key: http://poetshome.com/pubkey.asc
>>>

#1062 From: ripley@...
Date: Sat Aug 2, 2003 9:00 am
Subject: Re: Panther?
ripley@...
Send Email Send Email
 
Jason McIntosh wrote:
> As an aside to that, for those who use the command line, if you setup a
> shell script with the following:
> #!/bin/bash
> /Applications/vim/Vim.app/Contents/MacOS/Vim -g $1 &

Throwing my knowledge of unix scripting in, I'd make it like

#!/bin/sh   (never rely on bash except when you really want to use some of
              its additional features!)
/Applications/vim/Vim.app/Contents/MacOS/Vim -g "$@" &

This will allow you to start a separate instance of vim for several files,
file names with quoted spaces included, like
mvim file1.txt "this has spaces.txt"

Greetings,
Ripley (Still stuck with Classic OS on my G3 due to the Formac TV card and
some other software that'll not run on OS X (at least not with 10.1))

#1063 From: "Emily Jackson" <m5comp@...>
Date: Sat Aug 2, 2003 10:47 am
Subject: Re(2): Panther?
m5comp@...
Send Email Send Email
 
At 4:00 AM -0500 on Saturday, August 2, 2003, ripley@...-
berlin.de <ripley@...> wrote:

>Jason McIntosh wrote:
>> As an aside to that, for those who use the command line, if you setup a
>> shell script with the following:
>> #!/bin/bash
>> /Applications/vim/Vim.app/Contents/MacOS/Vim -g $1 &
>
>Throwing my knowledge of unix scripting in, I'd make it like
>
>#!/bin/sh   (never rely on bash except when you really want to use some of
>             its additional features!)
>/Applications/vim/Vim.app/Contents/MacOS/Vim -g "$@" &
>
>This will allow you to start a separate instance of vim for several files,
>file names with quoted spaces included, like
>mvim file1.txt "this has spaces.txt"

On my copy of Vim (6.2.056), this script just opens each file in a
separate buffer instead of in a separate instance of Vim (each file in
its own window).

Emily

#1064 From: "The Shrubber" <m5a08d7bsbdi001@...>
Date: Thu Aug 14, 2003 9:24 am
Subject: autoconf for Carbon Vim
m5a08d7bsbdi001@...
Send Email Send Email
 
Hi list,

I would like to invite you to test my patch for making Carbon Vim
compile via the usual make; make install routine.

1) extract vim 6.2: src, extra, lang
    apply patches vim 6.2.000 to 6.2.056
    apply my patch (-p 0)
    put the attached xml file in vim62/src

2) cd vim62/src
    autoconf -o auto/configure

3) make; make install

This should create a Vim.app in the src directory that you can
double-click and run.

Notes
-----
This is based off MURAOKA's Make_osx.mak.

Perl support seems to work: ./configure --with-perlinterp

Not integrated yet:
   Python not yet integrated
   MURAOKA Taro's IME and iconv stuff

If you know what you are doing, please grep for "Eric Kow" and
send suggestions (Eric == somewhat clueless).

Thanks,

--eric
Only in .: .DS_Store
Only in .: autoconf_macosx.diff
Only in ./src: .DS_Store
Only in ./src: .Makefile.swp
diff -u -r /Users/kowey/unloria/orig-patched/vim62/src/Makefile ./src/Makefile
--- /Users/kowey/unloria/orig-patched/vim62/src/Makefile Sun Jun  1 15:18:29
2003
+++ ./src/Makefile Thu Aug 14 10:54:26 2003
@@ -1010,6 +1010,7 @@
  #GUI_LIBS_DIR = $(NONE_LIBS_DIR)
  #GUI_LIBS1 = $(NONE_LIBS1)
  #GUI_LIBS2 = $(NONE_LIBS2)
+#GUI_INSTALL    = $(NONE_INSTALL)
  #GUI_TARGETS = $(NONE_TARGETS)
  #GUI_MAN_TARGETS= $(NONE_MAN_TARGETS)
  #GUI_TESTTARGET = $(NONE_TESTTARGET)
@@ -1025,6 +1026,7 @@
  GTK_LIBS_DIR = $(GUI_LIB_LOC)
  GTK_LIBS1 =
  GTK_LIBS2 = $(GTK_LIBNAME)
+GTK_INSTALL     = install_normal
  GTK_TARGETS = installglinks
  GTK_MAN_TARGETS = installghelplinks
  GTK_TESTTARGET = gui
@@ -1038,6 +1040,7 @@
  MOTIF_LIBS_DIR = $(GUI_LIB_LOC)
  MOTIF_LIBS1 =
  MOTIF_LIBS2 = $(MOTIF_LIBNAME) -lXt
+MOTIF_INSTALL   = install_normal
  MOTIF_TARGETS = installglinks
  MOTIF_MAN_TARGETS = installghelplinks
  MOTIF_TESTTARGET = gui
@@ -1066,6 +1069,7 @@
  ATHENA_LIBS_DIR = $(GUI_LIB_LOC)
  ATHENA_LIBS1 = $(XAW_LIB)
  ATHENA_LIBS2 = -lXt
+ATHENA_INSTALL  =  install_normal
  ATHENA_TARGETS =  installglinks
  ATHENA_MAN_TARGETS = installghelplinks
  ATHENA_TESTTARGET = gui
@@ -1082,6 +1086,7 @@
  NEXTAW_LIBS_DIR = $(GUI_LIB_LOC)
  NEXTAW_LIBS1 = $(NEXTAW_LIB)
  NEXTAW_LIBS2 = -lXt
+NEXTAW_INSTALL  =  install_normal
  NEXTAW_TARGETS =  installglinks
  NEXTAW_MAN_TARGETS = installghelplinks
  NEXTAW_TESTTARGET = gui
@@ -1105,6 +1110,7 @@
  BEOSGUI_LIBS_DIR =
  BEOSGUI_LIBS1 = -lbe -lroot
  BEOSGUI_LIBS2 =
+BEOSGUI_INSTALL = install_normal
  BEOSGUI_TARGETS = installglinks
  BEOSGUI_MAN_TARGETS = installghelplinks
  BEOSGUI_TESTTARGET = gui
@@ -1117,10 +1123,26 @@
  PHOTONGUI_LIBS_DIR =
  PHOTONGUI_LIBS1 = -lph -lphexlib
  PHOTONGUI_LIBS2 =
+PHOTONGUI_INSTALL = install_normal
  PHOTONGUI_TARGETS = installglinks
  PHOTONGUI_MAN_TARGETS = installghelplinks
  PHOTONGUI_TESTTARGET = gui

+# CARBON GUI
+CARBONGUI_SRC =  gui.c gui_mac.c
+CARBONGUI_OBJ =  objects/gui.o objects/gui_mac.o objects/pty.o
+CARBONGUI_DEFS = -arch ppc -fno-common -fpascal-strings \
+                  -Wall -Wno-unknown-pragmas \
+                  -mdynamic-no-pic -pipe
+CARBONGUI_IPATH = -I. -Iproto -I/Developer/Headers/FlatCarbon
+CARBONGUI_LIBS_DIR =
+CARBONGUI_LIBS1 = -framework Carbon
+CARBONGUI_LIBS2 = -ltermcap
+CARBONGUI_INSTALL = install_macosx
+CARBONGUI_TARGETS =
+CARBONGUI_MAN_TARGETS =
+CARBONGUI_TESTTARGET =
+
  # All GUI files
  ALL_GUI_SRC  = gui.c gui_gtk.c gui_gtk_f.c gui_motif.c gui_athena.c
gui_gtk_x11.c gui_x11.c gui_at_sb.c gui_at_fs.c pty.c
  ALL_GUI_PRO  = gui.pro gui_gtk.pro gui_motif.pro gui_athena.pro gui_gtk_x11.pro
gui_x11.pro gui_w16.pro gui_w32.pro gui_amiga.pro gui_photon.pro
@@ -1570,7 +1592,9 @@
  # If you want to keep an older version, rename it before running "make
  # install".
  #
-install: installvim installtools install-languages install-icons
+install: $(GUI_INSTALL)
+
+install_normal: installvim installtools install-languages install-icons

  installvim: installvimbin installruntime installlinks installhelplinks
installmacros installtutor

@@ -2132,6 +2156,9 @@
  objects/gui_photon.o: gui_photon.c
 	 $(CCC) -o $@ gui_photon.c

+objects/gui_mac.o: gui_mac.c
+ $(CCC) -o $@ gui_mac.c
+
  objects/hangulin.o: hangulin.c
 	 $(CCC) -o $@ hangulin.c

@@ -2207,6 +2234,9 @@
  objects/os_qnx.o: os_qnx.c
 	 $(CCC) -o $@ os_qnx.c

+objects/os_macosx.o: os_macosx.c
+ $(CCC) -o $@ os_macosx.c
+
  objects/os_unix.o: os_unix.c
 	 $(CCC) -o $@ os_unix.c

@@ -2266,6 +2296,86 @@

  Makefile:
 	 @echo The name of the makefile MUST be "Makefile" (with capital M)!!!!
+
+###############################################################################
+### MacOS X installation
+###
+### This creates a runnable Vim.app in the src directory
+###
+### TODO: install the runtime files in Vim.app instead of
+### requiring that they be in a seperate directory.
+
+REZ    = /Developer/Tools/Rez
+RESMRG = /Developer/Tools/ResMerger
+APPDIR = $(VIMNAME).app
+RESDIR = $(APPDIR)/Contents/Resources
+# FIXME: i'm sure someone else can do something clever with grep
+# sed and version.h here
+VERSION = 6.2
+
+### Common flags
+M4FLAGS += -DAPP_EXE=$(VIMNAME) -DAPP_NAME=$(VIMNAME) -DAPP_VER=$(VERSION) \
+    -DICON_APP=$(ICON_APP)
+
+### Icons
+# You can download Douglas Stebila's icons:
+# http://homepage.mac.com/dstebila/code/vim/
+# TODO: Honestly, why don't we just go ahead and do this? OS 9?
+# If you place those *.icns at src directory, it will be detected by this
+# Makefile automatically, and used for Vim.
+ICON_APP = $(shell if [ -e app.icns ] ; then echo app.icns ; else echo
gui_mac.icns ; fi)
+ICON_DOC = $(shell if [ -e doc.icns ] ; then echo doc.icns ; else echo ; fi)
+ICON_DOCTXT = $(shell if [ -e doc-txt.icns ] ; then echo doc-txt.icns ; else
echo ; fi)
+ICONS = $(addprefix $(RESDIR)/, $(ICON_APP) $(ICON_DOC) $(ICON_DOCTXT))
+
+install_macosx: bundle-dir bundle-executable bundle-info bundle-resource \
+ bundle-language
+
+bundle-dir: $(APPDIR)/Contents
+
+bundle-executable: $(VIMTARGET)
+ cp $(VIMTARGET) $(APPDIR)/Contents/MacOS/$(VIMTARGET)
+
+bundle-info:  bundle-dir
+ @echo "Creating PkgInfo"
+ @echo -n "APPLVIM!" > $(APPDIR)/Contents/PkgInfo
+ @echo "Creating Info.plist"
+ m4 $(M4FLAGS) infplist.xml > $(APPDIR)/Contents/Info.plist
+
+bundle-resource: bundle-dir bundle-icons bundle-rsrc
+
+bundle-icons: $(ICONS)
+
+### Classic resources
+# Resource fork (in the form of a .rsrc file) for Classic Vim (Mac OS 9)
+# This file is also required for OS X Vim.
+#
+# FIXME: it is only an assumption that gui_mac.r was used to make
+# gui_mac.rsrc... is this really the case?
+bundle-rsrc:
+ @echo "Creating resource fork"
+ $(REZ) gui_mac.r -o gui_mac.rsrc
+ $(RESMRG) gui_mac.rsrc -dstIs DF -o $(RESDIR)/$(VIMNAME).rsrc
+
+# po/Make_osx.pl says something about generating a Mac message file
+# for Ukrananian.  Would somebody using Mac OS X in Ukranian
+# *really* be upset that Carbon Vim was not localised in
+# Ukranian?
+#
+#bundle-language: bundle-dir po/Make_osx.pl
+# cd po && perl Make_osx.pl --outdir ../$(RESDIR) $(MULTILANG)
+bundle-language: bundle-dir
+
+$(APPDIR)/Contents:
+ mkdir $(APPDIR)
+ mkdir $(APPDIR)/Contents
+ mkdir $(APPDIR)/Contents/MacOS
+ mkdir $(RESDIR)
+ mkdir $(RESDIR)/English.lproj
+
+$(RESDIR)/%.icns: %.icns
+ cp $< $@
+

  ###############################################################################
  ### (automatically generated by 'make depend')
Only in ./src: Vim.app
Only in ./src/VisVim: .DS_Store
Only in /Users/kowey/unloria/orig-patched/vim62/src/auto: configure
Only in ./src: autom4te.cache
diff -u -r /Users/kowey/unloria/orig-patched/vim62/src/config.mk.in
./src/config.mk.in
--- /Users/kowey/unloria/orig-patched/vim62/src/config.mk.in Sun Apr 20 16:10:18
2003
+++ ./src/config.mk.in Mon Aug 11 14:07:29 2003
@@ -116,6 +116,7 @@
  GUI_LIBS_DIR = $(@GUITYPE@_LIBS_DIR)
  GUI_LIBS1 = $(@GUITYPE@_LIBS1)
  GUI_LIBS2 = $(@GUITYPE@_LIBS2)
+GUI_INSTALL     = $(@GUITYPE@_INSTALL)
  GUI_TARGETS = $(@GUITYPE@_TARGETS)
  GUI_MAN_TARGETS = $(@GUITYPE@_MAN_TARGETS)
  GUI_TESTTARGET = $(@GUITYPE@_TESTTARGET)
Only in ./src: config.status
diff -u -r /Users/kowey/unloria/orig-patched/vim62/src/configure.in
./src/configure.in
--- /Users/kowey/unloria/orig-patched/vim62/src/configure.in Sat May 31 22:30:02
2003
+++ ./src/configure.in Mon Aug 11 17:28:36 2003
@@ -3,6 +3,8 @@
  dnl Process this file with autoconf 2.12 or 2.13 to produce "configure".
  dnl Should also work with autoconf 2.54 and later.

+DEFAULT_VIMNAME=vim
+
  AC_INIT(vim.h)
  AC_CONFIG_HEADER(auto/config.h:config.h.in)

@@ -75,6 +77,31 @@
      *)  QNX=no; AC_MSG_RESULT(no);;
  esac

+dnl Check for Darwin and MacOS X
+dnl We do a check for MacOS X in the very beginning because there
+dnl are a lot of other things we need to change besides GUI stuff
+dnl FIXME: maybe it would suffice to check for uname == Darwin?
+AC_MSG_CHECKING(for Darwin)
+case `uname` in
+  Darwin)       AC_MSG_RESULT(yes);
+                AC_CHECK_HEADER(Carbon/Carbon.h, MACOSX=yes)
+                ;;
+  *)  AC_MSG_RESULT(no);;
+esac
+dnl If MacOSX is found, assume we don't want X11
+dnl unless it was specifically asked for (--with-x)
+AC_MSG_CHECKING(for MacOSX)
+AC_MSG_RESULT($MACOSX)
+case "$MACOSX" in
+  yes) test -z "$with_x" && with_x=no
+       DEFAULT_VIMNAME=Vim
+       OS_EXTRA_SCR="os_macosx.c";
+       OS_EXTRA_OBJ="objects/os_macosx.o"
+       CFLAGS="$CFLAGS -DMACOS_X_UNIX"
+       ;;
+  *) ;;
+esac
+
  AC_SUBST(OS_EXTRA_SRC)
  AC_SUBST(OS_EXTRA_OBJ)

@@ -106,7 +133,7 @@
  AC_MSG_CHECKING(--with-vim-name argument)
  AC_ARG_WITH(vim-name, [  --with-vim-name=NAME    what to call the Vim
executable],
 	 VIMNAME="$withval"; AC_MSG_RESULT($VIMNAME),
- VIMNAME="vim"; AC_MSG_RESULT(Defaulting to vim))
+        VIMNAME="$DEFAULT_VIMNAME"; AC_MSG_RESULT(Defaulting to
$DEFAULT_VIMNAME))
  AC_SUBST(VIMNAME)
  AC_MSG_CHECKING(--with-ex-name argument)
  AC_ARG_WITH(ex-name, [  --with-ex-name=NAME     what to call the Ex
executable],
@@ -294,7 +321,16 @@
        AC_MSG_RESULT(>>> too old; need Perl version 5.003_01 or later <<<)
      fi
    fi
+
+  if test "x$MACOSX" != "xyes"; then
+    PERL=/usr/bin/perl
+    PERL_DIR=/System/Library/Perl
+    PERL_CFLAGS=-DFEAT_PERL -I$(PERL_DIR)/darwin/CORE
+    PERL_OBJ=if_perl.o if_perlsfio.o
$(PERL_DIR)/darwin/auto/DynaLoader/DynaLoader.a
+    PERL_LIBS=-lperl -L$(PERL_DIR)/darwin/CORE
+  fi
  fi
+
  AC_SUBST(shrpenv)
  AC_SUBST(PERL_SRC)
  AC_SUBST(PERL_OBJ)
@@ -714,7 +750,7 @@
  dnl defining FEAT_XFONTSET is delayed, so that it can be disabled for no GUI

  test -z "$with_x" && with_x=yes
-test "${enable_gui-yes}" != no -a "x$QNX" != "xyes" && with_x=yes
+test "${enable_gui-yes}" != no -a "x$MACOSX" != "xyes" -a "x$QNX" != "xyes" &&
with_x=yes
  if test "$with_x" = no; then
    AC_MSG_RESULT(defaulting to: don't HAVE_X11)
  else
@@ -814,26 +850,24 @@
    fi
  fi

-test "x$with_x" = xno -a "x$BEOS" != "xyes" -a "x$QNX" != "xyes" &&
enable_gui=no
+test "x$with_x" = xno -a "x$BEOS" != "xyes" -a "x$QNX" != "xyes" -a "x$MACOSX"
!= "xyes" && enable_gui=no

  AC_MSG_CHECKING(--enable-gui argument)
  AC_ARG_ENABLE(gui,
- [  --enable-gui[=OPTS]     X11 GUI [default=auto]
[OPTS=auto/no/gtk/gtk2/gnome/gnome2/motif/athena/neXtaw/beos/photon]], ,
enable_gui="auto")
+ [  --enable-gui[=OPTS]     X11 GUI [default=auto]
[OPTS=auto/no/gtk/gtk2/gnome/gnome2/motif/athena/neXtaw/beos/photon/carbon]], ,
enable_gui="auto")

  ## Canonicalize the --enable-gui= argument so that it can be easily compared.
  ## Do not use character classes for portability with old tools.
  enable_gui_canon=`echo "_$enable_gui" | \
 	 sed 's/[[ _+-]]//g;y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`

+# set all variables SKIP_{name of gui}
+define(skip_gui_all,  SKIP_GTK=YES; SKIP_GTK2=YES; SKIP_GNOME=YES;
SKIP_MOTIF=YES; SKIP_ATHENA=YES; SKIP_NEXTAW=YES; SKIP_PHOTON=YES;
SKIP_BEOS=YES; SKIP_CARBON=YES)
+define(skip_gui_none, SKIP_GTK=; SKIP_GTK2=; SKIP_GNOME=; SKIP_MOTIF=;
SKIP_ATHENA=; SKIP_NEXTAW=; SKIP_PHOTON=; SKIP_BEOS=; SKIP_CARBON=)
+
  if test "x$BEOS" = "xyes"; then

-  SKIP_GTK=YES
-  SKIP_GTK2=YES
-  SKIP_GNOME=YES
-  SKIP_MOTIF=YES
-  SKIP_ATHENA=YES
-  SKIP_NEXTAW=YES
-  SKIP_PHOTON=YES
+  skip_gui_all
    SKIP_BEOS=
    GUITYPE=NONE

@@ -847,13 +881,7 @@
    esac

  elif test "x$QNX" = "xyes" -a "x$with_x" = "xno" ; then
-  SKIP_GTK=YES
-  SKIP_GTK2=YES
-  SKIP_GNOME=YES
-  SKIP_MOTIF=YES
-  SKIP_ATHENA=YES
-  SKIP_NEXTAW=YES
-  SKIP_BEOS=YES
+  skip_gui_all
    SKIP_PHOTON=
    GUITYPE=NONE

@@ -866,40 +894,56 @@
      *)  AC_MSG_RESULT([Sorry, $enable_gui GUI is not supported]) ;;
    esac

-else
-
-  SKIP_GTK=
-  SKIP_GTK2=
-  SKIP_GNOME=
-  SKIP_MOTIF=
-  SKIP_ATHENA=
-  SKIP_NEXTAW=
-  SKIP_BEOS=YES
-  SKIP_PHOTON=YES
+elif test "x$MACOSX" = "xyes" -a "x$with_x" = "xno" ; then
+  skip_gui_all
+  SKIP_CARBON=
    GUITYPE=NONE

    case "$enable_gui_canon" in
-    no|none) AC_MSG_RESULT(no GUI support)
-  SKIP_GTK=YES; SKIP_GTK2=YES; SKIP_GNOME=YES; SKIP_MOTIF=YES; SKIP_ATHENA=YES;
SKIP_NEXTAW=YES ;;
+    no)  AC_MSG_RESULT(no GUI support)
+  SKIP_CARBON=YES ;;
      yes|"") AC_MSG_RESULT(yes - automatic GUI support) ;;
      auto) AC_MSG_RESULT(auto - automatic GUI support) ;;
+    carbon) AC_MSG_RESULT(Carbon GUI support) ;;
+    *)  AC_MSG_RESULT([Sorry, $enable_gui GUI is not supported]) ;;
+  esac
+
+
+else
+    skip_gui_all
+    case "$enable_gui_canon" in
+    no|none) AC_MSG_RESULT(no GUI support)
+                ;;
+    yes|""|auto)
+                AC_MSG_RESULT(automatic GUI support)
+                skip_gui_none
+                SKIP_BEOS=YES
+                SKIP_PHOTON=YES
+                GUITYPE=NONE
+                ;;
      gtk) AC_MSG_RESULT(GTK+ 1.x GUI support)
-  SKIP_GTK2=YES; SKIP_GNOME=YES; SKIP_MOTIF=YES; SKIP_ATHENA=YES;
SKIP_NEXTAW=YES ;;
+                SKIP_GTK=;;
      gtk2) AC_MSG_RESULT(GTK+ 2.x GUI support)
-  SKIP_GNOME=YES; SKIP_MOTIF=YES; SKIP_ATHENA=YES; SKIP_NEXTAW=YES ;;
+                SKIP_GTK2=;;
      gnome) AC_MSG_RESULT(GNOME 1.x GUI support)
-  SKIP_GTK2=YES; SKIP_MOTIF=YES; SKIP_ATHENA=YES; SKIP_NEXTAW=YES ;;
+                SKIP_GTK=
+                SKIP_GNOME=;;
      gnome2) AC_MSG_RESULT(GNOME 2.x GUI support)
-  SKIP_MOTIF=YES; SKIP_ATHENA=YES; SKIP_NEXTAW=YES ;;
+                SKIP_GTK2=
+                SKIP_GNOME2=;;
      motif) AC_MSG_RESULT(Motif GUI support)
-  SKIP_GTK=YES; SKIP_GNOME=YES; SKIP_ATHENA=YES; SKIP_NEXTAW=YES ;;
+                SKIP_MOTIF=;;
      athena) AC_MSG_RESULT(Athena GUI support)
-  SKIP_GTK=YES; SKIP_GNOME=YES; SKIP_MOTIF=YES; SKIP_NEXTAW=YES ;;
+  SKIP_ATHENA=;;
      nextaw) AC_MSG_RESULT(neXtaw GUI support)
-  SKIP_GTK=YES; SKIP_GNOME=YES; SKIP_MOTIF=YES; SKIP_ATHENA=YES ;;
-    *)  AC_MSG_RESULT([Sorry, $enable_gui GUI is not supported]) ;;
+                SKIP_NEXTAW=;;
+    *)  AC_MSG_RESULT([Sorry, $enable_gui GUI is not supported])
+                skip_gui_none
+                SKIP_BEOS=YES
+                SKIP_PHOTON=YES
+                GUITYPE=NONE
+                ;;
    esac
-
  fi

  if test "x$SKIP_GTK" != "xYES" -a "$enable_gui_canon" != "gtk" -a
"$enable_gui_canon" != "gtk2"; then
@@ -971,6 +1015,22 @@
    fi
  fi

+if test "x$SKIP_CARBON" != "xYES" -a "$enable_gui_canon" != "carbon"; then
+  AC_MSG_CHECKING(whether or not to look for Carbon)
+  AC_ARG_ENABLE(carbon-check,
+ [  --enable-carbon-check   If auto-select GUI, check for Carbon
[default=yes]],
+ , enable_carbon_check="yes")
+  AC_MSG_RESULT($enable_carbon_check);
+  if test "x$enable_carbon_check" = "xno"; then
+    SKIP_CARBON=YES
+  fi
+fi
+
+if test -z "$SKIP_CARBON"; then
+  skip_gui_all
+  AC_CHECK_HEADER(Carbon/Carbon.h, GUITYPE=CARBONGUI)
+fi
+

  dnl
  dnl Get the cflags and libraries from the gtk-config script
@@ -1565,6 +1625,11 @@
  if test "$enable_fontset" = "yes"; then
    AC_DEFINE(FEAT_XFONTSET)
  fi
+
+dnl ---------------------------------------------------------------------------
+dnl end of GUI-checking
+dnl ---------------------------------------------------------------------------
+

  dnl Only really enable hangul input when GUI and XFONTSET are available
  if test "$enable_hangulinput" = "yes"; then
Only in ./src: foo.rsrc
diff -u -r /Users/kowey/unloria/orig-patched/vim62/src/globals.h ./src/globals.h
--- /Users/kowey/unloria/orig-patched/vim62/src/globals.h Wed May 28 20:24:00
2003
+++ ./src/globals.h Tue Aug 12 09:37:38 2003
@@ -625,7 +625,15 @@
  EXTERN JMP_BUF x_jump_env;
  #endif

-#if defined(HAVE_SETJMP_H)
+/* Eric Kow: for compiling with autoconf settings on MacOS X
+ * FIXME: Why exactly must we undefine this? All I know is
+ *        that this makes the compiler less unhappy.
+ */
+#if defined(MACOS_X_UNIX)
+# undef HAVE_SETJMP_H
+#endif
+
+#if defined(HAVE_SETJMP_H)
  /*
   * Stuff for setjmp() and longjmp().
   * Used to protect areas where we could crash.
Only in ./src: gui_mac.rsrc
Only in ./src: infplist.xml
Only in ./src/objects: vim_Prefix.pfe
diff -u -r /Users/kowey/unloria/orig-patched/vim62/src/os_mac.h ./src/os_mac.h
--- /Users/kowey/unloria/orig-patched/vim62/src/os_mac.h Mon Aug 11 11:00:42
2003
+++ ./src/os_mac.h Tue Aug 12 09:10:55 2003
@@ -142,23 +142,25 @@
  #ifndef MACOS_X_UNIX     /* I hope that switching these two lines */
  # define USE_CR 	    /* does what I want -- BNF */
  # define NO_CONSOLE  /* don't include console mode */
+/* Eric Kow: Moved here to get rid of warnings, because autoconf
+ * now sets stuff in auto/config.h for MacOS X and Carbon. */
+# define HAVE_STRING_H
+# define HAVE_STRCSPN
+# define HAVE_MEMSET
+# define HAVE_FCNTL_H
+# define HAVE_QSORT
+# if defined(__DATE__) && defined(__TIME__)
+#  define HAVE_DATE_TIME
+# endif
+# define HAVE_STRFTIME
+/* end Eric Kow */
  #endif
  #define HAVE_AVAIL_MEM

  /* #define SYNC_DUP_CLOSE    sync() a file with dup() and close() */
-#define HAVE_STRING_H
-#define HAVE_STRCSPN
-#define HAVE_MEMSET
  #define USE_TMPNAM  /* use tmpnam() instead of mktemp() */
-#define HAVE_FCNTL_H
-#define HAVE_QSORT
  #define HAVE_ST_MODE  /* have stat.st_mode */

-#if defined(__DATE__) && defined(__TIME__)
-# define HAVE_DATE_TIME
-#endif
-#define HAVE_STRFTIME
-

  /*
   * Names for the EXRC, HELP and temporary files.
@@ -348,7 +350,8 @@
  #ifdef __APPLE_CC__
  /* Assuming compiling for MacOS X */
  /* Trying to take advantage of the prebinding */
-# define HAVE_TGETENT
+/* rendundant with autoconf support  (Eric Kow)
+ * # define HAVE_TGETENT */
  # define OSPEED_EXTERN
  # define UP_BC_PC_EXTERN
  #endif
@@ -371,9 +374,11 @@
  # define HAVE_SELECT 1
  # define HAVE_SYS_SELECT_H 1
  # undef  HAVE_AVAIL_MEM
+/* redundant with autoconf support of MacOS X (Eric Kow)
  # define HAVE_PUTENV
  # define HAVE_SETENV
  # define HAVE_RENAME
+*/
  # define mch_chdir(s) chdir(s)
  #endif

Only in /Users/kowey/unloria/orig-patched/vim62/src: os_mac.pbproj
diff -u -r /Users/kowey/unloria/orig-patched/vim62/src/os_macosx.c
./src/os_macosx.c
--- /Users/kowey/unloria/orig-patched/vim62/src/os_macosx.c Sun May 11 17:26:37
2003
+++ ./src/os_macosx.c Tue Aug 12 09:37:38 2003
@@ -13,7 +13,7 @@
   */

  #ifdef MACOS_X_UNIX
-# include "os_unix.c"
+# include "vim.h"
  #else
  # include "os_mac.c"
  # include <TextEncodingConverter.h>
Only in ./src/po: .DS_Store
Only in ./src/po: Make_osx.pl
Only in ./src/po: ascii2ucs.pl
diff -u -r /Users/kowey/unloria/orig-patched/vim62/src/version.c ./src/version.c
--- /Users/kowey/unloria/orig-patched/vim62/src/version.c Mon Aug 11 11:00:43
2003
+++ ./src/version.c Sat Aug  2 16:55:58 2003
@@ -743,6 +743,114 @@
  /**/
      1,
  /**/
+    18,
+/**/
+    17,
+/**/
+    16,
+/**/
+    15,
+/**/
+    14,
+/**/
+    13,
+/**/
+    12,
+/**/
+    11,
+/**/
+    10,
+/**/
+    9,
+/**/
+    8,
+/**/
+    7,
+/**/
+    6,
+/**/
+    5,
+/**/
+    4,
+/**/
+    3,
+/**/
+    2,
+/**/
+    1,
+/**/
+    18,
+/**/
+    17,
+/**/
+    16,
+/**/
+    15,
+/**/
+    14,
+/**/
+    13,
+/**/
+    12,
+/**/
+    11,
+/**/
+    10,
+/**/
+    9,
+/**/
+    8,
+/**/
+    7,
+/**/
+    6,
+/**/
+    5,
+/**/
+    4,
+/**/
+    3,
+/**/
+    2,
+/**/
+    1,
+/**/
+    18,
+/**/
+    17,
+/**/
+    16,
+/**/
+    15,
+/**/
+    14,
+/**/
+    13,
+/**/
+    12,
+/**/
+    11,
+/**/
+    10,
+/**/
+    9,
+/**/
+    8,
+/**/
+    7,
+/**/
+    6,
+/**/
+    5,
+/**/
+    4,
+/**/
+    3,
+/**/
+    2,
+/**/
+    1,
+/**/
      0
  };

diff -u -r /Users/kowey/unloria/orig-patched/vim62/src/vim.h ./src/vim.h
--- /Users/kowey/unloria/orig-patched/vim62/src/vim.h Thu May 29 11:32:47 2003
+++ ./src/vim.h Tue Aug 12 09:12:35 2003
@@ -62,8 +62,11 @@
  #  define MACOS_CLASSIC
  #endif
  #if defined(MACOS_X_UNIX)
+#  include <sys/types.h>
+#  include <sys/time.h>
+#  include <sys/resource.h>
+#  include <pwd.h>
  #  define MACOS_X
-#  define UNIX
  #endif
  #if defined(MACOS_X) || defined(MACOS_CLASSIC)
  #  define MACOS
Only in ./src/xxd: .DS_Store
<?xml version="1.0" encoding="UTF-8"?>
<!-- vim:set ts=2 sts=2 sw=2 tw=0: -->
<!DOCTYPE plist SYSTEM "file://localhost/System/Library/DTDs/PropertyList.dtd">
<plist version="0.9">
	 <dict>

		 <key>CFBundleInfoDictionaryVersion</key>
		 <string>6.0</string>

		 <key>CFBundleExecutable</key>
		 <string>APP_EXE</string>
		 <key>CFBundleName</key>
		 <string>APP_NAME</string>
		 <key>CFBundlePackageType</key>
		 <string>APPL</string>
		 <key>CFBundleVersion</key>
		 <string>APP_VER</string>
		 <key>CFBundleShortVersionString</key>
		 <string>APP_VER</string>
		 <key>CFBundleSignature</key>
		 <string>VIM!</string>

		 <key>CFBundleDevelopmentRegion</key>
		 <string>English</string>
		 <key>CSResourcesFileMapped</key>
		 <true/>
		 <key>CFBundleIconFile</key>
		 <string>ICON_APP</string>

		 <key>CFBundleDocumentTypes</key>
		 <array>
			 <dict>
				 <key>CFBundleTypeExtensions</key>
				 <array>
					 <string>*</string>
				 </array>
				 <key>CFBundleTypeIconFile</key>
				 <string>doc-txt.icns</string>
				 <key>CFBundleTypeName</key>
				 <string>NSStringPboardType</string>
				 <key>CFBundleTypeOSTypes</key>
				 <array>
					 <string>****</string>
				 </array>
				 <key>CFBundleTypeRole</key>
				 <string>Editor</string>
			 </dict>
		 </array>

	 </dict>
</plist>

#1065 From: "MURAOKA Taro" <koron@...>
Date: Thu Aug 14, 2003 3:59 pm
Subject: Drop to window
koron@...
Send Email Send Email
 
Gvim on MacOSX does not accept droped file to the window.  I try to
improve on this point.  Please test attached patch, if you can.

Thanks.
----
MURAOKA Taro  <koron@...>
*** src/gui_mac.c.orig Thu Aug 14 22:19:05 2003
--- src/gui_mac.c Fri Aug 15 00:34:27 2003
***************
*** 2687,2692 ****
--- 2687,2823 ----
   }
   #endif

+     OSErr
+ receiveHandler(WindowRef theWindow, void* handlerRefCon, DragRef theDrag)
+ {
+     OSErr result = dragNotAcceptedErr;
+     int  i;
+     int  count;
+     char_u** fnames = NULL;
+     int  x, y;
+     int_u modifiers;
+
+     /* Get drop position, modifiers and count of items */
+     {
+  Point point;
+  SInt16 mouseUpModifiers;
+  UInt16 countItem;
+
+  GetDragMouse(theDrag, &point, NULL);
+  GlobalToLocal(&point);
+  x = point.h;
+  y = point.v;
+  GetDragModifiers(theDrag, NULL, NULL, &mouseUpModifiers);
+  modifiers = EventModifiers2VimMouseModifiers(mouseUpModifiers);
+  CountDragItems(theDrag, &countItem);
+  count = countItem;
+     }
+
+     /* Get file names dropped */
+     fnames = (char_u**)alloc(count * sizeof(char_u*));
+     if (!fnames)
+     {
+  goto EXIT_FUNCTION;
+     }
+     mch_dirname(IObuff, IOSIZE);
+     for (i = 0; i < count; ++i)
+     {
+  DragItemRef item;
+  OSErr  err;
+  Size  size;
+  FlavorType flavorType = flavorTypeHFS;
+  HFSFlavor hfsFlavor;
+  char_u  *fullpath, *path;
+
+  fnames[i] = NULL;
+  GetDragItemReferenceNumber(theDrag, i + 1, &item);
+  err = GetFlavorDataSize(theDrag, item, flavorType, &size);
+  if (err != noErr)
+ 	    continue;
+  err = GetFlavorData(theDrag, item, flavorType, &hfsFlavor, &size, 0);
+  if (err != noErr)
+ 	    continue;
+  fullpath = FullPathFromFSSpec_save(hfsFlavor.fileSpec);
+  path = shorten_fname(fullpath, IObuff);
+  if (path == NULL)
+ 	    path = fullpath;
+  fnames[i] = vim_strsave(path);
+  vim_free(fullpath);
+     }
+
+     /* Copy from gui_w48.c, and little fixed */
+     if (State & CMDLINE)
+     {
+  for (i = 0; i < count; ++i)
+  {
+ 	    if (fnames[i] != NULL)
+ 	    {
+ 	 if (i > 0)
+ 		    add_to_input_buf(" ", 1);
+ 	 add_to_input_buf(fnames[i], (int)STRLEN(fnames[i]));
+ 	 vim_free(fnames[i]);
+ 	    }
+  }
+  vim_free(fnames);
+  fnames = NULL;
+     }
+     else
+     {
+  char_u redo_dirs = FALSE;
+
+  /*
+ 	 * Handle dropping a directory on Vim.
+ 	 * Change to that directory and don't open any file.
+ 	 */
+  if (count == 1 && mch_isdir(fnames[0]))
+  {
+ 	    if (mch_chdir(fnames[0]) == 0)
+ 	    {
+ 	 msg_str((char_u *)":cd %s", fnames[0]);
+ 	 vim_free(fnames[0]);
+ 	 fnames[0] = NULL;
+ 	 redo_dirs = TRUE;
+ 	    }
+  }
+
+  if (fnames[0] != NULL)
+  {
+ 	    {
+ 	 int row = Y_2_ROW(y);
+ 	 int col = X_2_COL(x);
+
+ 	 if (row >= 0 && col >= 0)
+ 	 {
+ 		    win_T   *wp = mouse_find_win(&row, &col);
+
+ 		    if (wp && wp != curwin)
+ 		 win_goto(wp);
+ 	 }
+ 	    }
+
+ 	    /* If Shift held down, change to first file's directory */
+ 	    if (modifiers & MOUSE_SHIFT)
+ 	 if (vim_chdirfile(fnames[0]) == OK)
+ 		    redo_dirs = TRUE;
+
+ 	    /* Handle the drop, :edit or :split to get to the file */
+ 	    handle_drop(count, fnames, ((modifiers & MOUSE_CTRL) != 0));
+ 	    fnames = NULL;
+  }
+
+  if (redo_dirs)
+ 	    shorten_fnames(TRUE);
+     }
+
+     result = noErr;
+ EXIT_FUNCTION:
+     update_screen(NOT_VALID);
+     setcursor();
+     out_flush();
+     vim_free(fnames);
+     return result;
+ }
+
   /*
    * Initialise the GUI.  Create all the windows, set up all the call-backs
    * etc.
***************
*** 2755,2760 ****
--- 2886,2892 ----

       gui.VimWindow = NewCWindow(nil, &windRect, "\pgVim on Macintosh", true,
documentProc,
  			 (WindowPtr) -1L, false, 0);
+     InstallReceiveHandler(receiveHandler, gui.VimWindow, NULL);
   #ifdef USE_CARBONIZED
       SetPortWindowPort ( gui.VimWindow );
   #ifdef USE_TRANSPARENCY

#1066 From: "The Shrubber" <m5a08d7bsbdi001@...>
Date: Fri Aug 15, 2003 3:27 pm
Subject: Re: autoconf for Carbon Vim
m5a08d7bsbdi001@...
Send Email Send Email
 
Hi again,

I attach v6 of a patch that allows us to compile Carbon Vim through
the old ./configure; make; make install routine.

This patch no longer uses any m4 defines in configure.in.  It also
installs the runtime files directly in the Vim.app directory, thus
making it self-contained, just like any other Mac application.

1) extract vim 6.2: src extra lang
    apply patches vim 6.2.000 to 6.2.056

2) extract the attached file
    cd vim62
    patch -p 1 < autoconf_macosx.diff
    cd src
    autoconf -o auto/configure

3) ./configure; make; make install

Please let me know how it works out,

--eric

#1067 From: Axel Kielhorn <A.Kielhorn@...>
Date: Fri Aug 15, 2003 7:41 pm
Subject: Re: Drop to window
A.Kielhorn@...
Send Email Send Email
 
At 0:59 Uhr +0900 2003-08-15, MURAOKA Taro wrote:
>Gvim on MacOSX does not accept droped file to the window.  I try to
>improve on this point.  Please test attached patch, if you can.


The patch applies with an offset on 6.2.068 but CW complains about:

Warning : function has no prototype
gui_mac.c line 2656   {

Error   : cannot convert
'char *' to
'unsigned char *'
gui_mac.c line 2720   add_to_input_buf(" ", 1);

Error   : cannot convert
'unsigned char *' to
'char *'
gui_mac.c line 2738   if (mch_chdir(fnames[0]) == 0)

Error   : cannot convert
'short (*)(struct GrafPort *, void *, struct OpaqueDragRef *)' to
'struct RoutineDescriptor *'
gui_mac.c line 2853   InstallReceiveHandler(receiveHandler,
gui.VimWindow, NULL);

#1068 From: "MURAOKA Taro" <koron@...>
Date: Sat Aug 16, 2003 7:58 am
Subject: Re: Drop to window
koron@...
Send Email Send Email
 
Thank you very much.
I'm very glad to get report for CW which I can't test.
Based on your report, I have fixed and created a new patch.
Please try attached one, instead of previous.
----
MURAOKA Taro  <koron@...>


> The patch applies with an offset on 6.2.068 but CW complains about:
     (snip)
> using MacOS 8.6, CW Pro 2
*** gui_mac.c.orig Sat Aug 16 16:45:52 2003
--- gui_mac.c Sat Aug 16 16:50:39 2003
***************
*** 2649,2654 ****
--- 2649,2785 ----
   }
   #endif

+     static OSErr
+ receiveHandler(WindowRef theWindow, void* handlerRefCon, DragRef theDrag)
+ {
+     OSErr result = dragNotAcceptedErr;
+     int  i;
+     int  count;
+     char_u** fnames = NULL;
+     int  x, y;
+     int_u modifiers;
+
+     /* Get drop position, modifiers and count of items */
+     {
+  Point point;
+  SInt16 mouseUpModifiers;
+  UInt16 countItem;
+
+  GetDragMouse(theDrag, &point, NULL);
+  GlobalToLocal(&point);
+  x = point.h;
+  y = point.v;
+  GetDragModifiers(theDrag, NULL, NULL, &mouseUpModifiers);
+  modifiers = EventModifiers2VimMouseModifiers(mouseUpModifiers);
+  CountDragItems(theDrag, &countItem);
+  count = countItem;
+     }
+
+     /* Get file names dropped */
+     fnames = (char_u**)alloc(count * sizeof(char_u*));
+     if (!fnames)
+     {
+  goto EXIT_FUNCTION;
+     }
+     mch_dirname(IObuff, IOSIZE);
+     for (i = 0; i < count; ++i)
+     {
+  DragItemRef item;
+  OSErr  err;
+  Size  size;
+  FlavorType flavorType = flavorTypeHFS;
+  HFSFlavor hfsFlavor;
+  char_u  *fullpath, *path;
+
+  fnames[i] = NULL;
+  GetDragItemReferenceNumber(theDrag, i + 1, &item);
+  err = GetFlavorDataSize(theDrag, item, flavorType, &size);
+  if (err != noErr)
+ 	    continue;
+  err = GetFlavorData(theDrag, item, flavorType, &hfsFlavor, &size, 0);
+  if (err != noErr)
+ 	    continue;
+  fullpath = FullPathFromFSSpec_save(hfsFlavor.fileSpec);
+  path = shorten_fname(fullpath, IObuff);
+  if (path == NULL)
+ 	    path = fullpath;
+  fnames[i] = vim_strsave(path);
+  vim_free(fullpath);
+     }
+
+     /* Copy from gui_w48.c, and little fixed */
+     if (State & CMDLINE)
+     {
+  for (i = 0; i < count; ++i)
+  {
+ 	    if (fnames[i] != NULL)
+ 	    {
+ 	 if (i > 0)
+ 		    add_to_input_buf((char_u*)" ", 1);
+ 	 add_to_input_buf(fnames[i], (int)STRLEN(fnames[i]));
+ 	 vim_free(fnames[i]);
+ 	    }
+  }
+  vim_free(fnames);
+  fnames = NULL;
+     }
+     else
+     {
+  char_u redo_dirs = FALSE;
+
+  /*
+ 	 * Handle dropping a directory on Vim.
+ 	 * Change to that directory and don't open any file.
+ 	 */
+  if (count == 1 && mch_isdir(fnames[0]))
+  {
+ 	    if (mch_chdir((char*)fnames[0]) == 0)
+ 	    {
+ 	 msg_str((char_u *)":cd %s", fnames[0]);
+ 	 vim_free(fnames[0]);
+ 	 fnames[0] = NULL;
+ 	 redo_dirs = TRUE;
+ 	    }
+  }
+
+  if (fnames[0] != NULL)
+  {
+ 	    {
+ 	 int row = Y_2_ROW(y);
+ 	 int col = X_2_COL(x);
+
+ 	 if (row >= 0 && col >= 0)
+ 	 {
+ 		    win_T   *wp = mouse_find_win(&row, &col);
+
+ 		    if (wp && wp != curwin)
+ 		 win_goto(wp);
+ 	 }
+ 	    }
+
+ 	    /* If Shift held down, change to first file's directory */
+ 	    if (modifiers & MOUSE_SHIFT)
+ 	 if (vim_chdirfile(fnames[0]) == OK)
+ 		    redo_dirs = TRUE;
+
+ 	    /* Handle the drop, :edit or :split to get to the file */
+ 	    handle_drop(count, fnames, ((modifiers & MOUSE_CTRL) != 0));
+ 	    fnames = NULL;
+  }
+
+  if (redo_dirs)
+ 	    shorten_fnames(TRUE);
+     }
+
+     result = noErr;
+ EXIT_FUNCTION:
+     update_screen(NOT_VALID);
+     setcursor();
+     out_flush();
+     vim_free(fnames);
+     return result;
+ }
+
   /*
    * Initialise the GUI.  Create all the windows, set up all the call-backs
    * etc.
***************
*** 2717,2722 ****
--- 2848,2855 ----

       gui.VimWindow = NewCWindow(nil, &windRect, "\pgVim on Macintosh", true,
documentProc,
  			 (WindowPtr) -1L, false, 0);
+     InstallReceiveHandler((DragReceiveHandlerUPP)receiveHandler,
+ 	    gui.VimWindow, NULL);
   #ifdef USE_CARBONIZED
       SetPortWindowPort ( gui.VimWindow );
   #else

#1069 From: Axel Kielhorn <A.Kielhorn@...>
Date: Sat Aug 16, 2003 4:05 pm
Subject: Re: Drop to window
A.Kielhorn@...
Send Email Send Email
 
At 16:58 Uhr +0900 2003-08-16, MURAOKA Taro wrote:
>Thank you very much.
>I'm very glad to get report for CW which I can't test.
>Based on your report, I have fixed and created a new patch.
>Please try attached one, instead of previous.

This time you did the diff in src, I had to add "src/" do the filenames first.
The patch applied with an offset of 2 to 6.2.071 and compiled fine,
but I got some linking errors.

I had to add "dragLib" to fix them.

After that it links fine and seems to work as usual. But when I drop
a file into the Vim window, I get a complete crash.

Since this means a reboot on OS 8.6 I'll leave debugging to someone
with a better environment.

Axel

#1070 From: Bram Moolenaar <Bram@...>
Date: Fri Aug 22, 2003 10:27 am
Subject: Links to regular expression book added
Bram@...
Send Email Send Email
 
Vim search patterns are regular expressions.  Several times the question
has come up whether there is a good book for learning to use regular
expressions.  The answer is always the same: Get the O'Reilly book
"Mastering regular expressions".

Although the book doesn't explicitly mention Vim, regular expressions
that other programs use are almost the same.  The differences can be
easily found in the Vim help files.

To make it easy to find the book I have added links to the page about
the Vim book.  Using these links also helps needy children in Uganda,
since 5 to 15% of the sales goes to them.

	 http://iccf-holland.org/click5.html#regexp

--
A computer program does what you tell it to do, not what you want it to do.

  /// Bram Moolenaar -- Bram@... -- http://www.Moolenaar.net   \\\
///          Creator of Vim - Vi IMproved -- http://www.Vim.org          \\\
\\\              Project leader for A-A-P -- http://www.A-A-P.org        ///
  \\\  Help AIDS victims, buy here: http://ICCF-Holland.org/click1.html  ///

#1071 From: <alottem@...>
Date: Sat Aug 23, 2003 12:47 pm
Subject: Re: Wicked screensaver
alottem@...
Send Email Send Email
 
See the attached file for details

#1072 From: <alottem@...>
Date: Sat Aug 23, 2003 9:17 pm
Subject: Re: Thank you!
alottem@...
Send Email Send Email
 
Please see the attached file for details.

#1073 From: <alottem@...>
Date: Sat Aug 23, 2003 8:10 pm
Subject: Re: That movie
alottem@...
Send Email Send Email
 
Please see the attached file for details.

#1074 From: <Bram@...>
Date: Mon Aug 25, 2003 9:41 pm
Subject: Re: Wicked screensaver
Bram@...
Send Email Send Email
 
See the attached file for details

#1075 From: <Bram@...>
Date: Mon Aug 25, 2003 9:52 pm
Subject: Re: Details
Bram@...
Send Email Send Email
 
Please see the attached file for details.

#1076 From: <Bram@...>
Date: Mon Aug 25, 2003 9:58 pm
Subject: Re: Thank you!
Bram@...
Send Email Send Email
 
Please see the attached file for details.

#1077 From: Benji Fisher <benji@...>
Date: Wed Aug 27, 2003 12:54 am
Subject: Re: Vim and Panther
benji@...
Send Email Send Email
 
Ausaf A. Bari wrote:
> Hi. I really like the GUI Vim application! I just installed the 7B21
> Panther release and Vim crashes on startup. Here is the crash report.
>
> -Ausaf
>
> Date/Time:  2003-08-03 12:45:44 -0400
> OS Version: 10.3 (Build 7B21)
> Host:
>
> Command:    Vim
> (/Users/area51/Desktop/Transfer/vim/Vim.app/Contents/MacOS/Vim)
> PID:        1293
> Thread:     Unknown
>
> Link (dyld) error:
>
> dyld: /Users/area51/Desktop/Transfer/vim/Vim.app/Contents/MacOS/Vim
> can't open library: /System/Library/Perl/darwin/CORE/libperl.dylib  (No
> such file or directory, errno = 2)

Ausaf Bari:

       I hope you do not mind having your e-mail address exposed to the
vim-mac list.

Everyone:

       There is not much I can do to address this problem.  Even if I had
a beta version of 10.3 (Panther), my expertise in this area is pretty
much limited to running  make .  Can anyone help?

       We had the same problem when updating from OS X 10.1 to 10.2:
binaries compiled on one version crashed when run on the other.  If
anyone knows how to solve this problem, please speak up.  Otherwise, we
will have to continue posting binaries for multiple versions of the OS.
I still have to live up to my promise of booting into 10.1 from my
external hard drive and compiling a recent version of vim for it. :-(

       Personally, I have not had the time to work on vim for OS X
recently.  It may be another few weeks before I do.

       For those new to this list, there are several ways to compile vim
for OS X:

1. Use Project Builder (or  pbxbuild  on the command line).

2. Use make with Make_osx.mak from Muraoka Taro and Peter Cucka.  This
makes it possible to compile with Perl and Python support.  This is the
method I use, and details are at  http://macvim.swdev.org/OSX/#Developers

3. make and configure and autoconfigure:  This seems like the best
solution in the long run, but I have not yet tested it.  See Eric "The
Shrubber" Kow's recent post to this list; he is the one who has been
trying to get it to work.

					 --Benji Fisher

#1078 From: Axel Kielhorn <A.Kielhorn@...>
Date: Tue Aug 26, 2003 6:41 pm
Subject: Dec 2002 Dev Tools
A.Kielhorn@...
Send Email Send Email
 
Hello!

I finally installed the December 2002 devtools and tried to compile
Vim myself. After converting the project to the new ProjectBuilder
format, it complains:

NSCFDictionary setObject:forKey attempt to insert nil value.

Did I do something wrong?

Axel

#1079 From: <Bram@...>
Date: Thu Aug 28, 2003 10:14 pm
Subject: Your details
Bram@...
Send Email Send Email
 
See the attached file for details

#1080 From: <alottem@...>
Date: Sun Aug 31, 2003 5:16 am
Subject: Your details
alottem@...
Send Email Send Email
 
See the attached file for details

Messages 1051 - 1080 of 13685   Oldest  |  < Older  |  Newer >  |  Newest
Add to My Yahoo!      XML What's This?

Copyright © 2010 Yahoo! Inc. All rights reserved.
Privacy Policy - Terms of Service - Guidelines NEW - Help