[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
texinfo update (Thu Feb 28 20:23:01 EST 2008)
|
From: |
Karl Berry |
|
Subject: |
texinfo update (Thu Feb 28 20:23:01 EST 2008) |
|
Date: |
Thu, 28 Feb 2008 20:23:06 -0500 |
Index: ChangeLog
===================================================================
RCS file: /sources/texinfo/texinfo/ChangeLog,v
retrieving revision 1.839
retrieving revision 1.840
diff -u -r1.839 -r1.840
--- ChangeLog 28 Feb 2008 14:47:36 -0000 1.839
+++ ChangeLog 29 Feb 2008 01:06:40 -0000 1.840
@@ -1,7 +1,9 @@
2008-02-28 Karl Berry <address@hidden>
* info/infodoc.c (info_internal_help_text): more tweaks.
- Suggestions from Benno Schulenberg, 27 Feb 2008 23:44:17.
+ * info/infomap.c: move up/down to end, too.
+ Suggestions from Benno Schulenberg, 27 Feb 2008 23:44:17
+ and 28 Feb 2008 22:49:27.
2008-02-28 Akim Demaille <address@hidden>
Index: info/infodoc.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/infodoc.c,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -r1.22 -r1.23
--- info/infodoc.c 28 Feb 2008 14:47:37 -0000 1.22
+++ info/infodoc.c 29 Feb 2008 01:06:40 -0000 1.23
@@ -1,5 +1,5 @@
/* infodoc.c -- functions which build documentation nodes.
- $Id: infodoc.c,v 1.22 2008/02/28 14:47:37 karl Exp $
+ $Id: infodoc.c,v 1.23 2008/02/29 01:06:40 karl Exp $
Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2006,
2007, 2008 Free Software Foundation, Inc.
@@ -59,21 +59,25 @@
N_("\\%-10[global-prev-node] Go to the previous node in the document.\n"),
N_("\\%-10[move-to-next-xref] Skip to the next hypertext link.\n"),
N_("\\%-10[select-reference-this-line] Follow the hypertext link under the
cursor.\n"),
- N_("\\%-10[history-node] Return to the previous node seen in this
window.\n"),
+ N_("\\%-10[history-node] Go back to the last node seen in this window.\n"),
N_("\\%-10[up-node] Go up one level.\n"),
N_("\\%-10[top-node] Go to the top node of this document.\n"),
N_("\\%-10[dir-node] Go to the main `directory' node.\n"),
"\n",
N_("\\%-10[search] Search forward for a specified string.\n"),
+ N_("\\%-10[search-next] Repeat last search in same direction.\n"),
+ N_("\\%-10[search-previous] Repeat last search in reverse direction.\n"),
N_("\\%-10[index-search] Search for a specified string in the index, and\n\
select the node referenced by the first entry found.\n"),
+ N_("\\%-10[abort-key] Cancel the current operation.\n"),
+ "\n",
N_("1...9 Pick the first...ninth item in this node's menu.\n"),
N_("\\%-10[last-menu-item] Pick the last item in this node's menu.\n"),
N_("\\%-10[menu-item] Pick a menu item specified by name.\n"),
N_("\\%-10[xref-item] Follow a cross reference specified by name.\n"),
N_("\\%-10[goto-node] Go to a node specified by name.\n"),
- N_("\\%-10[next-node] Move to the next node within the current section.\n"),
- N_("\\%-10[prev-node] Move to the previous node within the current
section.\n"),
+ N_("\\%-10[next-node] Go to the next node on this level.\n"),
+ N_("\\%-10[prev-node] Go to the previous node on this level.\n"),
NULL
};
Index: info/infomap.c
===================================================================
RCS file: /sources/texinfo/texinfo/info/infomap.c,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- info/infomap.c 27 Feb 2008 18:19:34 -0000 1.18
+++ info/infomap.c 29 Feb 2008 01:06:40 -0000 1.19
@@ -1,5 +1,5 @@
/* infomap.c -- keymaps for Info.
- $Id: infomap.c,v 1.18 2008/02/27 18:19:34 karl Exp $
+ $Id: infomap.c,v 1.19 2008/02/29 01:06:40 karl Exp $
Copyright (C) 1993, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2007, 2008
Free Software Foundation, Inc.
@@ -295,7 +295,6 @@
CONTROL('b'), NUL, A_info_backward_char,
CONTROL('e'), NUL, A_info_end_of_line,
CONTROL('f'), NUL, A_info_forward_char,
- CONTROL('g'), NUL, A_info_abort_key,
CONTROL('h'), NUL, A_info_get_help_window,
CONTROL('l'), NUL, A_info_redraw_display,
CONTROL('n'), NUL, A_info_next_line,
@@ -405,22 +404,14 @@
CONTROL('x'), 't', NUL, A_info_tile_windows,
CONTROL('x'), 'w', NUL, A_info_toggle_wrap,
- /* We want help to report q, not C-x C-c, etc. */
- 'q', NUL, A_info_quit,
- 'x', NUL, A_info_delete_window,
- SPC, NUL, A_info_scroll_forward,
- DEL, NUL, A_info_scroll_backward,
-
/* Arrow key bindings for info keymaps. It seems that some
terminals do not match their termcap entries, so it's best to just
define everything with both of the usual prefixes. */
SK_ESCAPE, SK_PAGE_UP, NUL, A_info_scroll_backward,
SK_ESCAPE, SK_PAGE_DOWN, NUL, A_info_scroll_forward,
- SK_ESCAPE, SK_UP_ARROW, NUL, A_info_prev_line,
'\033', 'O', 'A', NUL, A_info_prev_line,
'\033', '[', 'A', NUL, A_info_prev_line,
- SK_ESCAPE, SK_DOWN_ARROW, NUL, A_info_next_line,
'\033', 'O', 'B', NUL, A_info_next_line,
'\033', '[', 'B', NUL, A_info_next_line,
SK_ESCAPE, SK_RIGHT_ARROW, NUL, A_info_forward_char,
@@ -447,8 +438,20 @@
ESC, SK_ESCAPE, SK_LEFT_ARROW, NUL, A_info_backward_word,
ESC, '\033', 'O', 'D', NUL, A_info_backward_word,
ESC, '\033', '[', 'D', NUL, A_info_backward_word,
+
+ /* We want help to report q, not C-x C-c, etc. */
+ 'q', NUL, A_info_quit,
+ 'x', NUL, A_info_delete_window,
+ SPC, NUL, A_info_scroll_forward,
+ DEL, NUL, A_info_scroll_backward,
+ '{', NUL, A_info_search_next,
+ '}', NUL, A_info_search_previous,
+ CONTROL('g'), NUL, A_info_abort_key,
+ SK_ESCAPE, SK_UP_ARROW, NUL, A_info_prev_line,
+ SK_ESCAPE, SK_DOWN_ARROW, NUL, A_info_next_line,
};
+
static unsigned char default_emacs_like_ea_keys[] =
{
0, /* suppress-default-keybindings flag */
@@ -552,6 +555,7 @@
CONTROL('x'), SK_ESCAPE, SK_DELETE, NUL,A_ea_backward_kill_line,
};
+
static unsigned char default_vi_like_info_keys[] =
{
0, /* suppress-default-keybindings flag */
@@ -574,7 +578,6 @@
CONTROL('d'), NUL, A_info_scroll_half_screen_down,
CONTROL('e'), NUL, A_info_down_line,
CONTROL('f'), NUL, A_info_scroll_forward_page_only,
- CONTROL('g'), NUL, A_info_abort_key,
CONTROL('k'), NUL, A_info_up_line,
CONTROL('l'), NUL, A_info_redraw_display,
CONTROL('n'), NUL, A_info_down_line,
@@ -699,22 +702,14 @@
CONTROL('x'), 'w', NUL, A_info_toggle_wrap,
CONTROL('x'), ',', NUL, A_info_next_index_match,
- /* We want help to report q, not C-x C-c, etc. */
- 'q', NUL, A_info_quit,
- 'x', NUL, A_info_delete_window,
- SPC, NUL, A_info_scroll_forward,
- DEL, NUL, A_info_scroll_backward,
-
/* Arrow key bindings for info keymaps. It seems that some
terminals do not match their termcap entries, so it's best to just
define everything with both of the usual prefixes. */
SK_ESCAPE, SK_PAGE_UP, NUL, A_info_scroll_backward,
SK_ESCAPE, SK_PAGE_DOWN, NUL, A_info_scroll_forward,
- SK_ESCAPE, SK_UP_ARROW, NUL, A_info_up_line,
'\033', 'O', 'A', NUL, A_info_up_line,
'\033', '[', 'A', NUL, A_info_up_line,
- SK_ESCAPE, SK_DOWN_ARROW, NUL, A_info_down_line,
'\033', 'O', 'B', NUL, A_info_down_line,
'\033', '[', 'B', NUL, A_info_down_line,
SK_ESCAPE, SK_RIGHT_ARROW, NUL,
A_info_scroll_forward_page_only,
@@ -741,8 +736,20 @@
ESC, '\033', 'O', 'D', NUL, A_info_beginning_of_node,
ESC, '\033', '[', 'D', NUL, A_info_beginning_of_node,
CONTROL('x'), SK_ESCAPE, SK_DELETE, NUL,A_ea_backward_kill_line,
+
+ /* We want help to report q, not C-x C-c, etc. */
+ 'q', NUL, A_info_quit,
+ 'x', NUL, A_info_delete_window,
+ SPC, NUL, A_info_scroll_forward,
+ DEL, NUL, A_info_scroll_backward,
+ '{', NUL, A_info_search_next,
+ '}', NUL, A_info_search_previous,
+ CONTROL('g'), NUL, A_info_abort_key,
+ SK_ESCAPE, SK_UP_ARROW, NUL, A_info_up_line,
+ SK_ESCAPE, SK_DOWN_ARROW, NUL, A_info_down_line,
};
+
static unsigned char default_vi_like_ea_keys[] =
{
0, /* suppress-default-keybindings flag */
@@ -857,6 +864,7 @@
CONTROL('x'), SK_ESCAPE, SK_DELETE, NUL,A_ea_backward_kill_line,
};
+
static unsigned char *user_info_keys;
static unsigned int user_info_keys_len;
static unsigned char *user_ea_keys;
P ChangeLog
P info/infodoc.c
P info/infomap.c
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- texinfo update (Thu Feb 28 20:23:01 EST 2008),
Karl Berry <=