aboutsummaryrefslogtreecommitdiffstats
path: root/asterisk.c
diff options
context:
space:
mode:
authormalcolmd <malcolmd@f38db490-d61c-443f-a65b-d21fe96a405b>2004-07-30 18:30:48 +0000
committermalcolmd <malcolmd@f38db490-d61c-443f-a65b-d21fe96a405b>2004-07-30 18:30:48 +0000
commitcad0522a66ebc2f38847f5bf412513d77548aff2 (patch)
tree3b7152d4e4b96188d78ec4058738f7bc0d6c287e /asterisk.c
parentdb8d625744c1b900ab8f6651e38f181651d84a3a (diff)
Bug # 2174: Respect EDITOR environment variable
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@3539 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'asterisk.c')
-rwxr-xr-xasterisk.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/asterisk.c b/asterisk.c
index 2b4b93bc7..94f7548dd 100755
--- a/asterisk.c
+++ b/asterisk.c
@@ -1262,6 +1262,7 @@ static char *cli_complete(EditLine *el, int ch)
static int ast_el_initialize(void)
{
HistEvent ev;
+ char *editor = getenv("EDITOR");
if (el != NULL)
el_end(el);
@@ -1272,7 +1273,7 @@ static int ast_el_initialize(void)
el_set(el, EL_PROMPT, cli_prompt);
el_set(el, EL_EDITMODE, 1);
- el_set(el, EL_EDITOR, "emacs");
+ el_set(el, EL_EDITOR, editor ? editor : "emacs");
el_hist = history_init();
if (!el || !el_hist)
return -1;