[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[5671] INFOKEY made unconditional
|
From: |
Gavin D. Smith |
|
Subject: |
[5671] INFOKEY made unconditional |
|
Date: |
Thu, 19 Jun 2014 16:18:39 +0000 |
Revision: 5671
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5671
Author: gavin
Date: 2014-06-19 16:18:37 +0000 (Thu, 19 Jun 2014)
Log Message:
-----------
INFOKEY made unconditional
Modified Paths:
--------------
trunk/ChangeLog
trunk/info/doc.h
trunk/info/info.h
trunk/info/infodoc.c
trunk/info/infomap.c
trunk/info/makedoc.c
trunk/info/pcterm.c
trunk/info/session.c
trunk/info/terminal.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2014-06-17 19:49:05 UTC (rev 5670)
+++ trunk/ChangeLog 2014-06-19 16:18:37 UTC (rev 5671)
@@ -1,3 +1,9 @@
+2014-06-19 Gavin Smith <address@hidden>
+
+ * info/infodoc.c, info/infomap.c, info/makedoc.c, info/pcterm.c,
+ info/session.c, info/terminal.c, info/doc.h, info/info.h: [INFOKEY]:
+ Made unconditional.
+
2014-06-17 Gavin Smith <address@hidden>
* info/terminal.c (term_bt): New variable.
Modified: trunk/info/doc.h
===================================================================
--- trunk/info/doc.h 2014-06-17 19:49:05 UTC (rev 5670)
+++ trunk/info/doc.h 2014-06-19 16:18:37 UTC (rev 5671)
@@ -24,7 +24,6 @@
#include "info.h"
-#if defined (INFOKEY)
/* For each function, we keep track of the first defined key sequence
which invokes that function, for each different map. This is so that
the dynamic documentation generation in infodoc.c (a) doesn't have to
@@ -44,8 +43,6 @@
char *keyseq;
} FUNCTION_KEYSEQ;
-#endif /* INFOKEY */
-
/* An array of FUNCTION_DOC structures is defined in doc.c, which is
automagically generated by the makedoc utility, whose job is to scan
through the source files for command function declarations and
@@ -55,32 +52,21 @@
{
VFunction *func;
char *func_name;
-#if defined (INFOKEY)
FUNCTION_KEYSEQ *keys;
-#endif /* INFOKEY */
- char *doc;
+ char *doc;
} FUNCTION_DOC;
extern FUNCTION_DOC function_doc_array[];
-/* Under the old key-binding system, an info command is specified by
- the pointer to its function. Under the new INFOKEY binding system,
- it is specified by a pointer to the command's FUNCTION_DOC structure,
- defined in doc.c, from which the pointer to the function can be
+/* An Info command is specified by a pointer to the command's FUNCTION_DOC
+ structure, defined in doc.c, from which the pointer to the function can be
easily divined using the InfoFunction() extractor. */
-#if defined(INFOKEY)
typedef FUNCTION_DOC InfoCommand;
/* The cast to VFunction * prevents pgcc from complaining about
dereferencing a void *. */
#define InfoFunction(ic) ((ic) ? (ic)->func : (VFunction *) NULL)
#define InfoCmd(fn) (&function_doc_array[A_##fn])
#define DocInfoCmd(fd) ((fd) && (fd)->func ? (fd) : NULL)
-#else /* !INFOKEY */
-typedef VFunction InfoCommand;
-#define InfoFunction(vf) ((vf))
-#define InfoCmd(fn) fn
-#define DocInfoCmd(fd) ((fd)->func)
-#endif /* !INFOKEY */
#include "infomap.h" /* for Keymap. */
@@ -91,7 +77,8 @@
extern char *pretty_keyname (unsigned char key);
extern char *pretty_keyseq (char *keyseq);
extern char *where_is (Keymap map, InfoCommand *cmd);
-extern char *replace_in_documentation (const char *string, int
help_is_only_window_p);
+extern char *replace_in_documentation (const char *string,
+ int help_is_only_window_p);
extern void dump_map_to_message_buffer (char *prefix, Keymap map);
#endif /* !DOC_H */
Modified: trunk/info/info.h
===================================================================
--- trunk/info/info.h 2014-06-17 19:49:05 UTC (rev 5670)
+++ trunk/info/info.h 2014-06-19 16:18:37 UTC (rev 5671)
@@ -22,9 +22,6 @@
#ifndef INFO_H
#define INFO_H
-/* We always want this, so why clutter up the compile command? */
-#define INFOKEY
-
/* System dependencies. */
#include "system.h"
Modified: trunk/info/infodoc.c
===================================================================
--- trunk/info/infodoc.c 2014-06-17 19:49:05 UTC (rev 5670)
+++ trunk/info/infodoc.c 2014-06-19 16:18:37 UTC (rev 5671)
@@ -44,8 +44,6 @@
help node. The actual key bindings are inserted. Keep the
underlines (****, etc.) in the same N_ call as the text lines they
refer to, so translations can make the number of *'s or -'s match. */
-#if defined(INFOKEY)
-
static char *info_internal_help_text[] = {
N_("Basic Info command keys\n"),
"\n",
@@ -90,104 +88,6 @@
NULL
};
-#else /* !INFOKEY */
-
-static char *info_internal_help_text[] = {
- N_("Basic Commands in Info Windows\n\
-******************************\n"),
- "\n",
- N_(" %-10s Quit this help.\n"),
- N_(" %-10s Quit Info altogether.\n"),
- N_(" %-10s Invoke the Info tutorial.\n"),
- "\n",
- N_("Selecting other nodes:\n\
-----------------------\n",
- N_(" %-10s Move to the `next' node of this node.\n"),
- N_(" %-10s Move to the `previous' node of this node.\n"),
- N_(" %-10s Move `up' from this node.\n"),
- N_(" %-10s Pick menu item specified by name.\n\
- Picking a menu item causes another node to be selected.\n"),
- N_(" %-10s Follow a cross reference. Reads name of reference.\n"),
- N_(" %-10s Move to the last node seen in this window.\n"),
- N_(" %-10s Skip to next hypertext link within this node.\n"),
- N_(" %-10s Follow the hypertext link under cursor.\n"),
- N_(" %-10s Move to the `directory' node. Equivalent to `g (DIR)'.\n"),
- N_(" %-10s Move to the Top node. Equivalent to `g Top'.\n"),
- "\n",
- N_("Moving within a node:\n\
----------------------\n"),
- N_(" %-10s Scroll forward a page.\n"),
- N_(" %-10s Scroll backward a page.\n"),
- N_(" %-10s Go to the beginning of this node.\n"),
- N_(" %-10s Go to the end of this node.\n"),
- N_(" %-10s Scroll forward 1 line.\n"),
- N_(" %-10s Scroll backward 1 line.\n"),
- "\n",
- N_("Other commands:\n\
----------------\n"),
- N_(" %-10s Pick first...ninth item in node's menu.\n"),
- N_(" %-10s Pick last item in node's menu.\n"),
- /* The next four strings are each a unity, so they each need to be
- kept as one string for the translators. */
- N_(" %-10s Search for a specified string in the index entries of this
Info\n\
- file, and select the node referenced by the first entry
found.\n"),
- N_(" %-10s Move to node specified by name.\n\
- You may include a filename as well, as in
(FILENAME)NODENAME.\n"),
- N_(" %-10s Search forward for a specified string,\n\
- and select the node in which the next occurrence is found.\n"),
- N_(" %-10s Search backward for a specified string,\n\
- and select the node in which the next occurrence is found.\n"),
- NULL
-};
-
-static char *info_help_keys_text[][2] = {
- { "", "" },
- { "", "" },
- { "", "" },
- { "CTRL-x 0", "CTRL-x 0" },
- { "q", "q" },
- { "h", "ESC h" },
- { "", "" },
- { "", "" },
- { "", "" },
- { "SPC", "SPC" },
- { "DEL", "b" },
- { "b", "ESC b" },
- { "e", "ESC e" },
- { "ESC 1 SPC", "RET" },
- { "ESC 1 DEL", "y" },
- { "", "" },
- { "", "" },
- { "", "" },
- { "n", "CTRL-x n" },
- { "p", "CTRL-x p" },
- { "u", "CTRL-x u" },
- { "m", "ESC m" },
- { "", "" },
- { "f", "ESC f" },
- { "l", "l" },
- { "TAB", "TAB" },
- { "RET", "CTRL-x RET" },
- { "d", "ESC d" },
- { "t", "ESC t" },
- { "", "" },
- { "", "" },
- { "", "" },
- { "1-9", "ESC 1-9" },
- { "0", "ESC 0" },
- { "i", "CTRL-x i" },
- { "", "" },
- { "g", "CTRL-x g" },
- { "", "" },
- { "s", "/" },
- { "", "" },
- { "ESC - s", "?" },
- { "", "" },
- NULL
-};
-
-#endif /* !INFOKEY */
-
static char *where_is_internal (Keymap map, InfoCommand *cmd);
void
@@ -303,28 +203,10 @@
text_buffer_init (&msg);
for (i = 0; info_internal_help_text[i]; i++)
- {
-#ifdef INFOKEY
- text_buffer_printf (&msg, replace_in_documentation
- (_(info_internal_help_text[i]), help_is_only_window_p),
- NULL, NULL, NULL);
-#else
- /* Don't translate blank lines, gettext outputs the po file
- header in that case. We want a blank line. */
- char *mesg = *(info_internal_help_text[i])
- ? _(info_internal_help_text[i])
- : info_internal_help_text[i];
- char *key = info_help_keys_text[i][vi_keys_p];
+ text_buffer_printf (&msg, replace_in_documentation
+ (_(info_internal_help_text[i]),
+ help_is_only_window_p), NULL, NULL, NULL);
- /* If we have only one window (because the window size was too
- small to split it), CTRL-x 0 doesn't work to `quit' help. */
- if (STREQ (key, "CTRL-x 0") && help_is_only_window_p)
- key = "l";
-
- text_buffer_printf (&msg, mesg, key, NULL, NULL);
-#endif /* !INFOKEY */
- }
-
text_buffer_printf (&msg, "---------------------\n");
text_buffer_printf (&msg, _("This is GNU Info version %s. "), VERSION);
text_buffer_printf (&msg, _("The current search path is:\n"));
@@ -563,22 +445,8 @@
{
char *doc;
-#if defined (INFOKEY)
-
doc = cmd->doc;
-#else /* !INFOKEY */
-
- register int i;
-
- for (i = 0; function_doc_array[i].func; i++)
- if (InfoFunction(cmd) == function_doc_array[i].func)
- break;
-
- doc = function_doc_array[i].func ? function_doc_array[i].doc : "";
-
-#endif /* !INFOKEY */
-
return replace_in_documentation ((strlen (doc) == 0) ? doc : _(doc), 0);
}
@@ -587,21 +455,7 @@
char *
function_name (InfoCommand *cmd)
{
-#if defined (INFOKEY)
-
return cmd->func_name;
-
-#else /* !INFOKEY */
-
- register int i;
-
- for (i = 0; function_doc_array[i].func; i++)
- if (InfoFunction(cmd) == function_doc_array[i].func)
- break;
-
- return function_doc_array[i].func_name;
-
-#endif /* !INFOKEY */
}
/* Return a pointer to the info command for function NAME. */
@@ -633,22 +487,6 @@
keystroke = info_get_input_char ();
unmessage_in_echo_area ();
-#if !defined (INFOKEY)
- if (Meta_p (keystroke))
- {
- if (map[ESC].type != ISKMAP)
- {
- window_message_in_echo_area
- (_("ESC %s is undefined."), pretty_keyname (UnMeta (keystroke)));
- return;
- }
-
- *k++ = '\e';
- keystroke = UnMeta (keystroke);
- map = (Keymap)map[ESC].function;
- }
-#endif /* !INFOKEY */
-
/* Add the KEYSTROKE to our list. */
*k++ = keystroke;
*k = '\0';
@@ -667,7 +505,6 @@
{
char *keyname, *message, *fundoc, *funname = "";
-#if defined (INFOKEY)
/* If the key is bound to do-lowercase-version, but its
lower-case variant is undefined, say that this key is
also undefined. This is especially important for unbound
@@ -688,7 +525,6 @@
return;
}
}
-#endif
keyname = pretty_keyseq (keys);
@@ -721,11 +557,7 @@
rep = pretty_keyname (UnMeta (key));
-#if defined (INFOKEY)
sprintf (temp, "M-%s", rep);
-#else /* !INFOKEY */
- sprintf (temp, "ESC %s", rep);
-#endif /* !INFOKEY */
strcpy (rep_buffer, temp);
rep = rep_buffer;
}
@@ -786,7 +618,6 @@
strcpy(rep, "PgDn");
keyseq += strlen(term_kN);
}
-#if defined(INFOKEY)
else if (term_kh && strncmp(keyseq, term_kh, strlen(term_kh)) == 0)
{
strcpy(rep, "Home");
@@ -807,7 +638,6 @@
strcpy(rep, "DEL");
keyseq += strlen(term_kx);
}
-#endif /* INFOKEY */
else if (term_ku && strncmp(keyseq, term_ku, strlen(term_ku)) == 0)
{
strcpy(rep, "Up");
@@ -1069,8 +899,6 @@
static char *
where_is_internal (Keymap map, InfoCommand *cmd)
{
-#if defined(INFOKEY)
-
register FUNCTION_KEYSEQ *k;
for (k = cmd->keys; k; k = k->next)
@@ -1078,52 +906,6 @@
return pretty_keyseq (k->keyseq);
return NULL;
-
-#else /* !INFOKEY */
- /* There is a bug in that create_internal_info_help_node calls
- where_is_internal without setting where_is_rep_index to zero. This
- was found by Mandrake and reported by Thierry Vignaud
- <address@hidden> around April 24, 2002.
-
- I think the best fix is to make where_is_rep_index another
- parameter to this recursively-called function, instead of a static
- variable. But this [!INFOKEY] branch of the code is not enabled
- any more, so let's just skip the whole thing. --karl, 28sep02. */
- register int i;
-
- /* If the function is directly invokable in MAP, return the representation
- of that keystroke. */
- for (i = 0; i < 256; i++)
- if ((map[i].type == ISFUNC) && map[i].function == cmd)
- {
- sprintf (where_is_rep + where_is_rep_index, "%s", pretty_keyname (i));
- return where_is_rep;
- }
-
- /* Okay, search subsequent maps for this function. */
- for (i = 0; i < 256; i++)
- {
- if (map[i].type == ISKMAP)
- {
- int saved_index = where_is_rep_index;
- char *rep;
-
- sprintf (where_is_rep + where_is_rep_index, "%s ",
- pretty_keyname (i));
-
- where_is_rep_index = strlen (where_is_rep);
- rep = where_is_internal ((Keymap)map[i].function, cmd);
-
- if (rep)
- return where_is_rep;
-
- where_is_rep_index = saved_index;
- }
- }
-
- return NULL;
-
-#endif /* INFOKEY */
}
DECLARE_INFO_COMMAND (info_where_is,
Modified: trunk/info/infomap.c
===================================================================
--- trunk/info/infomap.c 2014-06-17 19:49:05 UTC (rev 5670)
+++ trunk/info/infomap.c 2014-06-19 16:18:37 UTC (rev 5671)
@@ -24,10 +24,8 @@
#include "funs.h"
#include "terminal.h"
-#if defined(INFOKEY)
#include "infokey.h"
#include "variables.h"
-#endif /* INFOKEY */
static int keymap_bind_keyseq (Keymap map, const char *keyseq,
KEYMAP_ENTRY *keyentry);
@@ -51,17 +49,14 @@
for (i = 'A'; i < ('Z' + 1); i++)
{
keymap[i].type = ISFUNC;
-#if defined(INFOKEY)
keymap[Meta(i)].type = ISFUNC;
keymap[Meta(i)].function =
-#endif /* INFOKEY */
keymap[i].function = InfoCmd (info_do_lowercase_version);
}
return keymap;
}
-#if defined(INFOKEY)
static FUNCTION_KEYSEQ *
find_function_keyseq (Keymap map, int c, Keymap rootmap)
{
@@ -126,7 +121,6 @@
else
function->keys = k->next;
}
-#endif /* INFOKEY */
/* Return a new keymap which is a copy of MAP. */
Keymap
@@ -134,9 +128,7 @@
{
int i;
Keymap keymap;
-#if defined(INFOKEY)
FUNCTION_KEYSEQ *ks;
-#endif /* INFOKEY */
keymap = keymap_make_keymap ();
if (!newroot)
@@ -149,11 +141,9 @@
{
case ISFUNC:
keymap[i].function = map[i].function;
-#if defined(INFOKEY)
ks = find_function_keyseq (map, i, rootmap);
if (ks)
add_function_keyseq (map[i].function, ks->keyseq, newroot);
-#endif /* INFOKEY */
break;
case ISKMAP:
keymap[i].function =
@@ -178,17 +168,13 @@
for (i = 0; i < 256; i++)
{
-#if defined(INFOKEY)
FUNCTION_KEYSEQ *ks;
-#endif /* INFOKEY */
switch (map[i].type)
{
case ISFUNC:
-#if defined(INFOKEY)
ks = find_function_keyseq (map, i, rootmap);
if (ks)
remove_function_keyseq (map[i].function, ks->keyseq, rootmap);
-#endif /* INFOKEY */
break;
case ISKMAP:
@@ -213,22 +199,13 @@
while ((c = *s++) != '\0')
{
-#if defined(INFOKEY)
FUNCTION_KEYSEQ *ks;
-#endif /* INFOKEY */
switch (m[c].type)
{
case ISFUNC:
-#if defined(INFOKEY)
ks = find_function_keyseq (m, c, map);
if (ks)
remove_function_keyseq (m[c].function, ks->keyseq, map);
-#else /* !INFOKEY */
- if (!(m[c].function == NULL ||
- (m != map &&
- m[c].function == InfoCmd (info_do_lowercase_version))))
- return 0;
-#endif /* !INFOKEY */
if (*s != '\0')
{
@@ -244,13 +221,8 @@
break;
case ISKMAP:
-#if defined(INFOKEY)
if (*s == '\0')
keymap_discard_keymap ((Keymap)m[c].function, map);
-#else /* !INFOKEY */
- if (*s == '\0')
- return 0;
-#endif
break;
}
if (*s != '\0')
@@ -259,9 +231,7 @@
}
else
{
-#if defined(INFOKEY)
add_function_keyseq (keyentry->function, keyseq, map);
-#endif /* INFOKEY */
m[c] = *keyentry;
}
}
Modified: trunk/info/makedoc.c
===================================================================
--- trunk/info/makedoc.c 2014-06-17 19:49:05 UTC (rev 5670)
+++ trunk/info/makedoc.c 2014-06-19 16:18:37 UTC (rev 5671)
@@ -204,18 +204,7 @@
process_one_file (curfile, doc_stream, key_stream, funs_stream);
}
-#if defined (INFOKEY)
-
- fprintf (doc_stream,
- " { NULL, NULL, NULL, NULL }\n};\n");
-
-#else /* !INFOKEY */
-
- fprintf (doc_stream,
- " { NULL, NULL, NULL }\n};\n");
-
-#endif /* !INFOKEY */
-
+ fprintf (doc_stream, " { NULL, NULL, NULL, NULL }\n};\n");
fprintf (key_stream, " { NULL, 0 }\n};\n");
fprintf (funs_stream, "\n#define A_NCOMMANDS %u\n", next_func_key());
@@ -487,25 +476,15 @@
strncpy (doc, buffer + point, offset - point);
doc[offset - point] = '\0';
-#if defined (INFOKEY)
-
fprintf (doc_stream,
" { (VFunction *)%s, \"%s\", (FUNCTION_KEYSEQ *)0, %s },\n",
func, func_name, doc);
fprintf (key_stream, " { \"%s\", A_%s },\n", func_name, func);
-#else /* !INFOKEY */
-
- fprintf (doc_stream, " { %s, \"%s\", %s },\n", func, func_name, doc);
-
-#endif /* !INFOKEY */
-
free (func_name);
-#if defined (INFOKEY)
fprintf (funs_stream, "#define A_%s %u\n", func, next_func_key());
-#endif /* INFOKEY */
fprintf (funs_stream,
"extern void %s (WINDOW *window, int count, unsigned char key);\n",
func);
Modified: trunk/info/pcterm.c
===================================================================
--- trunk/info/pcterm.c 2014-06-17 19:49:05 UTC (rev 5670)
+++ trunk/info/pcterm.c 2014-06-19 16:18:37 UTC (rev 5671)
@@ -1,7 +1,7 @@
/* pcterm.c -- How to handle the PC terminal for Info under MS-DOS/MS-Windows.
$Id$
- Copyright 1998, 1999, 2003, 2004, 2007, 2008, 2012, 2013
+ Copyright 1998, 1999, 2003, 2004, 2007, 2008, 2012, 2013, 2014
Free Software Foundation, Inc.
This program is free software: you can redistribute it and/or modify
@@ -880,12 +880,10 @@
term_kP = (char *)find_sequence (K_PageUp);
term_kN = (char *)find_sequence (K_PageDown);
-#if defined(INFOKEY)
term_kh = (char *)find_sequence (K_Home);
term_ke = (char *)find_sequence (K_End);
term_ki = (char *)find_sequence (K_Insert);
term_kx = (char *)find_sequence (K_Delete);
-#endif
#endif /* __MSDOS__ */
/* Set all the hooks to our PC-specific functions. */
@@ -940,13 +938,8 @@
{K_Control_Down, "\033\061m"},
{K_Control_Center, "\033\061l"},
-#if defined(INFOKEY)
{K_Home, "\033[H"}, /* ...and these are for moving IN a node */
{K_End, "\033[F"}, /* they're Numeric-Keypad-Keys, so */
-#else
- {K_Home, "\001"},
- {K_End, "\005"},
-#endif
{K_Left, "\033[D"}, /* NUMLOCK should be off !! */
{K_Right, "\033[C"},
{K_Down, "\033[B"},
@@ -958,13 +951,8 @@
{K_Control_Home, "\033<"},
{K_Control_End, "\033>"},
-#if defined(INFOKEY)
{K_EHome, "\033[H"}, /* these are also for moving IN a node */
{K_EEnd, "\033[F"}, /* they're the "extended" (Grey) keys */
-#else
- {K_EHome, "\001"},
- {K_EEnd, "\005"},
-#endif
{K_ELeft, "\033[D"},
{K_ERight, "\033[C"},
{K_EDown, "\033[B"},
@@ -980,10 +968,8 @@
{K_F1, "\10"}, /* YEAH, gimme that good old F-one-thing */
{K_Delete, "\177"}, /* to make Kp-Del be DEL (0x7f) */
{K_EDelete, "\177"}, /* to make Delete be DEL (0x7f) */
-#if defined(INFOKEY)
{K_Insert, "\033[L"},
{K_EInsert, "\033[L"},
-#endif
/* These are here to map more Alt-X keys to ESC X sequences. */
{K_Alt_Q, "\033q"},
Modified: trunk/info/session.c
===================================================================
--- trunk/info/session.c 2014-06-17 19:49:05 UTC (rev 5670)
+++ trunk/info/session.c 2014-06-19 16:18:37 UTC (rev 5671)
@@ -4296,24 +4296,6 @@
void
info_dispatch_on_key (unsigned char key, Keymap map)
{
-#if !defined(INFOKEY)
- if (Meta_p (key) && (!ISO_Latin_p || map[key].function != ea_insert))
- {
- if (map[ESC].type == ISKMAP)
- {
- map = (Keymap)map[ESC].function;
- add_char_to_keyseq (ESC);
- key = UnMeta (key);
- info_dispatch_on_key (key, map);
- }
- else
- {
- dispatch_error (info_keyseq);
- }
- return;
- }
-#endif /* INFOKEY */
-
switch (map[key].type)
{
case ISFUNC:
@@ -4326,10 +4308,10 @@
/* Special case info_do_lowercase_version (). */
if (func == (VFunction *) info_do_lowercase_version)
{
-#if defined(INFOKEY)
unsigned char lowerkey;
- lowerkey = Meta_p(key) ? Meta (tolower (UnMeta (key))) :
tolower (key);
+ lowerkey = Meta_p(key) ? Meta (tolower (UnMeta (key)))
+ : tolower (key);
if (lowerkey == key)
{
add_char_to_keyseq (key);
@@ -4337,9 +4319,6 @@
return;
}
info_dispatch_on_key (lowerkey, map);
-#else /* !INFOKEY */
- info_dispatch_on_key (tolower (key), map);
-#endif /* INFOKEY */
return;
}
@@ -4494,21 +4473,9 @@
pure_key = key = info_get_another_input_char ();
-#if !defined(INFOKEY)
- if (Meta_p (key))
- add_char_to_keyseq (ESC);
-
- add_char_to_keyseq (UnMeta (key));
-#else /* defined(INFOKEY) */
add_char_to_keyseq (key);
-#endif /* defined(INFOKEY) */
}
-#if !defined(INFOKEY)
- if (Meta_p (key))
- key = UnMeta (key);
-#endif /* !defined(INFOKEY) */
-
if (keymap[key].type == ISFUNC
&& InfoFunction(keymap[key].function)
== (VFunction *) info_universal_argument)
@@ -4518,12 +4485,9 @@
continue;
}
-#if defined(INFOKEY)
if (Meta_p (key))
key = UnMeta (key);
-#endif /* !defined(INFOKEY) */
-
if (isdigit (key))
{
if (*which_explicit_arg)
Modified: trunk/info/terminal.c
===================================================================
--- trunk/info/terminal.c 2014-06-17 19:49:05 UTC (rev 5670)
+++ trunk/info/terminal.c 2014-06-19 16:18:37 UTC (rev 5671)
@@ -633,12 +633,10 @@
term_kP = tgetstr ("kP", &buffer);
term_kN = tgetstr ("kN", &buffer);
-#if defined(INFOKEY)
term_kh = tgetstr ("kh", &buffer);
term_ke = tgetstr ("@7", &buffer);
term_ki = tgetstr ("kI", &buffer);
term_kx = tgetstr ("kD", &buffer);
-#endif /* defined(INFOKEY) */
/* Home and end keys. */
term_kh = tgetstr ("kh", &buffer);
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [5671] INFOKEY made unconditional,
Gavin D. Smith <=