[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[5606] show info version in help window
From: |
Gavin D. Smith |
Subject: |
[5606] show info version in help window |
Date: |
Sun, 25 May 2014 19:28:16 +0000 |
Revision: 5606
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5606
Author: gavin
Date: 2014-05-25 19:28:13 +0000 (Sun, 25 May 2014)
Log Message:
-----------
show info version in help window
Modified Paths:
--------------
trunk/ChangeLog
trunk/info/infodoc.c
trunk/info/session.c
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2014-05-25 18:52:26 UTC (rev 5605)
+++ trunk/ChangeLog 2014-05-25 19:28:13 UTC (rev 5606)
@@ -1,3 +1,8 @@
+2014-05-25 Gavin Smith <address@hidden>
+
+ * info/infodoc.c (create_internal_info_help_node): Show program
+ version in help window.
+
2014-05-25 Karl Berry <address@hidden>
* doc/info-stnd.texi (Invoking info): tweaks to invocation examples;
@@ -13,6 +18,9 @@
* info/window.c (window_physical_lines): Delete unused.
+ * info/session.c (internal_next_line): Delete unused.
+ (info_menu_digit): Formatting.
+
2014-05-25 Gavin Smith <address@hidden>
* info/session.c (info_scroll_forward, info_scroll_backward)
Modified: trunk/info/infodoc.c
===================================================================
--- trunk/info/infodoc.c 2014-05-25 18:52:26 UTC (rev 5605)
+++ trunk/info/infodoc.c 2014-05-25 19:28:13 UTC (rev 5606)
@@ -325,6 +325,7 @@
}
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"));
text_buffer_printf (&msg, "%s\n", infopath_str);
text_buffer_printf (&msg, "---------------------\n\n");
Modified: trunk/info/session.c
===================================================================
--- trunk/info/session.c 2014-05-25 18:52:26 UTC (rev 5605)
+++ trunk/info/session.c 2014-05-25 19:28:13 UTC (rev 5606)
@@ -267,7 +267,7 @@
void
initialize_info_session (void)
{
- if (!terminal_prep_terminal())
+ if (!terminal_prep_terminal ())
{
/* Terminal too dumb to run interactively. */
char *term_name = getenv ("TERM");
@@ -657,22 +657,6 @@
}
}
-/* "Safe" version of info_next_line, for use when moving to a
- reference within the window. It assumes that point is 0 and
- is safe in the sense that it won't allow to change nodes if
- COUNT is greater than the number of lines in the current node.
-
- This is necessary to avoid incorrect placement on malformed
- info documents (such as gawk.info v. 3.1.5) when
- cursor_movement_scrolls_p is set to 1. */
-
-static void
-internal_next_line (WINDOW *window, int count, unsigned char key)
-{
- if (count >= 0 && count < window->line_count)
- info_next_line (window, count, key);
-}
-
/* Move WINDOW's point up to the previous line if possible. */
DECLARE_INFO_COMMAND (info_prev_line, _("Move up to the previous line"))
{
@@ -2304,21 +2288,15 @@
}
if (entry = select_menu_digit (window, key))
- {
- info_select_reference (window, entry);
- }
+ info_select_reference (window, entry);
else if (key == '0')
- {
- /* Don't print "There aren't 0 items in this menu." */
- info_error ("%s", msg_no_menu_node);
- }
+ /* Don't print "There aren't 0 items in this menu." */
+ info_error ("%s", msg_no_menu_node);
else
- {
- info_error (ngettext ("There isn't %d item in this menu.",
- "There aren't %d items in this menu.",
- item),
- item);
- }
+ info_error (ngettext ("There isn't %d item in this menu.",
+ "There aren't %d items in this menu.",
+ item),
+ item);
return;
}
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [5606] show info version in help window,
Gavin D. Smith <=