From 5c7a6d7dd5b25113f9444f5eea1b2ed36c8c54fe Mon Sep 17 00:00:00 2001 From: Benno Schulenberg Date: Sun, 13 Apr 2014 19:44:30 +0000 Subject: [PATCH] Making tiny disable libmagic, and documenting the --disable-libmagic flag. git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@4763 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 2 ++ configure.ac | 3 +++ doc/texinfo/nano.texi | 5 +++++ 3 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index 2f6d63e8..c54d2435 100644 --- a/ChangeLog +++ b/ChangeLog @@ -6,6 +6,8 @@ * global.c (shortcut_init): Delete a misplaced setting of 'currmenu'. * global.c (shortcut_init, strtomenu): Cosmetic tweaks. * doc/syntax/{changelog,c,po}.nanorc: Some small extra colourings. + * configure.ac, doc/texinfo/nano.texi: Make --enable-tiny disable + the use of libmagic, and document the --disable-libmagic flag. 2014-04-10 Benno Schulenberg * doc/syntax/Makefile.am: Add four recent syntaxes to the packlist. diff --git a/configure.ac b/configure.ac index 3adf759b..6fe4f535 100644 --- a/configure.ac +++ b/configure.ac @@ -184,6 +184,9 @@ if test "x$enable_tiny" = xyes; then if test "x$enable_justify" != xyes; then AC_DEFINE(DISABLE_JUSTIFY, 1, [Define this to disable the justify routines.]) fi + if test "x$enable_libmagic" != xyes; then + enable_libmagic=no + fi if test "x$enable_mouse" != xyes; then AC_DEFINE(DISABLE_MOUSE, 1, [Define this to disable the mouse support.]) fi diff --git a/doc/texinfo/nano.texi b/doc/texinfo/nano.texi index 4ad45050..eb7099ed 100644 --- a/doc/texinfo/nano.texi +++ b/doc/texinfo/nano.texi @@ -859,6 +859,11 @@ things about using the editor. @item --disable-justify Disable the justify and unjustify functions. +@item --disable-libmagic +Disable the use of the library of magic-number tests (for determining +the file type and thus which syntax to use for colouring -- often the +tests on filename extension and header line will be enough). + @item --disable-mouse Disable all mouse functionality. This also eliminates the -m command-line option, which enables the mouse functionality. -- 2.39.5