Merge branch '3601_without_internal_edit'

SokolskyNikita · Mar 4, 2016 · b98cf5c · b98cf5c
2 parents b6c1c2f + b84ac2c
commit b98cf5c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/maint/utils/travis-build.sh b/maint/utils/travis-build.sh
@@ -54,6 +54,7 @@ mkdir -p build-default && pushd $_
     --enable-maintainer-mode \
     --enable-mclib \
     --enable-charset \
+    --enable-aspell \
     --enable-tests \
     --enable-werror
 
@@ -70,6 +71,7 @@ mkdir -p build-ncurses && pushd $_
     --enable-maintainer-mode \
     --enable-mclib \
     --enable-charset \
+    --enable-aspell \
     --enable-tests \
     --enable-werror
 
@@ -85,13 +87,16 @@ mkdir -p build-all-disabled && pushd $_
     --disable-maintainer-mode \
     --disable-mclib \
     --disable-charset \
+    --disable-aspell \
     --disable-largefile \
     --disable-nls \
     --disable-vfs \
     --disable-background \
     --without-mmap \
     --without-x \
     --without-gpm-mouse \
+    --without-internal-edit \
+    --without-diff-viewer \
     --without-subshell \
     --enable-tests \
     --enable-werror

diff --git a/src/filemanager/midnight.c b/src/filemanager/midnight.c
@@ -45,6 +45,7 @@
 #include <pwd.h>                /* for username in xterm title */
 
 #include "lib/global.h"
+#include "lib/fileloc.h"        /* MC_HINT */
 
 #include "lib/tty/tty.h"
 #include "lib/tty/key.h"        /* KEY_M_* masks */