Merge branch 'maint'

Conflicts:
	src/calcurse.h
	src/io.c

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