author | Lars Hjemli <hjemli@gmail.com> | 2009-08-21 12:26:52 (UTC) |
---|---|---|
committer | Lars Hjemli <hjemli@gmail.com> | 2009-08-21 12:26:52 (UTC) |
commit | b0f946bcc7f08168ea2858d8658a74a32accd7f5 (patch) (side-by-side diff) | |
tree | 6bda2ca8e07bc19070155f5aa7e6e32e05d02782 | |
parent | d67cc7f9d556650438e421cdcda37bc52710bffd (diff) | |
download | cgit-b0f946bcc7f08168ea2858d8658a74a32accd7f5.zip cgit-b0f946bcc7f08168ea2858d8658a74a32accd7f5.tar.gz cgit-b0f946bcc7f08168ea2858d8658a74a32accd7f5.tar.bz2 |
Rename "linenumbers" to "enable-tree-linenumbers", change default to "1"
This makes the name of the cgitrc option more descriptive and at the
same time changes the default from "0" to "1" in an attempt to stay
backwards compatible - prior to the introduction of "source-filter"
and "linenumbers", cgit always generated linenumber links in the
tree view, but now this feature can be turned off (one might want to
do this if the source-filter performs line-wrapping etc).
While at it, the documentation is updated to match the surrounding
descriptions.
Signed-off-by: Lars Hjemli <hjemli@gmail.com>
-rw-r--r-- | cgit.c | 5 | ||||
-rw-r--r-- | cgit.h | 2 | ||||
-rw-r--r-- | cgitrc.5.txt | 8 | ||||
-rw-r--r-- | ui-tree.c | 2 |
4 files changed, 9 insertions, 8 deletions
@@ -68,4 +68,2 @@ void config_cb(const char *name, const char *value) ctx.cfg.logo_link = xstrdup(value); - else if (!strcmp(name, "linenumbers")) - ctx.cfg.linenumbers = atoi(value); else if (!strcmp(name, "module-link")) @@ -90,2 +88,4 @@ void config_cb(const char *name, const char *value) ctx.cfg.enable_log_linecount = atoi(value); + else if (!strcmp(name, "enable-tree-linenumbers")) + ctx.cfg.enable_tree_linenumbers = atoi(value); else if (!strcmp(name, "max-stats")) @@ -242,2 +242,3 @@ static void prepare_context(struct cgit_context *ctx) ctx->cfg.local_time = 0; + ctx->cfg.enable_tree_linenumbers = 1; ctx->cfg.max_repo_count = 50; @@ -175,4 +175,4 @@ struct cgit_config { int enable_log_linecount; + int enable_tree_linenumbers; int local_time; - int linenumbers; int max_repo_count; diff --git a/cgitrc.5.txt b/cgitrc.5.txt index a762ccc..ac5c58c 100644 --- a/cgitrc.5.txt +++ b/cgitrc.5.txt @@ -101,2 +101,6 @@ enable-log-linecount:: +enable-tree-linenumbers:: + Flag which, when set to "1", will make cgit generate linenumber links + for plaintext blobs printed in the tree view. Default value: "1". + favicon:: @@ -148,6 +152,2 @@ logo-link:: -linenumbers:: - If set to "1" lines in tree view will have numbers. - Default value: "0". - max-commit-count:: @@ -25,3 +25,3 @@ static void print_text_buffer(const char *name, char *buf, unsigned long size) - if (ctx.cfg.linenumbers) { + if (ctx.cfg.enable_tree_linenumbers) { html("<tr><td class='linenumbers'><pre>"); |