[5656] kill-node command removed

[Gavin D. Smith]

Revision: 5656
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5656
Author:   gavin
Date:     2014-06-10 17:11:10 +0000 (Tue, 10 Jun 2014)
Log Message:
-----------
kill-node command removed

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/NEWS
    trunk/doc/info-stnd.texi
    trunk/info/infomap.c
    trunk/info/session.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2014-06-10 16:49:22 UTC (rev 5655)
+++ trunk/ChangeLog     2014-06-10 17:11:10 UTC (rev 5656)
@@ -1,7 +1,19 @@
-2014-06-09  Gavin Smith  <address@hidden>
+2014-06-10  Gavin Smith  <address@hidden>
 
+       * info/session.c (read_nodename_to_kill, kill_node, info_kill_node):
+       Removed.
+       (info_history_node): Call forget_node.
+       (forget_node): Call set_window_pagetop and window_compute_line_map.
+       * info/infomap.c (default_emacs_like_info_keys)
+       (default_vi_like_info_keys): kill-node binding removed.
+       * NEWS,
+       * doc/info-stnd.texi (Node Commands): M-x kill-node command removed.
+
+2014-06-10  Gavin Smith  <address@hidden>
+
        * info/window.c (window_set_node_of_window): Call
        window_compute_line_map.
+
 2014-06-09  Gavin Smith  <address@hidden>
 
        * info/dir.c (dir_entry_of_infodir): Return null if nothing found.

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS  2014-06-10 16:49:22 UTC (rev 5655)
+++ trunk/NEWS  2014-06-10 17:11:10 UTC (rev 5656)
@@ -43,6 +43,7 @@
     (./foo.info, /tmp/foo.info, etc.) just visits that file.
   . new option --init-file allows overriding ~/.info.
   . new command M-x info-version.
+  . the M-x kill-node command has been removed.
   . new variable infopath-no-defaults allows omitting the compile-time
     Info directory from the Info search path.
   . test suite at build time.

Modified: trunk/doc/info-stnd.texi
===================================================================
--- trunk/doc/info-stnd.texi    2014-06-10 16:49:22 UTC (rev 5655)
+++ trunk/doc/info-stnd.texi    2014-06-10 17:11:10 UTC (rev 5656)
@@ -1080,15 +1080,6 @@
 If any of the menu items you type are not found, Info stops at the last
 entry it did find and reports an error.
 
address@hidden @kbd{C-x @kbd{k}} (@code{kill-node})
address@hidden C-x k
address@hidden kill-node
-Kill a node.  The node name is prompted for in the echo area, with a
-default of the current node.  @dfn{Killing} a node means that Info tries
-hard to forget about it, removing it from the list of history nodes kept
-for the window where that node is found.  Another node is selected in
-the window which contained the killed node.
-
 @item @kbd{C-x C-f} (@code{view-file})
 @kindex C-x C-f
 @findex view-file

Modified: trunk/info/infomap.c
===================================================================
--- trunk/info/infomap.c        2014-06-10 16:49:22 UTC (rev 5655)
+++ trunk/info/infomap.c        2014-06-10 17:11:10 UTC (rev 5656)
@@ -400,7 +400,6 @@
   CONTROL('x'), '^', NUL,         A_info_grow_window,
   CONTROL('x'), 'b', NUL,         A_select_visited_node,
   CONTROL('x'), 'f', NUL,         A_info_all_files,
-  CONTROL('x'), 'k', NUL,         A_info_kill_node,
   CONTROL('x'), 'n', NUL,         A_info_search_next,
   CONTROL('x'), 'N', NUL,         A_info_search_previous,
   CONTROL('x'), 'o', NUL,         A_info_next_window,
@@ -698,8 +697,6 @@
   CONTROL('x'), 'g', NUL,         A_info_goto_node,
   CONTROL('x'), 'i', NUL,         A_info_index_search,
   CONTROL('x'), 'I', NUL,         A_info_goto_invocation_node,
-  CONTROL('x'), 'k', NUL,         A_info_kill_node,
-  CONTROL('x'), 'n', NUL,         A_info_next_node,
   CONTROL('x'), 'o', NUL,         A_info_next_window,
   CONTROL('x'), 'O', NUL,         A_info_goto_invocation_node,
   CONTROL('x'), 'p', NUL,         A_info_prev_node,

