Merge branch 'master' of github.com:/antirez/linenoise
diff --git a/linenoise.c b/linenoise.c
index 5d01c1d..172bb39 100644
--- a/linenoise.c
+++ b/linenoise.c
@@ -108,7 +108,7 @@
#define LINENOISE_DEFAULT_HISTORY_MAX_LEN 100
#define LINENOISE_MAX_LINE 4096
-static char *unsupported_term[] = {"dumb","cons25",NULL};
+static char *unsupported_term[] = {"dumb","cons25","emacs",NULL};
static linenoiseCompletionCallback *completionCallback = NULL;
static struct termios orig_termios; /* In order to restore at exit.*/