From a38edcde16bd424133c832a508d8f1fc6b9c9a65 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Thu, 10 May 2007 17:46:55 +0000
Subject: [PATCH] updated for version 7.1b
---
src/Makefile | 6 ++++--
src/gui_xmebw.c | 4 ++--
src/gui_xmebw.h | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/src/Makefile b/src/Makefile
index 90548a5231..b1ac46f9d3 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -886,7 +886,7 @@ MAN1DIR = /man1
### Vim version (adjusted by a script)
VIMMAJOR = 7
-VIMMINOR = 1a
+VIMMINOR = 1b
### Location of Vim files (should not need to be changed, and {{{1
### 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.
# If there is a real error, there will be a difference between "test.out" and
# 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:
$(MAKE) -f Makefile $(VIMTARGET)
@@ -2563,6 +2563,8 @@ install_macosx: gui_bundle
VIMRTLOC=$(DESTDIR)$(prefix)/$(RESDIR)/vim/runtime
# Put the link back.
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.
gui_bundle: $(RESDIR) bundle-dir bundle-executable bundle-info bundle-resource \
diff --git a/src/gui_xmebw.c b/src/gui_xmebw.c
index be218d1781..85f25cd0e1 100644
--- a/src/gui_xmebw.c
+++ b/src/gui_xmebw.c
@@ -50,7 +50,7 @@
* implementation. Also missing in Motif 1.2 and earlier.
*
* 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.
*/
#if defined(LESSTIF_VERSION) || (XmVersion <= 1002)
@@ -1091,7 +1091,7 @@ SetValues(Widget current, Widget request, Widget new, ArgList args, Cardinal *n)
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: */
XGetGeometry(dpy, XtWindow(cur), &root, &r_x, &r_y, &r_width,
diff --git a/src/gui_xmebw.h b/src/gui_xmebw.h
index 4d9980c7f1..da4812ea7a 100644
--- a/src/gui_xmebw.h
+++ b/src/gui_xmebw.h
@@ -61,7 +61,7 @@
#define XmIsEnhancedButton(w) XtIsSubclass(w, xmEnhancedButtonWidgetClass)
/*
- * Convienience creation function.
+ * Convenience creation function.
*/
extern Widget XgCreateEPushButtonWidget(Widget, char *, ArgList, Cardinal);
--
GitLab