aniani/vim
0
0
Fork 1
mirror of https://github.com/vim/vim.git synced 2025-07-26 11:04:33 -04:00
Code

updated for version 7.1-165

Browse Source
This commit is contained in:
Bram Moolenaar 2007-12-01 16:19:33 +00:00
parent 8f5c578a5e
commit c2a27c3dc3
2 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/os_unix.c
View File

@ -310,7 +310,7 @@ mch_write(s, len)
} }
/* /*
* mch_inchar(): low level input funcion. * mch_inchar(): low level input function.
* Get a characters from the keyboard. * Get a characters from the keyboard.
* Return the number of characters that are available. * Return the number of characters that are available.
* If wtime == 0 do not wait for characters. * If wtime == 0 do not wait for characters.
@ -1567,18 +1567,19 @@ get_x11_windis()
#ifdef FEAT_XCLIPBOARD #ifdef FEAT_XCLIPBOARD
if (xterm_dpy != NULL && x11_window != 0) if (xterm_dpy != NULL && x11_window != 0)
{ {
/* Checked it already. */ /* We may have checked it already, but Gnome terminal can move us to
if (x11_display_from == XD_XTERM) * another window, so we need to check every time. */
return OK; if (x11_display_from != XD_XTERM)
{
/* /*
* If the X11 display was opened here before, for the window where Vim * If the X11 display was opened here before, for the window where
* was started, close that one now to avoid a memory leak. * Vim was started, close that one now to avoid a memory leak.
*/ */
if (x11_display_from == XD_HERE && x11_display != NULL) if (x11_display_from == XD_HERE && x11_display != NULL)
XCloseDisplay(x11_display); XCloseDisplay(x11_display);
x11_display = xterm_dpy; x11_display = xterm_dpy;
x11_display_from = XD_XTERM; x11_display_from = XD_XTERM;
}
if (test_x11_window(x11_display) == FAIL) if (test_x11_window(x11_display) == FAIL)
{ {
/* probably bad $WINDOWID */ /* probably bad $WINDOWID */
@ -2421,7 +2422,7 @@ mch_isFullName(fname)
/* /*
* Set the case of the file name, if it already exists. This will cause the * Set the case of the file name, if it already exists. This will cause the
* file name to remain exactly the same. * file name to remain exactly the same.
* Only required for file systems where case is ingored and preserved. * Only required for file systems where case is ignored and preserved.
*/ */
/*ARGSUSED*/ /*ARGSUSED*/
void void
@ -4653,7 +4654,7 @@ RealWaitForChar(fd, msec, check_for_gpm)
ret = poll(fds, nfd, towait); ret = poll(fds, nfd, towait);
# ifdef FEAT_MZSCHEME # ifdef FEAT_MZSCHEME
if (ret == 0 && mzquantum_used) if (ret == 0 && mzquantum_used)
/* MzThreads scheduling is required and timeout occured */ /* MzThreads scheduling is required and timeout occurred */
finished = FALSE; finished = FALSE;
# endif # endif
@ -4801,7 +4802,7 @@ RealWaitForChar(fd, msec, check_for_gpm)
#endif #endif
# ifdef FEAT_MZSCHEME # ifdef FEAT_MZSCHEME
if (ret == 0 && mzquantum_used) if (ret == 0 && mzquantum_used)
/* loop if MzThreads must be scheduled and timeout occured */ /* loop if MzThreads must be scheduled and timeout occurred */
finished = FALSE; finished = FALSE;
# endif # endif
@ -5191,7 +5192,7 @@ mch_expand_wildcards(num_pat, pat, num_file, file, flags)
{ {
/* When using system() always add extra quotes, because the shell /* When using system() always add extra quotes, because the shell
* is started twice. Otherwise put a backslash before special * is started twice. Otherwise put a backslash before special
* characters, except insice ``. */ * characters, except inside ``. */
#ifdef USE_SYSTEM #ifdef USE_SYSTEM
STRCAT(command, " \""); STRCAT(command, " \"");
STRCAT(command, pat[i]); STRCAT(command, pat[i]);
@ -5675,7 +5676,7 @@ gpm_open()
/* gpm library tries to handling TSTP causes /* gpm library tries to handling TSTP causes
* problems. Anyways, we close connection to Gpm whenever * problems. Anyways, we close connection to Gpm whenever
* we are going to suspend or starting an external process * we are going to suspend or starting an external process
* so we should'nt have problem with this * so we shouldn't have problem with this
*/ */
signal(SIGTSTP, restricted ? SIG_IGN : SIG_DFL); signal(SIGTSTP, restricted ? SIG_IGN : SIG_DFL);
return 1; /* succeed */ return 1; /* succeed */

2
src/version.c
View File

@ -666,6 +666,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
165,
/**/ /**/
164, 164,
/**/ /**/