Modified: trunk/info/session.c
===================================================================
--- trunk/info/session.c        2014-06-10 16:49:22 UTC (rev 5655)
+++ trunk/info/session.c        2014-06-10 17:11:10 UTC (rev 5656)
@@ -319,8 +319,9 @@
   i = --win->hist_index;
 
   window_set_node_of_window (win, win->hist[i - 1]->node);
-  win->pagetop = win->hist[i - 1]->pagetop;
+  set_window_pagetop (win, win->hist[i - 1]->pagetop);
   win->point = win->hist[i - 1]->point;
+  window_compute_line_map (win);
   win->node->display_pos = win->point;
 }
 
@@ -2740,105 +2741,12 @@
     window_message_in_echo_area ("Internal node");
 }
 
-/* Read the name of a node to kill.  The list of available nodes comes
-   from the nodes appearing in the current window configuration. */
-static char *
-read_nodename_to_kill (WINDOW *window)
-{
-  char *nodename;
-  WINDOW *iw;
-  REFERENCE **menu = NULL;
-  size_t menu_index = 0, menu_slots = 0;
-  char *default_nodename = xstrdup (active_window->node->nodename);
-  char *prompt = xmalloc (strlen (_("Kill node (%s): ")) + strlen 
(default_nodename));
-
-  sprintf (prompt, _("Kill node (%s): "), default_nodename);
-
-  for (iw = windows; iw; iw = iw->next)
-    {
-      REFERENCE *entry = xmalloc (sizeof (REFERENCE));
-      entry->label = xstrdup (iw->node->nodename);
-      entry->filename = entry->nodename = NULL;
-
-      add_pointer_to_array (entry, menu_index, menu, menu_slots, 10);
-    }
-
-  nodename = info_read_completing_in_echo_area (window, prompt, menu);
-  free (prompt);
-  info_free_references (menu);
-  if (nodename && !*nodename)
-    {
-      free (nodename);
-      nodename = default_nodename;
-    }
-  else
-    free (default_nodename);
-
-  return nodename;
-}
-
-/* Delete NODENAME from this window, showing the most
-   recently selected node in this window. */
-static void
-kill_node (WINDOW *window, char *nodename)
-{
-  WINDOW *info_win = window;
-
-  /* If there is no nodename to kill, quit now. */
-  if (!nodename)
-    {
-      info_abort_key (window, 0, 0);
-      return;
-    }
-
-  if (strcmp (nodename,
-              info_win->hist[info_win->hist_index - 1]->node->nodename))
-    return;
-
-  if (!info_win)
-    {
-      if (*nodename)
-        info_error (_("Cannot kill node `%s'"), nodename);
-      else
-        window_clear_echo_area ();
-
-      return;
-    }
-
-  /* If this is the last node in the window, complain and exit. */
-  if (info_win->hist_index == 1)
-    {
-      info_error ("%s", _("Cannot kill the last node"));
-      return;
-    }
-
-  forget_node (window);
-
-  if (!info_error_was_printed)
-    window_clear_echo_area ();
-
-  if (auto_footnotes_p)
-    info_get_or_remove_footnotes (window);
-}
-
-/* Kill current node, thus going back one in the node history.  I (karl)
-   do not think this is completely correct yet, because of the
-   window-changing stuff in kill_node, but it's a lot better than the
-   previous implementation, which did not account for nodes being
-   visited twice at all.  */
 DECLARE_INFO_COMMAND (info_history_node,
                       _("Select the most recently selected node"))
 {
-  kill_node (window, active_window->node->nodename);
+  forget_node (window);
 }
 
-/* Kill named node.  */
-DECLARE_INFO_COMMAND (info_kill_node, _("Kill this node"))
-{
-  char *nodename = read_nodename_to_kill (window);
-  kill_node (window, nodename);
-}
-
 /* Read the name of a file and select the entire file. */
 DECLARE_INFO_COMMAND (info_view_file, _("Read the name of a file and select 
it"))
 {