[6591] info update

[Gavin D. Smith]

Revision: 6591
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6591
Author:   gavin
Date:     2015-09-01 14:56:52 +0000 (Tue, 01 Sep 2015)
Log Message:
-----------
info update

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/TODO
    trunk/info/info-utils.c
    trunk/info/window.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-08-31 14:51:50 UTC (rev 6590)
+++ trunk/ChangeLog     2015-09-01 14:56:52 UTC (rev 6591)
@@ -1,3 +1,14 @@
+2015-08-01  Gavin Smith  <address@hidden>
+
+       * info/info-utils.c (printed_representation): Cast a char * to
+       unsigned * so undisplayable bytes aren't always displayed as \377.
+       (degrade_utf8): Add A", O" and U".
+       * info/window.c (window_make_modeline) <preprocess_nodes_p>: Put
+       "Info:" in status line, and eliminate space after closing 
+       parenthesis.
+       * TODO: Remove @sortkey suggestion, as this is in progress as 
+       @sortas.  Add a couple of suggestions for Info browser.
+
 2015-08-31  Gavin Smith  <address@hidden>
 
        * doc/texinfo.tex (\balancecolumns): Fix case of short final 

Modified: trunk/TODO
===================================================================
--- trunk/TODO  2015-08-31 14:51:50 UTC (rev 6590)
+++ trunk/TODO  2015-09-01 14:56:52 UTC (rev 6591)
@@ -23,7 +23,6 @@
     @inlineset{flag, ...}, @inlineifset{flag, if set} or @inlineifset{flag,
     if set, if not set} in analogy with @inlinefmt.
   - @xindexterm [def] primary [,secondary [,tertiary]]  or some such?
-  - Add a @sortkey command for indices like @findex @sortkey{command} @@command
   - Allow subitems and `see' and `see also' in indices.
   - generalize @vtable/@htable to any defined index.
   - generalize @deffn/etc. with variants that don't make index entries.
@@ -106,6 +105,8 @@
     last one, and be able to toggle display of a node's subnodes.  
     (Could be hard to implement though, because of how much code assumes 
     that only one node is in a window at once.)
+  - Make q quit help, like Less, and :q in Vim.
+  - Make DEL exit echo area when it's empty
         
 
 * install-info:

Modified: trunk/info/info-utils.c
===================================================================
--- trunk/info/info-utils.c     2015-08-31 14:51:50 UTC (rev 6590)
+++ trunk/info/info-utils.c     2015-09-01 14:56:52 UTC (rev 6591)
@@ -574,7 +574,7 @@
          terminal. */
       *pchars = 4;
       *pbytes = 4;
-      text_buffer_printf (rep, "\\%0o", *cur_ptr);
+      text_buffer_printf (rep, "\\%o", *(unsigned char *)cur_ptr);
       return text_buffer_base (rep);
     }
 }
@@ -776,6 +776,10 @@
     {"\xC3\xAB","e\""},  /* Lower case letter e with diaeresis */
     {"\xC3\xB6","o\""},  /* Lower case letter o with diaeresis */
     {"\xC3\xBC","u\""},  /* Lower case letter u with diaeresis */
+    {"\xC3\x84", "A\""},  /* Upper case letter A with diaeresis. */
+    {"\xC3\x96", "O\""},  /* Upper case letter O with diaeresis. */
+    {"\xC3\x9c", "U\""},  /* Upper case letter U with diaeresis. */
+
     {"\xC3\xB1","n~"},  /* Lower case letter n with tilde */
     {"\xC3\x87","C,"},  /* Upper case letter C with cedilla */
     {"\xC3\xA7","c,"},  /* Lower case letter c with cedilla */

Modified: trunk/info/window.c
===================================================================
--- trunk/info/window.c 2015-08-31 14:51:50 UTC (rev 6590)
+++ trunk/info/window.c 2015-09-01 14:56:52 UTC (rev 6591)
@@ -929,7 +929,7 @@
 
         name = filename_non_directory (node->fullpath);
 
-        modeline_len += strlen ("--() --");
+        modeline_len += strlen ("--Info:() --");
         modeline_len += 3; /* strlen (location_indicator) */
         modeline_len += strlen (name);
         if (nodename) modeline_len += strlen (nodename);
@@ -938,15 +938,17 @@
 
         modeline = xcalloc (1, 1 + modeline_len);
 
+        sprintf (modeline + strlen (modeline), "%s", location_indicator);
+        sprintf (modeline + strlen (modeline), "--Info: ");
+
         /* Omit any extension like ".info.gz" from file name. */
         dot = strcspn (name, ".");
 
-        sprintf (modeline, "%s--", location_indicator);
         if (name && strcmp ("", name))
           {
             sprintf (modeline + strlen (modeline), "(");
             strncpy (modeline + strlen (modeline), name, dot);
-            sprintf (modeline + strlen (modeline), ") ");
+            sprintf (modeline + strlen (modeline), ")");
           }
         sprintf (modeline + strlen (modeline), "%s--", nodename);
       }