2c2
< * Copyright (C) 1984-2000 Mark Nudelman
---
> * Copyright (C) 1984-2002 Mark Nudelman
96,152c96,152
< "back-bracket", A_B_BRACKET,
< "back-line", A_B_LINE,
< "back-line-force", A_BF_LINE,
< "back-screen", A_B_SCREEN,
< "back-scroll", A_B_SCROLL,
< "back-search", A_B_SEARCH,
< "back-window", A_B_WINDOW,
< "debug", A_DEBUG,
< "digit", A_DIGIT,
< "display-flag", A_DISP_OPTION,
< "display-option", A_DISP_OPTION,
< "end", A_GOEND,
< "examine", A_EXAMINE,
< "first-cmd", A_FIRSTCMD,
< "firstcmd", A_FIRSTCMD,
< "flush-repaint", A_FREPAINT,
< "forw-bracket", A_F_BRACKET,
< "forw-forever", A_F_FOREVER,
< "forw-line", A_F_LINE,
< "forw-line-force", A_FF_LINE,
< "forw-screen", A_F_SCREEN,
< "forw-screen-force", A_FF_SCREEN,
< "forw-scroll", A_F_SCROLL,
< "forw-search", A_F_SEARCH,
< "forw-window", A_F_WINDOW,
< "goto-end", A_GOEND,
< "goto-line", A_GOLINE,
< "goto-mark", A_GOMARK,
< "help", A_HELP,
< "index-file", A_INDEX_FILE,
< "invalid", A_UINVALID,
< "left-scroll", A_LSHIFT,
< "next-file", A_NEXT_FILE,
< "next-tag", A_NEXT_TAG,
< "noaction", A_NOACTION,
< "percent", A_PERCENT,
< "pipe", A_PIPE,
< "prev-file", A_PREV_FILE,
< "prev-tag", A_PREV_TAG,
< "quit", A_QUIT,
< "remove-file", A_REMOVE_FILE,
< "repaint", A_REPAINT,
< "repaint-flush", A_FREPAINT,
< "repeat-search", A_AGAIN_SEARCH,
< "repeat-search-all", A_T_AGAIN_SEARCH,
< "reverse-search", A_REVERSE_SEARCH,
< "reverse-search-all", A_T_REVERSE_SEARCH,
< "right-scroll", A_RSHIFT,
< "set-mark", A_SETMARK,
< "shell", A_SHELL,
< "status", A_STAT,
< "toggle-flag", A_OPT_TOGGLE,
< "toggle-option", A_OPT_TOGGLE,
< "undo-hilite", A_UNDO_SEARCH,
< "version", A_VERSION,
< "visual", A_VISUAL,
< NULL, 0
---
> { "back-bracket", A_B_BRACKET },
> { "back-line", A_B_LINE },
> { "back-line-force", A_BF_LINE },
> { "back-screen", A_B_SCREEN },
> { "back-scroll", A_B_SCROLL },
> { "back-search", A_B_SEARCH },
> { "back-window", A_B_WINDOW },
> { "debug", A_DEBUG },
> { "digit", A_DIGIT },
> { "display-flag", A_DISP_OPTION },
> { "display-option", A_DISP_OPTION },
> { "end", A_GOEND },
> { "examine", A_EXAMINE },
> { "first-cmd", A_FIRSTCMD },
> { "firstcmd", A_FIRSTCMD },
> { "flush-repaint", A_FREPAINT },
> { "forw-bracket", A_F_BRACKET },
> { "forw-forever", A_F_FOREVER },
> { "forw-line", A_F_LINE },
> { "forw-line-force", A_FF_LINE },
> { "forw-screen", A_F_SCREEN },
> { "forw-screen-force", A_FF_SCREEN },
> { "forw-scroll", A_F_SCROLL },
> { "forw-search", A_F_SEARCH },
> { "forw-window", A_F_WINDOW },
> { "goto-end", A_GOEND },
> { "goto-line", A_GOLINE },
> { "goto-mark", A_GOMARK },
> { "help", A_HELP },
> { "index-file", A_INDEX_FILE },
> { "invalid", A_UINVALID },
> { "left-scroll", A_LSHIFT },
> { "next-file", A_NEXT_FILE },
> { "next-tag", A_NEXT_TAG },
> { "noaction", A_NOACTION },
> { "percent", A_PERCENT },
> { "pipe", A_PIPE },
> { "prev-file", A_PREV_FILE },
> { "prev-tag", A_PREV_TAG },
> { "quit", A_QUIT },
> { "remove-file", A_REMOVE_FILE },
> { "repaint", A_REPAINT },
> { "repaint-flush", A_FREPAINT },
> { "repeat-search", A_AGAIN_SEARCH },
> { "repeat-search-all", A_T_AGAIN_SEARCH },
> { "reverse-search", A_REVERSE_SEARCH },
> { "reverse-search-all", A_T_REVERSE_SEARCH },
> { "right-scroll", A_RSHIFT },
> { "set-mark", A_SETMARK },
> { "shell", A_SHELL },
> { "status", A_STAT },
> { "toggle-flag", A_OPT_TOGGLE },
> { "toggle-option", A_OPT_TOGGLE },
> { "undo-hilite", A_UNDO_SEARCH },
> { "version", A_VERSION },
> { "visual", A_VISUAL },
> { NULL, 0 }
157,176c157,176
< "back-complete", EC_B_COMPLETE,
< "backspace", EC_BACKSPACE,
< "delete", EC_DELETE,
< "down", EC_DOWN,
< "end", EC_END,
< "expand", EC_EXPAND,
< "forw-complete", EC_F_COMPLETE,
< "home", EC_HOME,
< "insert", EC_INSERT,
< "invalid", EC_UINVALID,
< "kill-line", EC_LINEKILL,
< "left", EC_LEFT,
< "literal", EC_LITERAL,
< "right", EC_RIGHT,
< "up", EC_UP,
< "word-backspace", EC_W_BACKSPACE,
< "word-delete", EC_W_DELETE,
< "word-left", EC_W_LEFT,
< "word-right", EC_W_RIGHT,
< NULL, 0
---
> { "back-complete", EC_B_COMPLETE },
> { "backspace", EC_BACKSPACE },
> { "delete", EC_DELETE },
> { "down", EC_DOWN },
> { "end", EC_END },
> { "expand", EC_EXPAND },
> { "forw-complete", EC_F_COMPLETE },
> { "home", EC_HOME },
> { "insert", EC_INSERT },
> { "invalid", EC_UINVALID },
> { "kill-line", EC_LINEKILL },
> { "left", EC_LEFT },
> { "literal", EC_LITERAL },
> { "right", EC_RIGHT },
> { "up", EC_UP },
> { "word-backspace", EC_W_BACKSPACE },
> { "word-delete", EC_W_DELETE },
> { "word-left", EC_W_LEFT },
> { "word-right", EC_W_RIGHT },
> { NULL, 0 }
355c355
< tstr(pp)
---
> tstr(pp, xlate)
356a357
> int xlate;
383c384
< if (ch == CONTROL('K'))
---
> if (xlate && ch == CONTROL('K'))
406c407
< switch (*++p)
---
> if (xlate)
408,418c409,424
< case 'u': ch = SK_UP_ARROW; break;
< case 'd': ch = SK_DOWN_ARROW; break;
< case 'r': ch = SK_RIGHT_ARROW; break;
< case 'l': ch = SK_LEFT_ARROW; break;
< case 'U': ch = SK_PAGE_UP; break;
< case 'D': ch = SK_PAGE_DOWN; break;
< case 'h': ch = SK_HOME; break;
< case 'e': ch = SK_END; break;
< case 'x': ch = SK_DELETE; break;
< default:
< error("illegal char after \\k");
---
> switch (*++p)
> {
> case 'u': ch = SK_UP_ARROW; break;
> case 'd': ch = SK_DOWN_ARROW; break;
> case 'r': ch = SK_RIGHT_ARROW; break;
> case 'l': ch = SK_LEFT_ARROW; break;
> case 'U': ch = SK_PAGE_UP; break;
> case 'D': ch = SK_PAGE_DOWN; break;
> case 'h': ch = SK_HOME; break;
> case 'e': ch = SK_END; break;
> case 'x': ch = SK_DELETE; break;
> default:
> error("illegal char after \\k");
> *pp = p+1;
> return ("");
> }
420c426,433
< return ("");
---
> buf[0] = SK_SPECIAL_KEY;
> buf[1] = ch;
> buf[2] = 6;
> buf[3] = 1;
> buf[4] = 1;
> buf[5] = 1;
> buf[6] = '\0';
> return (buf);
422,430c435
< *pp = p+1;
< buf[0] = SK_SPECIAL_KEY;
< buf[1] = ch;
< buf[2] = 6;
< buf[3] = 1;
< buf[4] = 1;
< buf[5] = 1;
< buf[6] = '\0';
< return (buf);
---
> /* FALLTHRU */
439c444
< if (buf[0] == CONTROL('K'))
---
> if (xlate && buf[0] == CONTROL('K'))
457c462
< if (buf[0] == CONTROL('K'))
---
> if (xlate && buf[0] == CONTROL('K'))
642c647
< s = tstr(&p);
---
> s = tstr(&p, 1);
691c696
< add_cmd_str(tstr(&p));
---
> add_cmd_str(tstr(&p, 0));
704c709
< s = tstr(&p);
---
> s = tstr(&p, 0);
724c729
< s = tstr(&p);
---
> s = tstr(&p, 0);
766c771
< char line[200];
---
> char line[1024];