Permalink
Browse files

Merged from the latest developing branch.

git-svn-id: https://vim.svn.sourceforge.net/svnroot/vim/trunk@1480 2a77ed30-b011-0410-a7ad-c7884a0aa172
  • Loading branch information...
1 parent ff5258c commit 50c335c3f6111102214f38630f628557906d19e2 edyfox committed May 22, 2009
Showing with 715 additions and 610 deletions.
  1. +409 −241 src/auto/configure
  2. +3 −0 src/config.h.in
  3. +29 −2 src/configure.in
  4. +5 −5 src/gui.c
  5. +37 −54 src/gui_at_fs.c
  6. +34 −45 src/gui_at_sb.c
  7. +29 −44 src/gui_athena.c
  8. +4 −4 src/gui_beval.c
  9. +50 −71 src/gui_motif.c
  10. +54 −69 src/gui_x11.c
  11. +8 −12 src/gui_xmdlg.c
  12. +20 −14 src/gui_xmebw.c
  13. +8 −16 src/if_python.c
  14. +4 −0 src/version.c
  15. +6 −12 src/window.c
  16. +15 −21 src/workshop.c
View

Large diffs are not rendered by default.

Oops, something went wrong.
View
@@ -39,6 +39,9 @@
/* Defined to the size of an int */
#undef SIZEOF_INT
+/* Define when wchar_t is only 2 bytes. */
+#undef SMALL_WCHAR_T
+
/*
* If we cannot trust one of the following from the libraries, we use our
* own safe but probably slower vim_memmove().
View
@@ -1193,6 +1193,28 @@ else
LDFLAGS="$ac_save_LDFLAGS"
+ AC_MSG_CHECKING(size of wchar_t is 2 bytes)
+ AC_CACHE_VAL(ac_cv_small_wchar_t,
+ [AC_TRY_RUN([
+#include <X11/Xlib.h>
+#if STDC_HEADERS
+# include <stdlib.h>
+# include <stddef.h>
+#endif
+ main()
+ {
+ if (sizeof(wchar_t) <= 2)
+ exit(1);
+ exit(0);
+ }],
+ ac_cv_small_wchar_t="no",
+ ac_cv_small_wchar_t="yes",
+ AC_MSG_ERROR(failed to compile test program))])
+ AC_MSG_RESULT($ac_cv_small_wchar_t)
+ if test "x$ac_cv_small_wchar_t" = "xyes" ; then
+ AC_DEFINE(SMALL_WCHAR_T)
+ fi
+
fi
fi
@@ -2100,14 +2122,20 @@ AC_CHECK_HEADERS(stdarg.h stdlib.h string.h sys/select.h sys/utsname.h \
sys/stream.h termios.h libc.h sys/statfs.h \
poll.h sys/poll.h pwd.h utime.h sys/param.h libintl.h \
libgen.h util/debug.h util/msg18n.h frame.h \
- sys/acl.h sys/access.h sys/sysctl.h sys/sysinfo.h wchar.h wctype.h)
+ sys/acl.h sys/access.h sys/sysinfo.h wchar.h wctype.h)
dnl sys/ptem.h depends on sys/stream.h on Solaris
AC_CHECK_HEADERS(sys/ptem.h, [], [],
[#if defined HAVE_SYS_STREAM_H
# include <sys/stream.h>
#endif])
+dnl sys/sysctl.h depends on sys/param.h on OpenBSD
+AC_CHECK_HEADERS(sys/sysctl.h, [], [],
+[#if defined HAVE_SYS_PARAM_H
+# include <sys/param.h>
+#endif])
+
dnl pthread_np.h may exist but can only be used after including pthread.h
AC_MSG_CHECKING([for pthread_np.h])
@@ -2875,7 +2903,6 @@ main()
AC_MSG_RESULT($ac_cv_sizeof_int)
AC_DEFINE_UNQUOTED(SIZEOF_INT, $ac_cv_sizeof_int)
-
dnl Check for memmove() before bcopy(), makes memmove() be used when both are
dnl present, fixes problem with incompatibility between Solaris 2.4 and 2.5.
View
@@ -3119,7 +3119,7 @@ static int prev_which_scrollbars[3];
*/
void
gui_init_which_components(oldval)
- char_u *oldval;
+ char_u *oldval UNUSED;
{
#ifdef FEAT_MENU
static int prev_menu_is_active = -1;
@@ -4668,8 +4668,8 @@ gui_mouse_correct()
*/
static win_T *
xy2win(x, y)
- int x;
- int y;
+ int x UNUSED;
+ int y UNUSED;
{
#ifdef FEAT_WINDOWS
int row;
@@ -5121,8 +5121,8 @@ gui_wingoto_xy(x, y)
*/
void
gui_handle_drop(x, y, modifiers, fnames, count)
- int x;
- int y;
+ int x UNUSED;
+ int y UNUSED;
int_u modifiers;
char_u **fnames;
int count;
View
@@ -829,7 +829,7 @@ SFsetText(path)
text.format = FMT8BIT;
#ifdef XtNinternational
- if (_XawTextFormat((TextWidget)selFileField) == XawFmtWide)
+ if ((unsigned long)_XawTextFormat((TextWidget)selFileField) == XawFmtWide)
{
XawTextReplace(selFileField, (XawTextPosition)0,
(XawTextPosition)WcsLen((wchar_t *)&SFtextBuffer[0]), &text);
@@ -851,17 +851,15 @@ SFsetText(path)
#endif
}
-/* ARGSUSED */
static void
SFbuttonPressList(w, n, event)
- Widget w;
- int n;
- XButtonPressedEvent *event;
+ Widget w UNUSED;
+ int n UNUSED;
+ XButtonPressedEvent *event UNUSED;
{
SFbuttonPressed = 1;
}
-/* ARGSUSED */
static void
SFbuttonReleaseList(w, n, event)
Widget w;
@@ -989,11 +987,10 @@ SFcheckFiles(dir)
return result;
}
-/* ARGSUSED */
static void
SFdirModTimer(cl, id)
- XtPointer cl;
- XtIntervalId *id;
+ XtPointer cl UNUSED;
+ XtIntervalId *id UNUSED;
{
static int n = -1;
static int f = 0;
@@ -1596,11 +1593,10 @@ SFscrollTimerInterval()
static void SFscrollTimer __ARGS((XtPointer p, XtIntervalId *id));
-/* ARGSUSED */
static void
SFscrollTimer(p, id)
XtPointer p;
- XtIntervalId *id;
+ XtIntervalId *id UNUSED;
{
SFDir *dir;
int save;
@@ -1695,10 +1691,9 @@ SFnewInvertEntry(n, event)
}
}
-/* ARGSUSED */
static void
SFenterList(w, n, event)
- Widget w;
+ Widget w UNUSED;
int n;
XEnterWindowEvent *event;
{
@@ -1719,12 +1714,11 @@ SFenterList(w, n, event)
}
}
-/* ARGSUSED */
static void
SFleaveList(w, n, event)
- Widget w;
+ Widget w UNUSED;
int n;
- XEvent *event;
+ XEvent *event UNUSED;
{
if (SFcurrentInvert[n] != -1)
{
@@ -1733,10 +1727,9 @@ SFleaveList(w, n, event)
}
}
-/* ARGSUSED */
static void
SFmotionList(w, n, event)
- Widget w;
+ Widget w UNUSED;
int n;
XMotionEvent *event;
{
@@ -1754,7 +1747,6 @@ SFmotionList(w, n, event)
}
}
-/* ARGSUSED */
static void
SFvFloatSliderMovedCallback(w, n, fnew)
Widget w;
@@ -1767,10 +1759,9 @@ SFvFloatSliderMovedCallback(w, n, fnew)
SFvSliderMovedCallback(w, (int)(long)n, nw);
}
-/* ARGSUSED */
static void
SFvSliderMovedCallback(w, n, nw)
- Widget w;
+ Widget w UNUSED;
int n;
int nw;
{
@@ -1853,10 +1844,9 @@ SFvSliderMovedCallback(w, n, nw)
}
}
-/* ARGSUSED */
static void
SFvAreaSelectedCallback(w, n, pnew)
- Widget w;
+ Widget w;
XtPointer n;
XtPointer pnew;
{
@@ -1914,10 +1904,9 @@ SFvAreaSelectedCallback(w, n, pnew)
SFvSliderMovedCallback(w, (int)(long)n, nw);
}
-/* ARGSUSED */
static void
SFhSliderMovedCallback(w, n, nw)
- Widget w;
+ Widget w UNUSED;
XtPointer n;
XtPointer nw;
{
@@ -1933,10 +1922,9 @@ SFhSliderMovedCallback(w, n, nw)
SFdrawList((int)(long)n, SF_DO_NOT_SCROLL);
}
-/* ARGSUSED */
static void
SFhAreaSelectedCallback(w, n, pnew)
- Widget w;
+ Widget w;
XtPointer n;
XtPointer pnew;
{
@@ -1994,11 +1982,10 @@ SFhAreaSelectedCallback(w, n, pnew)
}
}
-/* ARGSUSED */
static void
SFpathSliderMovedCallback(w, client_data, nw)
- Widget w;
- XtPointer client_data;
+ Widget w UNUSED;
+ XtPointer client_data UNUSED;
XtPointer nw;
{
SFDir *dir;
@@ -2031,11 +2018,10 @@ SFpathSliderMovedCallback(w, client_data, nw)
XawTextSetInsertionPoint(selFileField, pos);
}
-/* ARGSUSED */
static void
SFpathAreaSelectedCallback(w, client_data, pnew)
Widget w;
- XtPointer client_data;
+ XtPointer client_data UNUSED;
XtPointer pnew;
{
int nw = (int)(long)pnew;
@@ -2206,13 +2192,12 @@ static char *oneLineTextEditTranslations = "\
static void SFexposeList __ARGS((Widget w, XtPointer n, XEvent *event, Boolean *cont));
-/* ARGSUSED */
static void
SFexposeList(w, n, event, cont)
- Widget w;
+ Widget w UNUSED;
XtPointer n;
XEvent *event;
- Boolean *cont;
+ Boolean *cont UNUSED;
{
if ((event->type == NoExpose) || event->xexpose.count)
return;
@@ -2222,13 +2207,12 @@ SFexposeList(w, n, event, cont)
static void SFmodVerifyCallback __ARGS((Widget w, XtPointer client_data, XEvent *event, Boolean *cont));
-/* ARGSUSED */
static void
SFmodVerifyCallback(w, client_data, event, cont)
- Widget w;
- XtPointer client_data;
+ Widget w UNUSED;
+ XtPointer client_data UNUSED;
XEvent *event;
- Boolean *cont;
+ Boolean *cont UNUSED;
{
char buf[2];
@@ -2241,11 +2225,11 @@ SFmodVerifyCallback(w, client_data, event, cont)
static void SFokCallback __ARGS((Widget w, XtPointer cl, XtPointer cd));
-/* ARGSUSED */
static void
SFokCallback(w, cl, cd)
- Widget w;
- XtPointer cl, cd;
+ Widget w UNUSED;
+ XtPointer cl UNUSED;
+ XtPointer cd UNUSED;
{
SFstatus = SEL_FILE_OK;
}
@@ -2258,11 +2242,11 @@ static XtCallbackRec SFokSelect[] =
static void SFcancelCallback __ARGS((Widget w, XtPointer cl, XtPointer cd));
-/* ARGSUSED */
static void
SFcancelCallback(w, cl, cd)
- Widget w;
- XtPointer cl, cd;
+ Widget w UNUSED;
+ XtPointer cl UNUSED;
+ XtPointer cd UNUSED;
{
SFstatus = SEL_FILE_CANCEL;
}
@@ -2275,16 +2259,15 @@ static XtCallbackRec SFcancelSelect[] =
static void SFdismissAction __ARGS((Widget w, XEvent *event, String *params, Cardinal *num_params));
-/* ARGSUSED */
static void
SFdismissAction(w, event, params, num_params)
- Widget w;
- XEvent *event;
- String *params;
- Cardinal *num_params;
+ Widget w UNUSED;
+ XEvent *event;
+ String *params UNUSED;
+ Cardinal *num_params UNUSED;
{
- if (event->type == ClientMessage &&
- event->xclient.data.l[0] != SFwmDeleteWindow)
+ if (event->type == ClientMessage
+ && (Atom)event->xclient.data.l[0] != SFwmDeleteWindow)
return;
SFstatus = SEL_FILE_CANCEL;
@@ -2703,7 +2686,7 @@ SFcreateWidgets(toplevel, prompt, ok, cancel)
SFtextChanged()
{
#if defined(FEAT_XFONTSET) && defined(XtNinternational)
- if (_XawTextFormat((TextWidget)selFileField) == XawFmtWide)
+ if ((unsigned long)_XawTextFormat((TextWidget)selFileField) == XawFmtWide)
{
wchar_t *wcbuf=(wchar_t *)SFtextBuffer;
@@ -2749,7 +2732,7 @@ SFgetText()
#if defined(FEAT_XFONTSET) && defined(XtNinternational)
char *buf;
- if (_XawTextFormat((TextWidget)selFileField) == XawFmtWide)
+ if ((unsigned long)_XawTextFormat((TextWidget)selFileField) == XawFmtWide)
{
wchar_t *wcbuf;
int mbslength;
Oops, something went wrong.

0 comments on commit 50c335c

Please sign in to comment.