[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[5559] --node with dir entry; W_UpdateWindow
From: |
Gavin D. Smith |
Subject: |
[5559] --node with dir entry; W_UpdateWindow |
Date: |
Mon, 12 May 2014 13:29:39 +0000 |
Revision: 5559
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5559
Author: gavin
Date: 2014-05-12 13:29:37 +0000 (Mon, 12 May 2014)
Log Message:
-----------
--node with dir entry; W_UpdateWindow
Modified Paths:
--------------
trunk/ChangeLog
trunk/info/info.c
trunk/info/infodoc.c
trunk/info/session.c
trunk/info/session.h
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2014-05-11 20:21:00 UTC (rev 5558)
+++ trunk/ChangeLog 2014-05-12 13:29:37 UTC (rev 5559)
@@ -1,5 +1,17 @@
2014-05-11 Gavin Smith <address@hidden>
+ * info/info.c (add_initial_nodes): Discard dir entry from initial
+ node list if --node was used.
+
+ * info/session.c (info_move_to_xref): Remove set of W_UpdateWindow.
+ This was causing some screen flicker.
+ * info/infodoc.c (info_get_help_window): Remove unnecessary set of
+ W_UpdateWindow.
+
+ * info/session.c (quit_info_immediately): Declared static.
+
+2014-05-11 Gavin Smith <address@hidden>
+
* info/info-utils.c (scan_reference_target) <preprocess-nodes=On>:
Deal with newline following colon in cross-reference better.
(info_copy_references, copy_converting): Comments added.
Modified: trunk/info/info.c
===================================================================
--- trunk/info/info.c 2014-05-11 20:21:00 UTC (rev 5558)
+++ trunk/info/info.c 2014-05-12 13:29:37 UTC (rev 5559)
@@ -276,15 +276,24 @@
/* Add nodes specified with --node. */
if (user_nodenames)
- for (i = 0; user_nodenames[i]; i++)
- {
- new_ref = xzalloc (sizeof (REFERENCE));
- new_ref->filename = initial_file->fullpath;
- new_ref->nodename = user_nodenames[i];
+ {
+ if (ref_index > 0)
+ {
+ /* Discard a dir entry that was found. */
+ free (ref_list[0]);
+ ref_index = 0;
+ }
- add_pointer_to_array (new_ref, ref_index, ref_list, ref_slots, 2);
- }
+ for (i = 0; user_nodenames[i]; i++)
+ {
+ new_ref = xzalloc (sizeof (REFERENCE));
+ new_ref->filename = initial_file->fullpath;
+ new_ref->nodename = user_nodenames[i];
+ add_pointer_to_array (new_ref, ref_index, ref_list, ref_slots, 2);
+ }
+ }
+
if (goto_invocation_p)
{
NODE *top_node;
Modified: trunk/info/infodoc.c
===================================================================
--- trunk/info/infodoc.c 2014-05-11 20:21:00 UTC (rev 5558)
+++ trunk/info/infodoc.c 2014-05-12 13:29:37 UTC (rev 5559)
@@ -494,7 +494,6 @@
if (help_window)
{
active_window = help_window;
- active_window->flags |= W_UpdateWindow;
}
}
Modified: trunk/info/session.c
===================================================================
--- trunk/info/session.c 2014-05-11 20:21:00 UTC (rev 5558)
+++ trunk/info/session.c 2014-05-12 13:29:37 UTC (rev 5559)
@@ -65,7 +65,7 @@
VFunction *info_last_executed_command = NULL;
/* Becomes non-zero when 'q' is typed to an Info window. */
-int quit_info_immediately = 0;
+static int quit_info_immediately = 0;
/* Array of structures describing for each window which nodes have been
visited in that window. */
@@ -2648,7 +2648,6 @@
window->point = placement;
window_adjust_pagetop (window);
- window->flags |= W_UpdateWindow;
return 0;
}
Modified: trunk/info/session.h
===================================================================
--- trunk/info/session.h 2014-05-11 20:21:00 UTC (rev 5558)
+++ trunk/info/session.h 2014-05-12 13:29:37 UTC (rev 5559)
@@ -25,8 +25,6 @@
#include "info.h"
#include "dribble.h"
-extern int quit_info_immediately;
-
/* All commands that can be invoked from within info_session () receive
arguments in the same way. This simple define declares the header
of a function named NAME, with associated documentation DOC. The
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [5559] --node with dir entry; W_UpdateWindow,
Gavin D. Smith <=