Permalink
Browse files

Various small fixes from Dominique Pelle.

--HG--
branch : vim73
  • Loading branch information...
1 parent e2e6984 commit 011a08dc546465efb7b10691101a9a162842bebd @brammool brammool committed Jun 26, 2010
Showing with 1,412 additions and 1,089 deletions.
  1. +1 −1 runtime/doc/indent.txt
  2. +0 −1 runtime/doc/todo.txt
  3. +2 −2 src/INSTALL
  4. +2 −2 src/gui_gtk_x11.c
  5. +3 −3 src/gui_x11.c
  6. +8 −8 src/gui_xmdlg.c
  7. +1 −1 src/if_cscope.c
  8. +29 −29 src/if_mzsch.c
  9. +121 −125 src/mbyte.c
  10. +1 −1 src/netbeans.c
  11. +2 −2 src/ops.c
  12. +1 −3 src/os_vms.c
  13. +0 −2 src/os_win16.c
  14. +616 −450 src/po/uk.cp1251.po
  15. +616 −450 src/po/uk.po
  16. +5 −7 src/proto/mbyte.pro
  17. +1 −2 src/proto/netbeans.pro
  18. +3 −0 src/term.c
View
@@ -525,7 +525,7 @@ PHP indenting can be altered in several ways by modifying the values of some
variables:
*php-comment*
-To not enable auto-formating of comments by default (if you want to use your
+To not enable auto-formatting of comments by default (if you want to use your
own 'formatoptions'): >
:let g:PHP_autoformatcomment = 0
View
@@ -1099,7 +1099,6 @@ Vim 7.3:
dictionary: {'nr': 2, 'time': 1234, 'saved': 1}
Patches to include:
- Patch for Lisp support with ECL (Mikael Jansson, 2008 Oct 25)
-- Minor patches from Dominique Pelle, 2010 May 15
- Gvimext patch to support wide file names. (Szabolcs Horvat 2008 Sep 10)
- Patch to support netbeans for Mac. (Kazuki Sakamoto, 2009 Jun 25)
- Patch to support clipboard for Mac terminal. (Jjgod Jiang, 2009 Aug 1)
View
@@ -55,7 +55,7 @@ arguments.
GNU Autoconf and a few other tools have been used to make Vim work on many
different Unix systems. The advantage of this is that Vim should compile
-on most sytems without any adjustments. The disadvantage is that when
+on most systems without any adjustments. The disadvantage is that when
adjustments are required, it takes some time to understand what is happening.
If configure finds all library files and then complains when linking that some
@@ -138,7 +138,7 @@ work very well and there was no maintainer it was dropped.
Unix: COMPILING WITH MULTI-BYTE
When you want to compile with the multi-byte features enabled, make sure you
-compile on a machine where the locale settings actually work. otherwise the
+compile on a machine where the locale settings actually work, otherwise the
configure tests may fail. You need to compile with "big" features:
./configure --with-features=big
View
@@ -4013,7 +4013,7 @@ gui_mch_get_screen_dimensions(int *screen_w, int *screen_h)
/*
* FIXME: dirty trick: Because the gui_get_base_height() doesn't include
* the toolbar and menubar for GTK, we subtract them from the screen
- * hight, so that the window size can be made to fit on the screen.
+ * height, so that the window size can be made to fit on the screen.
* This should be completely changed later.
*/
*screen_w -= get_menu_tool_width();
@@ -4818,7 +4818,7 @@ count_cluster_cells(char_u *s, PangoItem *item,
* If ink_rect.x is negative Pango apparently has taken care of the composing
* by itself. Actually setting x_offset = 0 should be sufficient then, but due
* to problems with composing from different fonts we still need to fine-tune
- * x_offset to avoid uglyness.
+ * x_offset to avoid ugliness.
*
* If ink_rect.x is not negative, force overstriking by pointing x_offset to
* the position of the previous glyph. Apparently this happens only with old
View
@@ -1162,9 +1162,9 @@ gui_x11_mouse_cb(w, dud, event, dum)
/* ARGSUSED */
static void
gui_x11_sniff_request_cb(closure, source, id)
- XtPointer closure;
- int *source;
- XtInputId *id;
+ XtPointer closure UNUSED;
+ int *source UNUSED;
+ XtInputId *id UNUSED;
{
static char_u bytes[3] = {CSI, (int)KS_EXTRA, (int)KE_SNIFF};
View
@@ -168,7 +168,7 @@ name_part(char *font, char *buf)
get_part(font, 2, buf2);
get_part(font, 1, buf3);
- if (strlen(buf3))
+ if (*buf3 != NUL)
vim_snprintf(buf, TEMP_BUF_SIZE, "%s (%s)", buf2, buf3);
else
vim_snprintf(buf, TEMP_BUF_SIZE, "%s", buf2);
@@ -225,7 +225,7 @@ size_part(char *font, char *buf, int inPixels)
if (inPixels)
{
get_part(font, 7, buf);
- if (strlen(buf) > 0)
+ if (*buf != NUL)
{
size = atoi(buf);
sprintf(buf, "%3d", size);
@@ -234,7 +234,7 @@ size_part(char *font, char *buf, int inPixels)
else
{
get_part(font, 8, buf);
- if (strlen(buf) > 0)
+ if (*buf != NUL)
{
size = atoi(buf);
temp = (float)size / 10.0;
@@ -261,7 +261,7 @@ encoding_part(char *font, char *buf)
get_part(font, 13, buf1);
get_part(font, 14, buf2);
- if (strlen(buf1) > 0 && strlen(buf2))
+ if (*buf1 != NUL && *buf2 != NUL)
vim_snprintf(buf, TEMP_BUF_SIZE, "%s-%s", buf1, buf2);
if (!strcmp(buf, " "))
strcpy(buf, "-");
@@ -1229,10 +1229,10 @@ gui_xm_select_font(char_u *current)
size_part(found, sizebuf, data->in_pixels);
encoding_part(found, encodingbuf);
- if (strlen(namebuf) > 0
- && strlen(stylebuf) > 0
- && strlen(sizebuf) > 0
- && strlen(encodingbuf) > 0)
+ if (*namebuf != NUL
+ && *stylebuf != NUL
+ && *sizebuf != NUL
+ && *encodingbuf != NUL)
{
data->sel[NAME] = XtNewString(namebuf);
data->sel[STYLE] = XtNewString(stylebuf);
View
@@ -588,7 +588,7 @@ cs_add_common(arg1, arg2, flags)
)
{
fname[strlen(fname)-1] = '\0';
- if (strlen(fname) == 0)
+ if (fname[0] == '\0')
break;
}
if (fname[0] == '\0')
View
@@ -175,7 +175,7 @@ static int mzscheme_to_vim(Scheme_Object *obj, typval_T *tv, int depth,
#endif
#ifdef MZ_PRECISE_GC
-static int buffer_size_proc(void *obj)
+static int buffer_size_proc(void *obj UNUSED)
{
return gcBYTES_TO_WORDS(sizeof(vim_mz_buffer));
}
@@ -187,7 +187,7 @@ static int buffer_fixup_proc(void *obj)
{
return buffer_size_proc(obj);
}
-static int window_size_proc(void *obj)
+static int window_size_proc(void *obj UNUSED)
{
return gcBYTES_TO_WORDS(sizeof(vim_mz_window));
}
@@ -708,16 +708,16 @@ static void remove_timer(void);
/* timers are presented in GUI only */
# if defined(FEAT_GUI_W32)
static void CALLBACK
-timer_proc(HWND hwnd, UINT uMsg, UINT idEvent, DWORD dwTime)
+timer_proc(HWND hwnd UNUSED, UINT uMsg UNUSED, UINT idEvent UNUSED, DWORD dwTime UNUSED)
# elif defined(FEAT_GUI_GTK)
static gint
-timer_proc(gpointer data)
+timer_proc(gpointer data UNUSED)
# elif defined(FEAT_GUI_MOTIF) || defined(FEAT_GUI_ATHENA)
static void
-timer_proc(XtPointer timed_out, XtIntervalId *interval_id)
+timer_proc(XtPointer timed_out UNUSED, XtIntervalId *interval_id UNUSED)
# elif defined(FEAT_GUI_MAC)
pascal void
-timer_proc(EventLoopTimerRef theTimer, void *userData)
+timer_proc(EventLoopTimerRef theTimer UNUSED, void *userData UNUSED)
# endif
{
scheme_check_threads();
@@ -806,7 +806,7 @@ mzscheme_main(void)
}
static int
-mzscheme_env_main(Scheme_Env *env, int argc, char **argv)
+mzscheme_env_main(Scheme_Env *env, int argc UNUSED, char **argv UNUSED)
{
/* neither argument nor return values are used */
#ifdef MZ_PRECISE_GC
@@ -1190,7 +1190,7 @@ ex_mzscheme(exarg_T *eap)
}
static Scheme_Object *
-do_load(void *data, int noargc, Scheme_Object **noargv)
+do_load(void *data, int noargc UNUSED, Scheme_Object **noargv UNUSED)
{
Scheme_Object *expr = NULL;
Scheme_Object *result = NULL;
@@ -1306,7 +1306,7 @@ extract_exn_message(Scheme_Object *v)
}
static Scheme_Object *
-do_eval(void *s, int noargc, Scheme_Object **noargv)
+do_eval(void *s, int noargc UNUSED, Scheme_Object **noargv UNUSED)
{
return scheme_eval_string_all((char *)s, environment, TRUE);
}
@@ -1317,7 +1317,7 @@ do_eval(void *s, int noargc, Scheme_Object **noargv)
*========================================================================
*/
static void
-do_intrnl_output(char *mesg, long len, int error)
+do_intrnl_output(char *mesg, int error)
{
char *p, *prev;
@@ -1341,21 +1341,21 @@ do_intrnl_output(char *mesg, long len, int error)
}
static void
-do_output(char *mesg, long len)
+do_output(char *mesg, long len UNUSED)
{
- do_intrnl_output(mesg, len, 0);
+ do_intrnl_output(mesg, 0);
}
static void
-do_err_output(char *mesg, long len)
+do_err_output(char *mesg)
{
- do_intrnl_output(mesg, len, 1);
+ do_intrnl_output(mesg, 1);
}
static void
do_printf(char *format, ...)
{
- do_intrnl_output(format, STRLEN(format), 1);
+ do_intrnl_output(format, 1);
}
static void
@@ -1368,7 +1368,7 @@ do_flush(void)
MZ_GC_CHECK();
if (length)
{
- do_err_output(buff, length);
+ do_err_output(buff);
return;
}
@@ -1438,21 +1438,21 @@ vim_eval(void *data, int argc, Scheme_Object **argv)
/* (range-start) */
static Scheme_Object *
-get_range_start(void *data, int argc, Scheme_Object **argv)
+get_range_start(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
{
return scheme_make_integer(range_start);
}
/* (range-end) */
static Scheme_Object *
-get_range_end(void *data, int argc, Scheme_Object **argv)
+get_range_end(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
{
return scheme_make_integer(range_end);
}
/* (beep) */
static Scheme_Object *
-mzscheme_beep(void *data, int argc, Scheme_Object **argv)
+mzscheme_beep(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
{
vim_beep();
return scheme_void;
@@ -1584,14 +1584,14 @@ set_option(void *data, int argc, Scheme_Object **argv)
/* (curr-win) */
static Scheme_Object *
-get_curr_win(void *data, int argc, Scheme_Object **argv)
+get_curr_win(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
{
return (Scheme_Object *)get_vim_curr_window();
}
/* (win-count) */
static Scheme_Object *
-get_window_count(void *data, int argc, Scheme_Object **argv)
+get_window_count(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
{
win_T *w;
int n = 0;
@@ -1926,7 +1926,7 @@ get_buffer_num(void *data, int argc, Scheme_Object **argv)
/* (buff-count) */
static Scheme_Object *
-get_buffer_count(void *data, int argc, Scheme_Object **argv)
+get_buffer_count(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
{
buf_T *b;
int n = 0;
@@ -1947,7 +1947,7 @@ get_buffer_name(void *data, int argc, Scheme_Object **argv)
/* (curr-buff) */
static Scheme_Object *
-get_curr_buffer(void *data, int argc, Scheme_Object **argv)
+get_curr_buffer(void *data UNUSED, int argc UNUSED, Scheme_Object **argv UNUSED)
{
return (Scheme_Object *)get_vim_curr_buffer();
}
@@ -2521,7 +2521,7 @@ insert_buffer_line_list(void *data, int argc, Scheme_Object **argv)
*/
/* (buff? obj) */
static Scheme_Object *
-vim_bufferp(void *data, int argc, Scheme_Object **argv)
+vim_bufferp(void *data UNUSED, int argc UNUSED, Scheme_Object **argv)
{
if (SCHEME_VIMBUFFERP(argv[0]))
return scheme_true;
@@ -2531,7 +2531,7 @@ vim_bufferp(void *data, int argc, Scheme_Object **argv)
/* (win? obj) */
static Scheme_Object *
-vim_windowp(void *data, int argc, Scheme_Object **argv)
+vim_windowp(void *data UNUSED, int argc UNUSED, Scheme_Object **argv)
{
if (SCHEME_VIMWINDOWP(argv[0]))
return scheme_true;
@@ -2541,7 +2541,7 @@ vim_windowp(void *data, int argc, Scheme_Object **argv)
/* (buff-valid? obj) */
static Scheme_Object *
-vim_buffer_validp(void *data, int argc, Scheme_Object **argv)
+vim_buffer_validp(void *data UNUSED, int argc UNUSED, Scheme_Object **argv)
{
if (SCHEME_VIMBUFFERP(argv[0])
&& ((vim_mz_buffer *)argv[0])->buf != INVALID_BUFFER_VALUE)
@@ -2552,7 +2552,7 @@ vim_buffer_validp(void *data, int argc, Scheme_Object **argv)
/* (win-valid? obj) */
static Scheme_Object *
-vim_window_validp(void *data, int argc, Scheme_Object **argv)
+vim_window_validp(void *data UNUSED, int argc UNUSED, Scheme_Object **argv)
{
if (SCHEME_VIMWINDOWP(argv[0])
&& ((vim_mz_window *)argv[0])->win != INVALID_WINDOW_VALUE)
@@ -3315,7 +3315,7 @@ sandbox_check(void)
/* security guards to force Vim's sandbox restrictions on MzScheme level */
static Scheme_Object *
-sandbox_file_guard(int argc, Scheme_Object **argv)
+sandbox_file_guard(int argc UNUSED, Scheme_Object **argv)
{
if (sandbox)
{
@@ -3361,7 +3361,7 @@ sandbox_file_guard(int argc, Scheme_Object **argv)
}
static Scheme_Object *
-sandbox_network_guard(int argc, Scheme_Object **argv)
+sandbox_network_guard(int argc UNUSED, Scheme_Object **argv UNUSED)
{
return scheme_void;
}
Oops, something went wrong.

0 comments on commit 011a08d

Please sign in to comment.