From 5e6434cf54fa976e49134250d3549552f9e5e420 Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Thu, 1 Jun 2006 17:23:28 +0000 Subject: [PATCH] move color regexes into separate files, and restructure things so that they're installed properly and nanorc.sample references them properly git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3604 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 18 ++ configure.ac | 9 + doc/Makefile.am | 4 + doc/nanorc.sample | 409 --------------------------------------- doc/nanorc.sample.in | 264 +++++++++++++++++++++++++ doc/syntax/.cvsignore | 2 + doc/syntax/Makefile.am | 15 ++ doc/syntax/asm.nanorc | 15 ++ doc/syntax/c.nanorc | 27 +++ doc/syntax/groff.nanorc | 24 +++ doc/syntax/html.nanorc | 5 + doc/syntax/java.nanorc | 12 ++ doc/syntax/man.nanorc | 9 + doc/syntax/mutt.nanorc | 4 + doc/syntax/patch.nanorc | 10 + doc/syntax/perl.nanorc | 11 ++ doc/syntax/python.nanorc | 8 + doc/syntax/ruby.nanorc | 27 +++ doc/syntax/sh.nanorc | 12 ++ doc/syntax/tex.nanorc | 6 + m4/Makefile.am | 10 +- m4/ac_define_dir.m4 | 34 ++++ nano.spec.in | 1 + 23 files changed, 522 insertions(+), 414 deletions(-) delete mode 100644 doc/nanorc.sample create mode 100644 doc/nanorc.sample.in create mode 100644 doc/syntax/.cvsignore create mode 100644 doc/syntax/Makefile.am create mode 100644 doc/syntax/asm.nanorc create mode 100644 doc/syntax/c.nanorc create mode 100644 doc/syntax/groff.nanorc create mode 100644 doc/syntax/html.nanorc create mode 100644 doc/syntax/java.nanorc create mode 100644 doc/syntax/man.nanorc create mode 100644 doc/syntax/mutt.nanorc create mode 100644 doc/syntax/patch.nanorc create mode 100644 doc/syntax/perl.nanorc create mode 100644 doc/syntax/python.nanorc create mode 100644 doc/syntax/ruby.nanorc create mode 100644 doc/syntax/sh.nanorc create mode 100644 doc/syntax/tex.nanorc create mode 100644 m4/ac_define_dir.m4 diff --git a/ChangeLog b/ChangeLog index 4704e4f0..5df83e5f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -117,6 +117,24 @@ CVS code - (Benno Schulenberg, minor tweaks by DLR) - Allow normal typing of high-bit control characters, as Pico does. Changes to do_output() and do_statusbar_output(). (DLR) + - Move color regexes into separate files, make nanorc.sample + reference them, and make them install properly. In the + process, rename nanorc.sample to nanorc.sample.in, put + @PKGDATADIR@ at the beginning of all nanorc file paths, add + needed AC_DEFINE_DIR macro from the Autoconf Macro Archive at + http://autoconf-archive.cryp.to/ac_define_dir.m4, and make + configure.ac do the substitution, so that the proper paths + will always be used in nanorc.sample. New files + m4/ac_define_dir.m4, doc/syntax/Makefile.am, + doc/syntax/asm.nanorc, doc/syntax/c.nanorc, + doc/syntax/groff.nanorc, doc/syntax/html.nanorc, + doc/syntax/java.nanorc, doc/syntax/man.nanorc, + doc/syntax/mutt.nanorc, doc/syntax/patch.nanorc, + doc/syntax/perl.nanorc, doc/syntax/python.nanorc, + doc/syntax/ruby.nanorc, doc/syntax/sh.nanorc, and + doc/syntax/tex.nanorc; changes to configure.ac, nano.spec.in, + doc/Makefile.am, and m4/Makefile.am; removal of + doc/nanorc.sample. (DLR) - browser.c: do_browser() - Reference NANO_GOTODIR_(ALT|F)?KEY instead of diff --git a/configure.ac b/configure.ac index 4bcdb057..d2799a43 100644 --- a/configure.ac +++ b/configure.ac @@ -41,6 +41,11 @@ AM_GNU_GETTEXT_VERSION(0.11.5) AM_GNU_GETTEXT([external], [need-ngettext]) AM_CONDITIONAL(USE_NLS, test "x$USE_NLS" = "xyes") +dnl Data location. + +pkgdatadir=${datadir}/${PACKAGE} +AC_DEFINE_DIR([PKGDATADIR], [pkgdatadir], [Where data are placed to.]) + dnl Checks for header files. AC_HEADER_STDC @@ -386,6 +391,8 @@ int main(void) ;; esac], [AC_MSG_RESULT(no)]) +AM_CONDITIONAL(USE_COLOR, test "x$color_support" = "xyes") + dnl Checks for functions. AC_CHECK_FUNCS(getdelim getline isblank strcasecmp strcasestr strncasecmp strnlen vsnprintf) @@ -492,8 +499,10 @@ fi AC_CONFIG_FILES([ Makefile doc/Makefile +doc/nanorc.sample doc/man/Makefile doc/man/fr/Makefile +doc/syntax/Makefile doc/texinfo/Makefile m4/Makefile po/Makefile.in diff --git a/doc/Makefile.am b/doc/Makefile.am index a83144dd..761759fb 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,3 +1,7 @@ SUBDIRS = man texinfo +if USE_COLOR +SUBDIRS += syntax +endif + EXTRA_DIST = faq.html nanorc.sample diff --git a/doc/nanorc.sample b/doc/nanorc.sample deleted file mode 100644 index 08cf12fd..00000000 --- a/doc/nanorc.sample +++ /dev/null @@ -1,409 +0,0 @@ -## Sample initialization file for GNU nano. -## -## Please note that you must have configured nano with --enable-nanorc -## for this file to be read! Also note that this file should not be in -## DOS or Mac format, and that characters specially interpreted by the -## shell should not be escaped here. -## -## To make sure a value is disabled, use "unset