[5626] print_node merged

[Gavin D. Smith]

Revision: 5626
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5626
Author:   gavin
Date:     2014-06-01 20:42:16 +0000 (Sun, 01 Jun 2014)
Log Message:
-----------
print_node merged

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/session.c
    trunk/info/session.h

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-06-01 20:33:10 UTC (rev 5625)
+++ trunk/ChangeLog     2014-06-01 20:42:16 UTC (rev 5626)
@@ -1,5 +1,10 @@
 2014-06-01  Gavin Smith  <address@hidden>
 
+       * info/session.c (info_print_node, print_node): print_node merged
+       into info_print_node.
+
+2014-06-01  Gavin Smith  <address@hidden>
+
        * info/window.h (WINDOW): Fields nodes, pagetops, points
        nodes_index, nodes_slots removed.  Replaced with hist, hist_index
        and hist_slots.

Modified: trunk/info/session.c
===================================================================
--- trunk/info/session.c        2014-06-01 20:33:10 UTC (rev 5625)
+++ trunk/info/session.c        2014-06-01 20:42:16 UTC (rev 5626)
@@ -3181,13 +3181,6 @@
 DECLARE_INFO_COMMAND (info_print_node,
  _("Pipe the contents of this node through INFO_PRINT_COMMAND"))
 {
-    print_node (window->node);
-}
-
-/* Print NODE on a printer piping it into INFO_PRINT_COMMAND. */
-void
-print_node (NODE *node)
-{
   FILE *printer_pipe;
   char *print_command = getenv ("INFO_PRINT_COMMAND");
   int piping = 0;
@@ -3219,15 +3212,15 @@
     }
 
   /* Maybe we should print some information about the node being output. */
-  debug (1, (_("printing node %s..."), node_printed_rep (node)));
+  debug (1, (_("printing node %s..."), node_printed_rep (window->node)));
 
-  write_node_to_stream (node, printer_pipe);
+  write_node_to_stream (window->node, printer_pipe);
   if (piping)
     pclose (printer_pipe);
   else
     fclose (printer_pipe);
 
-  debug (1, (_("finished printing node %s"), node_printed_rep (node)));
+  debug (1, (_("finished printing node %s"), node_printed_rep (window->node)));
 }
 
 static int

Modified: trunk/info/session.h
===================================================================
--- trunk/info/session.h        2014-06-01 20:33:10 UTC (rev 5625)
+++ trunk/info/session.h        2014-06-01 20:42:16 UTC (rev 5626)
@@ -91,7 +91,6 @@
     long int start, int use_regexp_mask);
 extern void info_select_reference (WINDOW *window, REFERENCE *entry);
 extern int info_any_buffered_input_p (void);
-extern void print_node (NODE *node);
 
 #define DUMP_SUBNODES 0x02