aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-25 10:54:51 -04:00
Code

updated for version 7.1b

Browse Source
This commit is contained in:
Bram Moolenaar 2007-05-10 17:46:55 +00:00
parent 29466f2b4f
commit a38edcde16
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/Makefile
View File

@ -886,7 +886,7 @@ MAN1DIR = /man1
### Vim version (adjusted by a script) ### Vim version (adjusted by a script)
VIMMAJOR = 7 VIMMAJOR = 7
VIMMINOR = 1a VIMMINOR = 1b
### Location of Vim files (should not need to be changed, and {{{1 ### Location of Vim files (should not need to be changed, and {{{1
### some things might not work when they are changed!) ### some things might not work when they are changed!)
@ -1718,7 +1718,7 @@ types.vim: $(TAGS_SRC) $(TAGS_INCL)
# messages. Don't worry about that. # messages. Don't worry about that.
# If there is a real error, there will be a difference between "test.out" and # If there is a real error, there will be a difference between "test.out" and
# a "test99.ok" file. # a "test99.ok" file.
# If everything is allright, the final message will be "ALL DONE". # If everything is alright, the final message will be "ALL DONE".
# #
test check: test check:
$(MAKE) -f Makefile $(VIMTARGET) $(MAKE) -f Makefile $(VIMTARGET)
@ -2563,6 +2563,8 @@ install_macosx: gui_bundle
VIMRTLOC=$(DESTDIR)$(prefix)/$(RESDIR)/vim/runtime VIMRTLOC=$(DESTDIR)$(prefix)/$(RESDIR)/vim/runtime
# Put the link back. # Put the link back.
ln -s `pwd`/../runtime $(RESDIR)/vim ln -s `pwd`/../runtime $(RESDIR)/vim
# Copy rgb.txt, Mac doesn't always have X11
$(INSTALL_DATA) $(SCRIPTSOURCE)/rgb.txt $(DESTDIR)$(prefix)/$(RESDIR)/vim/runtime
# TODO: Create the vimtutor application. # TODO: Create the vimtutor application.
gui_bundle: $(RESDIR) bundle-dir bundle-executable bundle-info bundle-resource \ gui_bundle: $(RESDIR) bundle-dir bundle-executable bundle-info bundle-resource \

4
src/gui_xmebw.c
View File

@ -50,7 +50,7 @@
* implementation. Also missing in Motif 1.2 and earlier. * implementation. Also missing in Motif 1.2 and earlier.
* *
* We neither use XmeGetPixmapData or _XmGetPixmapData, since with LessTif the * We neither use XmeGetPixmapData or _XmGetPixmapData, since with LessTif the
* pixmap will not appear in it's caches properly. We cache the interresting * pixmap will not appear in it's caches properly. We cache the interesting
* values in XmEnhancedButtonPart instead ourself. * values in XmEnhancedButtonPart instead ourself.
*/ */
#if defined(LESSTIF_VERSION) || (XmVersion <= 1002) #if defined(LESSTIF_VERSION) || (XmVersion <= 1002)
@ -1091,7 +1091,7 @@ SetValues(Widget current, Widget request, Widget new, ArgList args, Cardinal *n)
unsigned int mask; unsigned int mask;
/* /*
* Aritificially let the highlight appear if the mouse is over us. * Artificially let the highlight appear if the mouse is over us.
*/ */
/* Best way to get the root window of object: */ /* Best way to get the root window of object: */
XGetGeometry(dpy, XtWindow(cur), &root, &r_x, &r_y, &r_width, XGetGeometry(dpy, XtWindow(cur), &root, &r_x, &r_y, &r_width,

2
src/gui_xmebw.h
View File

@ -61,7 +61,7 @@
#define XmIsEnhancedButton(w) XtIsSubclass(w, xmEnhancedButtonWidgetClass) #define XmIsEnhancedButton(w) XtIsSubclass(w, xmEnhancedButtonWidgetClass)
/* /*
* Convienience creation function. * Convenience creation function.
*/ */
extern Widget XgCreateEPushButtonWidget(Widget, char *, ArgList, Cardinal); extern Widget XgCreateEPushButtonWidget(Widget, char *, ArgList, Cardinal);