diff options
| author | Dan Pasanen <dan.pasanen@gmail.com> | 2015-11-24 10:53:24 -0600 |
|---|---|---|
| committer | Dan Pasanen <dan.pasanen@gmail.com> | 2015-11-24 10:54:42 -0600 |
| commit | b6b3db7812180de1fa47d3def13cbd71d7f2f3b5 (patch) | |
| tree | 8f35a24e8550472aefd5c9a7e09878b1961a6e9a | |
| parent | 850cb4ff0f8ca2eced69febc65bf825041c2c08f (diff) | |
| download | android_external_nano-stable/cm-13.0-ZNH2KB.tar.gz android_external_nano-stable/cm-13.0-ZNH2KB.tar.bz2 android_external_nano-stable/cm-13.0-ZNH2KB.zip | |
nano: fix build after upstream mergeHEADreplicant-6.0-0004-transitionreplicant-6.0-0004-rc6replicant-6.0-0004-rc5-transitionreplicant-6.0-0004-rc5replicant-6.0-0004-rc4replicant-6.0-0004-rc3replicant-6.0-0004-rc2replicant-6.0-0004-rc1replicant-6.0-0004replicant-6.0-0003replicant-6.0-0002replicant-6.0-0001stable/cm-13.0-ZNH5Ystable/cm-13.0-ZNH2KBstable/cm-13.0-ZNH2Kstable/cm-13.0-ZNH0Ecm-13.0
Change-Id: I2f5a697ea1316e1e54c074b7868f21477b47a22c
| -rw-r--r-- | Android.mk | 6 | ||||
| -rw-r--r-- | config.h | 6 | ||||
| -rw-r--r-- | src/nano.h | 1 |
3 files changed, 8 insertions, 5 deletions
@@ -23,13 +23,15 @@ LOCAL_SRC_FILES:= \ src/winio.c LOCAL_C_INCLUDES += \ $(LOCAL_PATH) \ - external/libncurses/include + external/libncurses/include \ + external/openssh/openbsd-compat LOCAL_CFLAGS += \ -DHAVE_CONFIG_H \ -DLOCALEDIR=\"/data/locale\" \ -DSYSCONFDIR=\"/system/etc/nano\" LOCAL_SHARED_LIBRARIES += \ - libncurses + libncurses \ + libssh LOCAL_MODULE := nano LOCAL_MODULE_PATH := $(TARGET_OUT_OPTIONAL_EXECUTABLES) LOCAL_MODULE_TAGS := debug @@ -211,7 +211,7 @@ #define PACKAGE_NAME "GNU nano" /* Define to the full name and version of this package. */ -#define PACKAGE_STRING "GNU nano 2.2.4" +#define PACKAGE_STRING "GNU nano 2.4.3" /* Define to the one symbol short name of this package. */ #define PACKAGE_TARNAME "nano" @@ -220,7 +220,7 @@ #define PACKAGE_URL "http://www.gnu.org/software/nano/" /* Define to the version of this package. */ -#define PACKAGE_VERSION "2.2.4" +#define PACKAGE_VERSION "2.4.3" /* Where data are placed to. */ #define PKGDATADIR "/usr/local/share/nano" @@ -264,7 +264,7 @@ /* Version number of package */ -#define VERSION "2.2.4" +#define VERSION "2.4.3" /* Number of bits in a file offset, on hosts where this is settable. */ /* #undef _FILE_OFFSET_BITS */ @@ -557,6 +557,7 @@ enum /* Control key sequences. Changing these would be very, very bad. */ #define NANO_CONTROL_SPACE 0 #define NANO_CONTROL_I 9 +#define NANO_CONTROL_M 13 #define NANO_CONTROL_3 27 #define NANO_CONTROL_7 31 #define NANO_CONTROL_8 127 |