4 From: Bram Moolenaar <Bram@moolenaar.net>
6 Content-Type: text/plain; charset=ISO-8859-1
7 Content-Transfer-Encoding: 8bit
11 Problem: Crash related to getting X window ID. (Dominique Pelle)
12 Solution: Don't trust the window ID that we got in the past, check it every
17 *** ../vim-7.1.164/src/os_unix.c Thu Aug 30 11:46:46 2007
18 --- src/os_unix.c Thu Nov 29 18:19:56 2007
24 ! * mch_inchar(): low level input funcion.
25 * Get a characters from the keyboard.
26 * Return the number of characters that are available.
27 * If wtime == 0 do not wait for characters.
32 ! * mch_inchar(): low level input function.
33 * Get a characters from the keyboard.
34 * Return the number of characters that are available.
35 * If wtime == 0 do not wait for characters.
38 #ifdef FEAT_XCLIPBOARD
39 if (xterm_dpy != NULL && x11_window != 0)
41 ! /* Checked it already. */
42 ! if (x11_display_from == XD_XTERM)
46 ! * If the X11 display was opened here before, for the window where Vim
47 ! * was started, close that one now to avoid a memory leak.
49 ! if (x11_display_from == XD_HERE && x11_display != NULL)
50 ! XCloseDisplay(x11_display);
51 ! x11_display = xterm_dpy;
52 ! x11_display_from = XD_XTERM;
53 if (test_x11_window(x11_display) == FAIL)
55 /* probably bad $WINDOWID */
57 #ifdef FEAT_XCLIPBOARD
58 if (xterm_dpy != NULL && x11_window != 0)
60 ! /* We may have checked it already, but Gnome terminal can move us to
61 ! * another window, so we need to check every time. */
62 ! if (x11_display_from != XD_XTERM)
65 ! * If the X11 display was opened here before, for the window where
66 ! * Vim was started, close that one now to avoid a memory leak.
68 ! if (x11_display_from == XD_HERE && x11_display != NULL)
69 ! XCloseDisplay(x11_display);
70 ! x11_display = xterm_dpy;
71 ! x11_display_from = XD_XTERM;
73 if (test_x11_window(x11_display) == FAIL)
75 /* probably bad $WINDOWID */
79 * Set the case of the file name, if it already exists. This will cause the
80 * file name to remain exactly the same.
81 ! * Only required for file systems where case is ingored and preserved.
87 * Set the case of the file name, if it already exists. This will cause the
88 * file name to remain exactly the same.
89 ! * Only required for file systems where case is ignored and preserved.
95 ret = poll(fds, nfd, towait);
97 if (ret == 0 && mzquantum_used)
98 ! /* MzThreads scheduling is required and timeout occured */
103 ret = poll(fds, nfd, towait);
104 # ifdef FEAT_MZSCHEME
105 if (ret == 0 && mzquantum_used)
106 ! /* MzThreads scheduling is required and timeout occurred */
113 # ifdef FEAT_MZSCHEME
114 if (ret == 0 && mzquantum_used)
115 ! /* loop if MzThreads must be scheduled and timeout occured */
121 # ifdef FEAT_MZSCHEME
122 if (ret == 0 && mzquantum_used)
123 ! /* loop if MzThreads must be scheduled and timeout occurred */
130 /* When using system() always add extra quotes, because the shell
131 * is started twice. Otherwise put a backslash before special
132 ! * characters, except insice ``. */
134 STRCAT(command, " \"");
135 STRCAT(command, pat[i]);
138 /* When using system() always add extra quotes, because the shell
139 * is started twice. Otherwise put a backslash before special
140 ! * characters, except inside ``. */
142 STRCAT(command, " \"");
143 STRCAT(command, pat[i]);
146 /* gpm library tries to handling TSTP causes
147 * problems. Anyways, we close connection to Gpm whenever
148 * we are going to suspend or starting an external process
149 ! * so we should'nt have problem with this
151 signal(SIGTSTP, restricted ? SIG_IGN : SIG_DFL);
152 return 1; /* succeed */
154 /* gpm library tries to handling TSTP causes
155 * problems. Anyways, we close connection to Gpm whenever
156 * we are going to suspend or starting an external process
157 ! * so we shouldn't have problem with this
159 signal(SIGTSTP, restricted ? SIG_IGN : SIG_DFL);
160 return 1; /* succeed */
161 *** ../vim-7.1.164/src/version.c Thu Nov 29 21:26:38 2007
162 --- src/version.c Sat Dec 1 17:17:20 2007
166 { /* Add new patch number below this line */
172 "Hit any key to continue" is very confusing when you have two keyboards.
174 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\
175 /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
176 \\\ download, build and distribute -- http://www.A-A-P.org ///
177 \\\ help me help AIDS victims -- http://ICCF-Holland.org ///