Merge remote-tracking branch 'upstream/depgraph' into doc/clarify_color_cmds

3 files changed, 8 insertions, 3 deletions

diff --git a/src/doc b/src/doc
index 806c6dc..62e4e2c 100644
--- a/src/doc
+++ b/src/doc
@@ -5,7 +5,7 @@ You can also use the <ENTER> key to go one line down and <DEL> to go up.
 
 <SPACE> moves a page down, while <C-f> and <C-b> move half page down or up.
 
-'G' moves to bottom, and <C-a> to the beginning of the text.
+'G' moves to bottom, and <C-a> or 'gg' to the beginning of the text.
 
 Use '/' to search for a pattern in the help.
 
diff --git a/src/help.c b/src/help.c
index 45d547d..9a5ac3a 100644
--- a/src/help.c
+++ b/src/help.c
@@ -143,6 +143,12 @@ void help() {
             delta = max - LINES + RESROW;
             break;
 
+        case 'g':
+            wtimeout(input_win, TIMEOUT_CURSES);
+            char c = wgetch(input_win);
+            wtimeout(input_win, -1);
+            if (c != 'g') break;
+
         case ctl('a'):
             delta = 0;
             break;
diff --git a/src/xls.c b/src/xls.c
index 919fc9f..1c05b3f 100644
--- a/src/xls.c
+++ b/src/xls.c
@@ -59,8 +59,7 @@ int open_xls(char * fname, char * encoding) {
     for (r = 0; r <= pWS->rows.lastrow; r++) { // rows
         for (c = 0; c <= pWS->rows.lastcol; c++) { // cols
             xlsCell * cell = xls_cell(pWS, r, c);
-            //if ((! cell) || (cell->isHidden)) continue;
-            if ((! cell) || (cell->ishiden)) continue; // Unfortunately libxls spells this "ishiden"
+            if ((! cell) || (cell->isHidden)) continue;
 
             // TODO enable rowspan ?
             //if (cell->rowspan > 1) continue;