aboutsummaryrefslogtreecommitdiffstats
path: root/src/vars.c
diff options
context:
space:
mode:
authorLukas Fleischer <calcurse@cryptocrack.de>2011-11-11 12:29:48 +0100
committerLukas Fleischer <calcurse@cryptocrack.de>2011-11-11 12:29:48 +0100
commit14b6ae79a25106501a30693889b1c03abd56c8c1 (patch)
treef33f550d29c781ab523c895df6338c420253964c /src/vars.c
parent6f01c7af972dbf4698c63b707b225469b9405e47 (diff)
parent3aefd00f6aebad7c50210e68650cb8c42e0835cd (diff)
downloadcalcurse-14b6ae79a25106501a30693889b1c03abd56c8c1.tar.gz
calcurse-14b6ae79a25106501a30693889b1c03abd56c8c1.zip
Merge branch 'maint'
Conflicts: src/calcurse.h src/io.c
Diffstat (limited to 'src/vars.c')
-rw-r--r--src/vars.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/vars.c b/src/vars.c
index a659336..5155683 100644
--- a/src/vars.c
+++ b/src/vars.c
@@ -117,8 +117,6 @@ struct dmon_conf dmon;
void
vars_init (struct conf *conf)
{
- char *PATH_VI = "/usr/bin/vi";
- char *PATH_LESS = "/usr/bin/less";
char *ed, *pg;
/* Variables for user configuration */
@@ -137,12 +135,12 @@ vars_init (struct conf *conf)
if (ed == NULL || ed[0] == '\0')
ed = getenv ("EDITOR");
if (ed == NULL || ed[0] == '\0')
- ed = PATH_VI;
+ ed = DEFAULT_EDITOR;
conf->editor = ed;
pg = getenv ("PAGER");
if (pg == NULL || pg[0] == '\0')
- pg = PATH_LESS;
+ pg = DEFAULT_PAGER;
conf->pager = pg;
wins_set_layout (1);