X-Git-Url: https://git.distorted.org.uk/~mdw/tig/blobdiff_plain/85af62849a84b08f783c70d6e3f25b5175188d68..380ec161ae41e781c46510e9a2bc4b770f0e677f:/tig.c

diff --git a/tig.c b/tig.c
index f744657..0237cb0 100644
--- a/tig.c
+++ b/tig.c
@@ -1,8 +1,9 @@
 /* Copyright (c) 2006 Jonas Fonseca <fonseca@diku.dk>
  *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -292,14 +293,14 @@ parse_options(int argc, char *argv[])
 		}
 
 		/**
-		 * -t[NSPACES], --tab-size[=NSPACES]::
+		 * -b[NSPACES], --tab-size[=NSPACES]::
 		 *	Set the number of spaces tabs should be expanded to.
 		 **/
-		if (!strncmp(opt, "-t", 2) ||
+		if (!strncmp(opt, "-b", 2) ||
 		    !strncmp(opt, "--tab-size", 10)) {
 			char *num = opt;
 
-			if (opt[1] == 't') {
+			if (opt[1] == 'b') {
 				num = opt + 2;
 
 			} else if (opt[STRING_SIZE("--tab-size")] == '=') {
@@ -473,9 +474,9 @@ parse_options(int argc, char *argv[])
 	"git ls-remote . 2>/dev/null"
 
 /**
- * [[view-commands]]
- * View commands
- * ~~~~~~~~~~~~~
+ * [[history-commands]]
+ * History commands
+ * ~~~~~~~~~~~~~~~~
  * It is possible to alter which commands are used for the different views.
  * If for example you prefer commits in the main view to be sorted by date
  * and only show 500 commits, use:
@@ -857,7 +858,7 @@ update_view_title(struct view *view)
 			wprintw(view->title, " %lds", secs);
 	}
 
-
+	wmove(view->title, 0, view->width - 1);
 	wrefresh(view->title);
 }
 
@@ -1494,11 +1495,15 @@ view_driver(struct view *view, enum request request)
 		return TRUE;
 
 	case REQ_VIEW_CLOSE:
-		if (view->parent) {
+		/* XXX: Mark closed views by letting view->parent point to the
+		 * view itself. Parents to closed view should never be
+		 * followed. */
+		if (view->parent &&
+		    view->parent->parent != view->parent) {
 			memset(display, 0, sizeof(display));
 			current_view = 0;
 			display[current_view] = view->parent;
-			view->parent = NULL;
+			view->parent = view;
 			resize_display();
 			redraw_display();
 			break;
@@ -2420,8 +2425,10 @@ read_properties(const char *cmd, int separator,
 			namelen = value - name;
 			*value++ = 0;
 			valuelen = strlen(value);
-			if (valuelen > 0)
-				value[valuelen - 1] = 0;
+			if (valuelen > 0) {
+				valuelen--;
+				value[valuelen] = 0;
+			}
 
 		} else {
 			namelen = strlen(name);
@@ -2575,7 +2582,8 @@ main(int argc, char *argv[])
  *
  * You can tune the interaction with git by making use of the options
  * explained in this section. For example, by configuring the environment
- * variables described in the  <<view-commands, "View commands">> section.
+ * variables described in the  <<history-commands, "History commands">>
+ * section.
  *
  * Limit by path name
  * ~~~~~~~~~~~~~~~~~~
@@ -2694,7 +2702,7 @@ main(int argc, char *argv[])
  * - link:http://www.kernel.org/pub/software/scm/cogito/docs/[cogito(7)]
  *
  * Other git repository browsers:
-*
+ *
  *  - gitk(1)
  *  - qgit(1)
  *  - gitview(1)