diff options
| author | christos <christos@NetBSD.org> | 2008-09-02 08:41:51 +0000 |
|---|---|---|
| committer | christos <christos@NetBSD.org> | 2008-09-02 08:41:51 +0000 |
| commit | 4ef43ee396f2dc7c11e7c693b031d39e080b2e1b (patch) | |
| tree | c1ed940ec94c85b658b0a49355545b975718e402 /gnu | |
| parent | 29a97b91d65d18585d0ddd459f1f7c0c3257201d (diff) | |
resolve conflicts
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/dist/texinfo/info/echo-area.c | 8 | ||||
| -rw-r--r-- | gnu/dist/texinfo/info/infokey.c | 10 | ||||
| -rw-r--r-- | gnu/dist/texinfo/info/session.c | 12 | ||||
| -rw-r--r-- | gnu/dist/texinfo/makeinfo/files.c | 9 |
4 files changed, 6 insertions, 33 deletions
diff --git a/gnu/dist/texinfo/info/echo-area.c b/gnu/dist/texinfo/info/echo-area.c index eaa0a0c0c2a..48c18b416e0 100644 --- a/gnu/dist/texinfo/info/echo-area.c +++ b/gnu/dist/texinfo/info/echo-area.c @@ -1,4 +1,4 @@ -/* $NetBSD: echo-area.c,v 1.3 2008/09/02 08:00:24 christos Exp $ */ +/* $NetBSD: echo-area.c,v 1.4 2008/09/02 08:41:51 christos Exp $ */ /* echo-area.c -- how to read a line in the echo area. Id: echo-area.c,v 1.7 2004/12/14 00:15:36 karl Exp @@ -938,12 +938,8 @@ DECLARE_INFO_COMMAND (ea_possible_completions, _("List possible completions")) printf_to_message_buffer (completions_found_index == 1 ? (char *) _("One completion:\n") : (char *) _("%d completions:\n"), -<<<<<<< echo-area.c - (void*)((intptr_t)completions_found_index), NULL, NULL); -======= - (void *) (long) completions_found_index, + (void*)((intptr_t)completions_found_index), NULL, NULL); ->>>>>>> 1.1.1.5 /* Find the maximum length of a label. */ for (i = 0; i < completions_found_index; i++) diff --git a/gnu/dist/texinfo/info/infokey.c b/gnu/dist/texinfo/info/infokey.c index c29dc298b4b..82696b7c340 100644 --- a/gnu/dist/texinfo/info/infokey.c +++ b/gnu/dist/texinfo/info/infokey.c @@ -1,4 +1,4 @@ -/* $NetBSD: infokey.c,v 1.3 2008/09/02 08:00:24 christos Exp $ */ +/* $NetBSD: infokey.c,v 1.4 2008/09/02 08:41:51 christos Exp $ */ /* infokey.c -- compile ~/.infokey to ~/.info. Id: infokey.c,v 1.9 2004/12/14 00:15:36 karl Exp @@ -641,11 +641,7 @@ compile (FILE *fp, const char *filename, struct sect *sections) { syntax_error (filename, lnum, (char *) _("NUL character (^%c) not permitted"), -<<<<<<< infokey.c (void *)((intptr_t)c), NULL, NULL, NULL); -======= - (void *) (long) c, NULL, NULL, NULL); ->>>>>>> 1.1.1.5 error = 1; } seqstate = normal; @@ -669,11 +665,7 @@ compile (FILE *fp, const char *filename, struct sect *sections) if (alen == 0) { syntax_error (filename, lnum, (char *) _("missing action name"), -<<<<<<< infokey.c (void *)((intptr_t)c), NULL, NULL, NULL); -======= - (void *) (long) c, NULL, NULL, NULL); ->>>>>>> 1.1.1.5 error = 1; } else diff --git a/gnu/dist/texinfo/info/session.c b/gnu/dist/texinfo/info/session.c index 690bf17a502..34196ed8a05 100644 --- a/gnu/dist/texinfo/info/session.c +++ b/gnu/dist/texinfo/info/session.c @@ -1,4 +1,4 @@ -/* $NetBSD: session.c,v 1.4 2008/09/02 08:00:24 christos Exp $ */ +/* $NetBSD: session.c,v 1.5 2008/09/02 08:41:51 christos Exp $ */ /* session.c -- user windowing interface to Info. Id: session.c,v 1.16 2004/12/14 00:15:36 karl Exp @@ -964,11 +964,7 @@ forward_move_node_structure (WINDOW *window, int behaviour) same as the first menu item found in this node. */ window_message_in_echo_area ((char *) _("Moving Up %d time(s), then Next."), -<<<<<<< session.c (void *)((intptr_t)up_counter), NULL); -======= - (void *) (long) up_counter, NULL); ->>>>>>> 1.1.1.7 info_handle_pointer ("Next", window); return; @@ -1965,7 +1961,7 @@ DECLARE_INFO_COMMAND (info_menu_digit, _("Select this menu item")) /* Special case. Item "0" is the last item in this menu. */ if (item == 0) - for (i = 0; (entry = menu[i]) && menu[i + 1]; i++); + for (i = 0; menu[i] && menu[i + 1]; i++); else { for (i = 0; menu[i]; i++) @@ -1981,11 +1977,7 @@ DECLARE_INFO_COMMAND (info_menu_digit, _("Select this menu item")) } else info_error ((char *) _("There aren't %d items in this menu."), -<<<<<<< session.c (void *)((intptr_t)item), NULL); -======= - (void *) (long) item, NULL); ->>>>>>> 1.1.1.7 info_free_references (menu); return; diff --git a/gnu/dist/texinfo/makeinfo/files.c b/gnu/dist/texinfo/makeinfo/files.c index 6ac071db759..e3c1534aed0 100644 --- a/gnu/dist/texinfo/makeinfo/files.c +++ b/gnu/dist/texinfo/makeinfo/files.c @@ -1,4 +1,4 @@ -/* $NetBSD: files.c,v 1.8 2008/09/02 08:00:24 christos Exp $ */ +/* $NetBSD: files.c,v 1.9 2008/09/02 08:41:51 christos Exp $ */ /* files.c -- file-related functions for makeinfo. Id: files.c,v 1.5 2004/07/27 00:06:31 karl Exp @@ -200,16 +200,9 @@ find_and_load (char *filename, int use_path) result = fullpath = NULL; -<<<<<<< files.c - if (use_path) - fullpath = get_file_info_in_path (filename, include_files_path, &fileinfo); - else - fullpath = get_file_info_in_path (filename, NULL, &fileinfo); -======= fullpath = get_file_info_in_path (filename, use_path ? include_files_path : NULL, &fileinfo); ->>>>>>> 1.1.1.5 if (!fullpath) goto error_exit; |
