comparison src/main.c @ 1883:c8f343a465a2 v7.2.180

updated for version 7.2-180
author vimboss
date Sun, 17 May 2009 11:33:22 +0000
parents f10fe14748e2
children afb740b5dfab
comparison
equal deleted inserted replaced
1882:c8b87fa14d27 1883:c8f343a465a2
1503 * Get the name of the display, before gui_prepare() removes it from 1503 * Get the name of the display, before gui_prepare() removes it from
1504 * argv[]. Used for the xterm-clipboard display. 1504 * argv[]. Used for the xterm-clipboard display.
1505 * 1505 *
1506 * Also find the --server... arguments and --socketid and --windowid 1506 * Also find the --server... arguments and --socketid and --windowid
1507 */ 1507 */
1508 /*ARGSUSED*/
1509 static void 1508 static void
1510 early_arg_scan(parmp) 1509 early_arg_scan(parmp)
1511 mparm_T *parmp; 1510 mparm_T *parmp UNUSED;
1512 { 1511 {
1513 #if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER) \ 1512 #if defined(FEAT_XCLIPBOARD) || defined(FEAT_CLIENTSERVER) \
1514 || !defined(FEAT_NETBEANS_INTG) 1513 || !defined(FEAT_NETBEANS_INTG)
1515 int argc = parmp->argc; 1514 int argc = parmp->argc;
1516 char **argv = parmp->argv; 1515 char **argv = parmp->argv;
2378 2377
2379 /* 2378 /*
2380 * Create the requested number of windows and edit buffers in them. 2379 * Create the requested number of windows and edit buffers in them.
2381 * Also does recovery if "recoverymode" set. 2380 * Also does recovery if "recoverymode" set.
2382 */ 2381 */
2383 /*ARGSUSED*/
2384 static void 2382 static void
2385 create_windows(parmp) 2383 create_windows(parmp)
2386 mparm_T *parmp; 2384 mparm_T *parmp UNUSED;
2387 { 2385 {
2388 #ifdef FEAT_WINDOWS 2386 #ifdef FEAT_WINDOWS
2389 int dorewind; 2387 int dorewind;
2390 int done = 0; 2388 int done = 0;
2391 2389
3849 /* 3847 /*
3850 * If conversion is needed, convert "data" from "client_enc" to 'encoding' and 3848 * If conversion is needed, convert "data" from "client_enc" to 'encoding' and
3851 * return an allocated string. Otherwise return "data". 3849 * return an allocated string. Otherwise return "data".
3852 * "*tofree" is set to the result when it needs to be freed later. 3850 * "*tofree" is set to the result when it needs to be freed later.
3853 */ 3851 */
3854 /*ARGSUSED*/
3855 char_u * 3852 char_u *
3856 serverConvert(client_enc, data, tofree) 3853 serverConvert(client_enc, data, tofree)
3857 char_u *client_enc; 3854 char_u *client_enc UNUSED;
3858 char_u *data; 3855 char_u *data;
3859 char_u **tofree; 3856 char_u **tofree;
3860 { 3857 {
3861 char_u *res = data; 3858 char_u *res = data;
3862 3859