[Asterisk-cvs] asterisk asterisk.c,1.107,1.108

[malcolmd at lists.digium.com]

Update of /usr/cvsroot/asterisk
In directory localhost.localdomain:/tmp/cvs-serv855

Modified Files:
	asterisk.c 
Log Message:
Bug # 2174: Respect EDITOR environment variable


Index: asterisk.c
===================================================================
RCS file: /usr/cvsroot/asterisk/asterisk.c,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -d -r1.107 -r1.108
--- asterisk.c	18 Jul 2004 18:52:36 -0000	1.107
+++ asterisk.c	30 Jul 2004 18:30:48 -0000	1.108
@@ -1262,6 +1262,7 @@
 static int ast_el_initialize(void)
 {
 	HistEvent ev;
+	char *editor = getenv("EDITOR");
 
 	if (el != NULL)
 		el_end(el);
@@ -1272,7 +1273,7 @@
 	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;