diff options
-rw-r--r-- | chat/icb/distinfo | 4 | ||||
-rw-r--r-- | chat/icb/patches/patch-an | 152 | ||||
-rw-r--r-- | editors/uemacs/distinfo | 4 | ||||
-rw-r--r-- | editors/uemacs/patches/patch-ag | 24 |
4 files changed, 95 insertions, 89 deletions
diff --git a/chat/icb/distinfo b/chat/icb/distinfo index e76721f2e07..88e5fdc329c 100644 --- a/chat/icb/distinfo +++ b/chat/icb/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.15 2013/01/11 13:24:32 joerg Exp $ +$NetBSD: distinfo,v 1.16 2014/09/23 22:37:29 jperkin Exp $ SHA1 (icb-5.0.9.tar.gz) = 151430ad7fe3e9787627b31f6551bf1f398b1bd8 RMD160 (icb-5.0.9.tar.gz) = 8184620d7abf71fa38315fa14aa5345b6981c9bf @@ -16,7 +16,7 @@ SHA1 (patch-aj) = ba804422123bbc61a2ff2edf7429cd06678bb189 SHA1 (patch-ak) = 8e363cc6c5647c064d56ec75b8b627d7d9a07a72 SHA1 (patch-al) = a47617dd948fa972d0bab604514e4a47af117c55 SHA1 (patch-am) = b389f93a4cdb105e5dbbc5e97f642c7fff328f0d -SHA1 (patch-an) = 4213261b8bb5638a789371ba1eb12923453741a5 +SHA1 (patch-an) = 116a5f7a692776ac8cd3c7d9c6cdb35528e9b15a SHA1 (patch-ao) = a798b898e3527f7a4458c6e278e86ef69bb38a53 SHA1 (patch-ap) = 794d608ac548bc1b5c83b7bf967ed43e5cee65be SHA1 (patch-aq) = 78b772a2f6ec27a782b1681a61a2329992dcc741 diff --git a/chat/icb/patches/patch-an b/chat/icb/patches/patch-an index b6b704e9f98..ed61f753e6d 100644 --- a/chat/icb/patches/patch-an +++ b/chat/icb/patches/patch-an @@ -1,13 +1,17 @@ -$NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ +$NetBSD: patch-an,v 1.6 2014/09/23 22:37:29 jperkin Exp $ + +Don't include termcap.h on SunOS. --- readline/readline.c.orig 1995-02-24 21:20:03.000000000 +0000 +++ readline/readline.c -@@ -38,17 +38,25 @@ static char *xmalloc (), *xrealloc (); +@@ -38,17 +38,27 @@ static char *xmalloc (), *xrealloc (); # endif #endif +#include <unistd.h> ++#ifndef __sun +#include <termcap.h> ++#endif #include <stdio.h> #include <sys/types.h> #include <fcntl.h> @@ -28,7 +32,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ #define HAVE_BSD_SIGNALS /* #define USE_XON_XOFF */ -@@ -80,6 +88,10 @@ static char *xmalloc (), *xrealloc (); +@@ -80,6 +90,10 @@ static char *xmalloc (), *xrealloc (); # if !defined (O_NDELAY) # define O_NDELAY O_NONBLOCK /* Posix-style non-blocking i/o */ # endif /* O_NDELAY */ @@ -39,7 +43,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ #endif /* _POSIX_VERSION */ /* Other (BSD) machines use sgtty. */ -@@ -104,7 +116,6 @@ static char *xmalloc (), *xrealloc (); +@@ -104,7 +118,6 @@ static char *xmalloc (), *xrealloc (); #endif /* !NEW_TTY_DRIVER && !_POSIX_VDISABLE */ #include <errno.h> @@ -47,7 +51,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ #include <setjmp.h> #if defined (SHELL) -@@ -133,7 +144,7 @@ struct passwd *getpwuid (), *getpwent () +@@ -133,7 +146,7 @@ struct passwd *getpwuid (), *getpwent () # endif /* USGr3 */ #endif /* USG && hpux */ @@ -56,7 +60,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ # include <dirent.h> # define direct dirent # if defined (_POSIX_VERSION) -@@ -204,10 +215,13 @@ extern char *index (); +@@ -204,10 +217,13 @@ extern char *index (); extern char *getenv (); extern char *tilde_expand (); @@ -72,7 +76,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ #if defined (VOID_SIGHANDLER) # define sighandler void -@@ -280,7 +294,7 @@ static jmp_buf readline_top_level; +@@ -280,7 +296,7 @@ static jmp_buf readline_top_level; static FILE *in_stream, *out_stream; /* The names of the streams that we do input and output to. */ @@ -81,7 +85,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ /* Non-zero means echo characters as they are read. */ int readline_echoing_p = 1; -@@ -335,6 +349,8 @@ static int stricmp (), strnicmp (); +@@ -335,6 +351,8 @@ static int stricmp (), strnicmp (); /* Non-zero means to save keys that we dispatch on in a kbd macro. */ static int defining_kbd_macro = 0; @@ -90,7 +94,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ /* **************************************************************** */ /* */ -@@ -744,7 +760,7 @@ rl_unget_char (key) +@@ -744,7 +762,7 @@ rl_unget_char (key) /* If a character is available to be read, then read it and stuff it into IBUFFER. Otherwise, just return. */ @@ -99,7 +103,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ { int tty = fileno (in_stream); register int tem, result = -1; -@@ -861,7 +877,7 @@ rl_dispatch (key, map) +@@ -861,7 +879,7 @@ rl_dispatch (key, map) } else ding (); @@ -108,7 +112,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } switch (map[key].type) -@@ -876,7 +892,7 @@ rl_dispatch (key, map) +@@ -876,7 +894,7 @@ rl_dispatch (key, map) if (func == rl_do_lowercase_version) { rl_dispatch (to_lower (key), map); @@ -117,7 +121,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } (*map[key].function)(rl_numeric_arg * rl_arg_sign, key); -@@ -890,7 +906,7 @@ rl_dispatch (key, map) +@@ -890,7 +908,7 @@ rl_dispatch (key, map) else { rl_abort (); @@ -126,7 +130,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } } break; -@@ -907,7 +923,7 @@ rl_dispatch (key, map) +@@ -907,7 +925,7 @@ rl_dispatch (key, map) else { rl_abort (); @@ -135,7 +139,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } break; -@@ -918,10 +934,11 @@ rl_dispatch (key, map) +@@ -918,10 +936,11 @@ rl_dispatch (key, map) macro = savestring ((char *)map[key].function); with_macro_input (macro); @@ -148,7 +152,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } -@@ -1152,6 +1169,8 @@ readline_initialize_everything () +@@ -1152,6 +1171,8 @@ readline_initialize_everything () { /* Find out if we are running in Emacs. */ running_in_emacs = getenv ("EMACS"); @@ -157,7 +161,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ /* Allocate data structures. */ if (!rl_line_buffer) -@@ -1320,7 +1339,7 @@ rl_universal_argument () +@@ -1320,7 +1341,7 @@ rl_universal_argument () rl_digit_loop (); } @@ -166,7 +170,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ { int key, c; while (1) -@@ -1450,7 +1469,7 @@ static void output_character_function () +@@ -1450,7 +1471,7 @@ static void output_character_function () static int compare_strings (); /* Basic redisplay algorithm. */ @@ -175,7 +179,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ { register int in, out, c, linenum; register char *line = invisible_line; -@@ -1677,10 +1696,8 @@ new: eddie> Oh, my little buggy says to +@@ -1677,10 +1698,8 @@ new: eddie> Oh, my little buggy says to no differences, as well as for end of line additions must be handeled. Could be made even smarter, but this works well enough */ @@ -188,7 +192,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ { register char *ofd, *ols, *oe, *nfd, *nls, *ne; int lendiff, wsatend; -@@ -1872,8 +1889,7 @@ move_cursor_relative (new, data) +@@ -1872,8 +1891,7 @@ move_cursor_relative (new, data) } /* PWP: move the cursor up or down. */ @@ -198,7 +202,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ { void output_character_function (); register int delta, i; -@@ -2018,8 +2034,7 @@ rl_reset_terminal (terminal_name) +@@ -2018,8 +2036,7 @@ rl_reset_terminal (terminal_name) init_terminal_io (terminal_name); } @@ -208,7 +212,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ { extern char *tgetstr (); char *term, *buffer; -@@ -2158,9 +2173,8 @@ output_some_chars (string, count) +@@ -2158,9 +2175,8 @@ output_some_chars (string, count) } /* Delete COUNT characters from the display line. */ @@ -220,7 +224,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ { if (count > screenwidth) return; -@@ -2505,7 +2519,11 @@ rl_prep_terminal () +@@ -2505,7 +2521,11 @@ rl_prep_terminal () tio.c_lflag &= ~(ICANON | ECHO); @@ -233,7 +237,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ eof_char = otio.c_cc[VEOF]; #if defined (USE_XON_XOFF) -@@ -2637,7 +2655,7 @@ alphabetic (c) +@@ -2637,7 +2657,7 @@ alphabetic (c) return (1); if (allow_pathname_alphabetic_chars) @@ -242,7 +246,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ else return (0); } -@@ -2845,12 +2863,13 @@ rl_forward (count) +@@ -2845,12 +2865,13 @@ rl_forward (count) #endif /* VI_MODE */ { ding (); @@ -257,7 +261,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } /* Move backward COUNT characters. */ -@@ -2865,12 +2884,13 @@ rl_backward (count) +@@ -2865,12 +2886,13 @@ rl_backward (count) if (!rl_point) { ding (); @@ -272,7 +276,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } /* Move to the beginning of the line. */ -@@ -2894,13 +2914,13 @@ rl_forward_word (count) +@@ -2894,13 +2916,13 @@ rl_forward_word (count) if (count < 0) { rl_backward_word (-count); @@ -288,7 +292,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ /* If we are not in a word, move forward until we are in one. Then, move forward until we hit a non-alphabetic character. */ -@@ -2913,7 +2933,7 @@ rl_forward_word (count) +@@ -2913,7 +2935,7 @@ rl_forward_word (count) if (alphabetic (c)) break; } } @@ -297,7 +301,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ while (++rl_point < rl_end) { c = the_line[rl_point]; -@@ -2921,6 +2941,7 @@ rl_forward_word (count) +@@ -2921,6 +2943,7 @@ rl_forward_word (count) } --count; } @@ -305,7 +309,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } /* Move backward a word. We do what Emacs does. */ -@@ -2932,13 +2953,13 @@ rl_backward_word (count) +@@ -2932,13 +2955,13 @@ rl_backward_word (count) if (count < 0) { rl_forward_word (-count); @@ -321,7 +325,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ /* Like rl_forward_word (), except that we look at the characters just before point. */ -@@ -2962,6 +2983,7 @@ rl_backward_word (count) +@@ -2962,6 +2985,7 @@ rl_backward_word (count) } --count; } @@ -329,7 +333,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } /* Clear the current line. Numeric argument to C-l does this. */ -@@ -2990,7 +3012,7 @@ rl_clear_screen () +@@ -2990,7 +3014,7 @@ rl_clear_screen () if (rl_explicit_arg) { rl_refresh_line (); @@ -338,7 +342,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } if (term_clrpag) -@@ -3000,6 +3022,7 @@ rl_clear_screen () +@@ -3000,6 +3024,7 @@ rl_clear_screen () rl_forced_update_display (); rl_display_fixed = 1; @@ -346,7 +350,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } rl_arrow_keys (count, c) -@@ -3047,7 +3070,7 @@ rl_insert (count, c) +@@ -3047,7 +3072,7 @@ rl_insert (count, c) char *string; if (count <= 0) @@ -355,7 +359,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ /* If we can optimize, then do it. But don't let people crash readline because of extra large arguments. */ -@@ -3060,7 +3083,7 @@ rl_insert (count, c) +@@ -3060,7 +3085,7 @@ rl_insert (count, c) string[i] = '\0'; rl_insert_text (string); @@ -364,7 +368,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } if (count > 1024) -@@ -3079,7 +3102,7 @@ rl_insert (count, c) +@@ -3079,7 +3104,7 @@ rl_insert (count, c) rl_insert_text (string); count -= decreaser; } @@ -373,7 +377,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } /* We are inserting a single character. -@@ -3104,7 +3127,6 @@ rl_insert (count, c) +@@ -3104,7 +3129,6 @@ rl_insert (count, c) string[i] = '\0'; rl_insert_text (string); @@ -381,7 +385,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } else { -@@ -3115,6 +3137,7 @@ rl_insert (count, c) +@@ -3115,6 +3139,7 @@ rl_insert (count, c) string[0] = c; rl_insert_text (string); } @@ -389,7 +393,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } /* Insert the next typed character verbatim. */ -@@ -3127,9 +3150,10 @@ rl_quoted_insert (count) +@@ -3127,9 +3152,10 @@ rl_quoted_insert (count) if (c==0x01) { printf("\007"); @@ -401,7 +405,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } /* Insert a tab character. */ -@@ -3196,14 +3220,14 @@ rl_rubout (count) +@@ -3196,14 +3222,14 @@ rl_rubout (count) if (count < 0) { rl_delete (-count); @@ -418,7 +422,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } if (count > 1) -@@ -3228,6 +3252,7 @@ rl_rubout (count) +@@ -3228,6 +3254,7 @@ rl_rubout (count) rl_display_fixed++; } } @@ -426,7 +430,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } /* Delete the character under the cursor. Given a numeric argument, -@@ -3238,13 +3263,13 @@ rl_delete (count, invoking_key) +@@ -3238,13 +3265,13 @@ rl_delete (count, invoking_key) if (count < 0) { rl_rubout (-count); @@ -442,7 +446,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } if (count > 1) -@@ -3256,6 +3281,7 @@ rl_delete (count, invoking_key) +@@ -3256,6 +3283,7 @@ rl_delete (count, invoking_key) } else rl_delete_text (rl_point, rl_point + 1); @@ -450,7 +454,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } -@@ -3412,7 +3438,7 @@ rl_transpose_words (count) +@@ -3412,7 +3440,7 @@ rl_transpose_words (count) int w1_beg, w1_end, w2_beg, w2_end; int orig_point = rl_point; @@ -459,7 +463,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ /* Find the two words. */ rl_forward_word (count); -@@ -3429,7 +3455,7 @@ rl_transpose_words (count) +@@ -3429,7 +3457,7 @@ rl_transpose_words (count) { ding (); rl_point = orig_point; @@ -468,7 +472,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } /* Get the text of the words. */ -@@ -3457,6 +3483,7 @@ rl_transpose_words (count) +@@ -3457,6 +3485,7 @@ rl_transpose_words (count) /* I think that does it. */ rl_end_undo_group (); free (word1); free (word2); @@ -476,7 +480,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } /* Transpose the characters at point. If point is at the end of the line, -@@ -3465,11 +3492,11 @@ rl_transpose_chars (count) +@@ -3465,11 +3494,11 @@ rl_transpose_chars (count) int count; { if (!count) @@ -490,7 +494,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } while (count) -@@ -3499,6 +3526,7 @@ rl_transpose_chars (count) +@@ -3499,6 +3528,7 @@ rl_transpose_chars (count) else count--; } @@ -498,7 +502,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } -@@ -3570,7 +3598,7 @@ Function *rl_completion_entry_function = +@@ -3570,7 +3600,7 @@ Function *rl_completion_entry_function = If this function exists and returns NULL then call the value of rl_completion_entry_function to try to match, otherwise use the array of strings returned. */ @@ -507,7 +511,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ /* Local variable states what happened during the last completion attempt. */ static int completion_changed_buffer = 0; -@@ -3706,8 +3734,7 @@ rl_complete_internal (what_to_do) +@@ -3706,8 +3736,7 @@ rl_complete_internal (what_to_do) variable rl_attempted_completion_function. */ if (rl_attempted_completion_function) { @@ -517,7 +521,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ if (matches) { -@@ -3760,8 +3787,7 @@ rl_complete_internal (what_to_do) +@@ -3760,8 +3789,7 @@ rl_complete_internal (what_to_do) /* We have marked all the dead slots with (char *)-1. Copy all the non-dead entries into a new array. */ { @@ -527,7 +531,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ for (i = 1, j = 1; matches[i]; i++) { -@@ -4236,7 +4262,7 @@ rl_revert_line () +@@ -4236,7 +4264,7 @@ rl_revert_line () /* Do some undoing of things that were done. */ rl_undo_command (count) { @@ -536,7 +540,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ while (count) { -@@ -4250,6 +4276,7 @@ rl_undo_command (count) +@@ -4250,6 +4278,7 @@ rl_undo_command (count) break; } } @@ -544,7 +548,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } /* **************************************************************** */ -@@ -4277,8 +4304,7 @@ start_using_history () +@@ -4277,8 +4306,7 @@ start_using_history () } /* Free the contents (and containing structure) of a HIST_ENTRY. */ @@ -554,7 +558,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ { if (!entry) return; if (entry->line) -@@ -4362,11 +4388,11 @@ rl_get_next_history (count) +@@ -4362,11 +4390,11 @@ rl_get_next_history (count) if (count < 0) { rl_get_previous_history (-count); @@ -568,7 +572,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ maybe_replace_line (); -@@ -4397,6 +4423,7 @@ rl_get_next_history (count) +@@ -4397,6 +4425,7 @@ rl_get_next_history (count) rl_point = 0; #endif /* VI_MODE */ } @@ -576,7 +580,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } /* Get the previous item out of our interactive history, making it the current -@@ -4410,11 +4437,11 @@ rl_get_previous_history (count) +@@ -4410,11 +4439,11 @@ rl_get_previous_history (count) if (count < 0) { rl_get_next_history (-count); @@ -590,7 +594,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ /* If we don't have a line saved, then save this one. */ maybe_save_line (); -@@ -4457,6 +4484,7 @@ rl_get_previous_history (count) +@@ -4457,6 +4486,7 @@ rl_get_previous_history (count) rl_point = 0; #endif /* VI_MODE */ } @@ -598,7 +602,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } -@@ -4643,7 +4671,7 @@ rl_search_history (direction, invoking_k +@@ -4643,7 +4673,7 @@ rl_search_history (direction, invoking_k rl_point = orig_point; rl_end = strlen (the_line); rl_clear_message (); @@ -607,7 +611,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ default: if (c < 32 || c > 126) -@@ -4779,6 +4807,7 @@ rl_search_history (direction, invoking_k +@@ -4779,6 +4809,7 @@ rl_search_history (direction, invoking_k rl_point = index; rl_clear_message (); } @@ -615,7 +619,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } /* Make C be the next command to be executed. */ -@@ -4831,7 +4860,7 @@ rl_kill_text (from, to) +@@ -4831,7 +4862,7 @@ rl_kill_text (from, to) { free (text); last_command_was_kill++; @@ -624,7 +628,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } /* Delete the copied text from the line. */ -@@ -4902,6 +4931,7 @@ rl_kill_text (from, to) +@@ -4902,6 +4933,7 @@ rl_kill_text (from, to) } rl_kill_index = slot; last_command_was_kill++; @@ -632,7 +636,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } /* Now REMEMBER! In order to do prepending or appending correctly, kill -@@ -5039,14 +5069,14 @@ rl_yank_nth_arg (count, ignore) +@@ -5039,14 +5071,14 @@ rl_yank_nth_arg (count, ignore) else { ding (); @@ -649,7 +653,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } rl_begin_undo_group (); -@@ -5065,6 +5095,7 @@ rl_yank_nth_arg (count, ignore) +@@ -5065,6 +5097,7 @@ rl_yank_nth_arg (count, ignore) free (arg); rl_end_undo_group (); @@ -657,7 +661,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } /* How to toggle back and forth between editing modes. */ -@@ -5417,9 +5448,10 @@ rl_macro_bind (keyseq, macro, map) +@@ -5417,9 +5450,10 @@ rl_macro_bind (keyseq, macro, map) if (rl_translate_keyseq (macro, macro_keys, ¯o_keys_len)) { free (macro_keys); @@ -669,7 +673,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } /* Bind the key sequence represented by the string KEYSEQ to -@@ -5441,7 +5473,7 @@ rl_generic_bind (type, keyseq, data, map +@@ -5441,7 +5475,7 @@ rl_generic_bind (type, keyseq, data, map { if (type == ISMACR) free (data); @@ -678,7 +682,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } keys = (char *)alloca (1 + (2 * strlen (keyseq))); -@@ -5450,7 +5482,7 @@ rl_generic_bind (type, keyseq, data, map +@@ -5450,7 +5484,7 @@ rl_generic_bind (type, keyseq, data, map of characters. Stuff the characters into ARRAY, and the length of ARRAY into LENGTH. */ if (rl_translate_keyseq (keyseq, keys, &keys_len)) @@ -687,7 +691,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ /* Bind keys, making new keymaps as necessary. */ for (i = 0; i < keys_len; i++) -@@ -5476,6 +5508,7 @@ rl_generic_bind (type, keyseq, data, map +@@ -5476,6 +5510,7 @@ rl_generic_bind (type, keyseq, data, map map[keys[i]].type = type; } } @@ -695,7 +699,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } /* Translate the ASCII representation of SEQ, stuffing the -@@ -5661,7 +5694,7 @@ parser_if (args) +@@ -5661,7 +5696,7 @@ parser_if (args) /* If parsing is turned off, then nothing can turn it back on except for finding the matching endif. In that case, return right now. */ if (parsing_conditionalized_out) @@ -704,7 +708,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ /* Isolate first argument. */ for (i = 0; args[i] && !whitespace (args[i]); i++); -@@ -5713,6 +5746,7 @@ parser_if (args) +@@ -5713,6 +5748,7 @@ parser_if (args) parsing_conditionalized_out = 0; else parsing_conditionalized_out = 1; @@ -712,7 +716,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } /* Invert the current parser state if there is anything on the stack. */ -@@ -5724,17 +5758,18 @@ parser_else (args) +@@ -5724,17 +5760,18 @@ parser_else (args) if (!if_stack_depth) { /* Error message? */ @@ -733,7 +737,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } /* Terminate a conditional, popping the value of -@@ -5819,18 +5854,18 @@ rl_parse_and_bind (string) +@@ -5819,18 +5856,18 @@ rl_parse_and_bind (string) string++; if (!string || !*string || *string == '#') @@ -755,7 +759,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ i = 0; /* If this keyname is a complex key expression surrounded by quotes, -@@ -5868,7 +5903,7 @@ rl_parse_and_bind (string) +@@ -5868,7 +5905,7 @@ rl_parse_and_bind (string) while (*value && whitespace (*value)) value++; rl_variable_bind (var, value); @@ -764,7 +768,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } /* Skip any whitespace between keyname and funname. */ -@@ -5928,7 +5963,7 @@ rl_parse_and_bind (string) +@@ -5928,7 +5965,7 @@ rl_parse_and_bind (string) else rl_set_key (seq, rl_named_function (funname), keymap); @@ -773,7 +777,7 @@ $NetBSD: patch-an,v 1.5 2013/01/11 13:24:32 joerg Exp $ } /* Get the actual character we want to deal with. */ -@@ -5972,6 +6007,7 @@ rl_parse_and_bind (string) +@@ -5972,6 +6009,7 @@ rl_parse_and_bind (string) #endif /* PREFIX_META_HACK */ else rl_bind_key (key, rl_named_function (funname)); diff --git a/editors/uemacs/distinfo b/editors/uemacs/distinfo index 331a0ac1a94..4623ccf13f2 100644 --- a/editors/uemacs/distinfo +++ b/editors/uemacs/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.11 2012/05/23 04:51:38 dholland Exp $ +$NetBSD: distinfo,v 1.12 2014/09/23 22:40:27 jperkin Exp $ SHA1 (ue400dev.zip) = edbb0261cdaa1803d9f7dc7debfd4a9df3a668eb RMD160 (ue400dev.zip) = 75bc1b1e11035ed24d33ec4c6afad43880d5985f @@ -9,7 +9,7 @@ SHA1 (patch-ac) = beeba5d9686f6009248437f3eb0fd10e8b72057b SHA1 (patch-ad) = 493eb3bf0c24d91d55f532029a0aa5d2ad5abe44 SHA1 (patch-ae) = 1651a3dea366cb93beff5965baa11b0d80637c7f SHA1 (patch-af) = 8171e11cc9f7a3a421ad762885da08a992020656 -SHA1 (patch-ag) = 8fe75cd0399411bc5ffa09c85fb0c95d4ad82e75 +SHA1 (patch-ag) = 3721489258cb194b3137c8de0b0d682f4b35c20d SHA1 (patch-h_ebind_h) = fd262c8559f86a923c4ca4d6ee237229c21e15c3 SHA1 (patch-h_eproto_h) = 20abd7755c63292cc87197a4de31d69491f973a8 SHA1 (patch-h_evar_h) = 3491307028a9249a159abb3d92394dbdb475c289 diff --git a/editors/uemacs/patches/patch-ag b/editors/uemacs/patches/patch-ag index 4dc28e03d2c..8187f06e97b 100644 --- a/editors/uemacs/patches/patch-ag +++ b/editors/uemacs/patches/patch-ag @@ -1,4 +1,4 @@ -$NetBSD: patch-ag,v 1.5 2012/05/14 07:07:41 dholland Exp $ +$NetBSD: patch-ag,v 1.6 2014/09/23 22:40:27 jperkin Exp $ - needs term.h for termcap - get terminal size from termcap only if LINES and COLUMNS aren't set @@ -11,17 +11,19 @@ $NetBSD: patch-ag,v 1.5 2012/05/14 07:07:41 dholland Exp $ - use correct type signature for signal handler - use time_t for calling time() ---- src/unix.c.orig 1995-11-18 21:36:58.000000000 +0000 +--- src/unix.c.orig 1995-11-18 16:36:58.000000000 +0000 +++ src/unix.c -@@ -123,6 +123,7 @@ int scnothing() +@@ -123,6 +123,9 @@ int scnothing() #include <curses.h> /* Curses screen output */ #undef WINDOW /* Oh no! */ #endif /* CURSES */ ++#ifndef __sun +#include <termcap.h> ++#endif /** Completion include files **/ /** Directory accessing: Try and figure this out... if you can! **/ -@@ -816,9 +817,19 @@ int scopen() +@@ -816,9 +819,19 @@ int scopen() exit(1); } @@ -44,7 +46,7 @@ $NetBSD: patch-ag,v 1.5 2012/05/14 07:07:41 dholland Exp $ if (term.t_nrow < 3 || term.t_ncol < 3) { puts("Screen size is too small!"); exit(1); -@@ -956,6 +967,7 @@ int sckopen() +@@ -956,6 +969,7 @@ int sckopen() dis_ufk(); #endif #endif @@ -52,7 +54,7 @@ $NetBSD: patch-ag,v 1.5 2012/05/14 07:07:41 dholland Exp $ } /* close keyboard -hm */ -@@ -968,6 +980,7 @@ int sckclose() +@@ -968,6 +982,7 @@ int sckclose() dis_sfk(); #endif #endif @@ -60,7 +62,7 @@ $NetBSD: patch-ag,v 1.5 2012/05/14 07:07:41 dholland Exp $ } /** Move cursor **/ -@@ -1063,7 +1076,7 @@ int state; /* New state */ +@@ -1063,7 +1078,7 @@ int state; /* New state */ } /** Beep **/ @@ -69,7 +71,7 @@ $NetBSD: patch-ag,v 1.5 2012/05/14 07:07:41 dholland Exp $ { #if TERMCAP || TERMIOS #if !NOISY -@@ -1085,7 +1098,9 @@ scbeep() +@@ -1085,7 +1100,9 @@ scbeep() } #if COLOR @@ -79,7 +81,7 @@ $NetBSD: patch-ag,v 1.5 2012/05/14 07:07:41 dholland Exp $ /** Set foreground color **/ int scfcol(color) -@@ -1230,11 +1245,9 @@ int bktoshell(f, n) +@@ -1230,11 +1247,9 @@ int bktoshell(f, n) /** Get time of day **/ char * timeset() { @@ -92,7 +94,7 @@ $NetBSD: patch-ag,v 1.5 2012/05/14 07:07:41 dholland Exp $ /* Get system time */ time(&buf); -@@ -1553,7 +1566,6 @@ char *fspec; /* Filename specificatio +@@ -1553,7 +1568,6 @@ char *fspec; /* Filename specificatio /** Get next filename from pattern **/ char *getnfile() { @@ -100,7 +102,7 @@ $NetBSD: patch-ag,v 1.5 2012/05/14 07:07:41 dholland Exp $ struct DIRENTRY * dp; struct stat fstat; -@@ -1706,15 +1718,15 @@ char *name; /* name of directory to dele +@@ -1706,15 +1720,15 @@ char *name; /* name of directory to dele /* * Window size changes handled via signals. */ |