fyb/calcurse-edge
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'maint'

Browse Source 
Conflicts:
	src/calcurse.h
	src/io.c
This commit is contained in:
Lukas Fleischer
2011-11-11 12:29:48 +01:00
parent 6f01c7af97 3aefd00f6a
commit 14b6ae79a2
5 changed files with 20 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/vars.c
View File

@@ -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);