From 203026c632aa8ec58a567b8079a35fd5ebdece1c Mon Sep 17 00:00:00 2001 From: David Lawrence Ramsey Date: Wed, 15 Jun 2005 18:53:47 +0000 Subject: [PATCH] make --enable-extra only define NANO_EXTRA, and update associated documentation git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2677 35c25a1d-7b9e-4130-9fde-d3aeb78583b8 --- ChangeLog | 8 +++++++- configure.ac | 3 +-- doc/faq.html | 9 +++++---- doc/nanorc.sample | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index f6f7198d..c67abf84 100644 --- a/ChangeLog +++ b/ChangeLog @@ -271,15 +271,21 @@ CVS code - - Don't refer to the built-in file browser as crappy anymore. (DLR) - Check for iswpunct() and mbstowcs(). (DLR) + - Change the behavior of --enable-extra to only define + NANO_EXTRA, instead of defining both it and + ENABLE_MULTIBUFFER. (DLR) - doc/faq.html: - Update section 1.1 to mention the current maintainer. (DLR) - - Minor capitalization and wording tweaks. (DLR) + - Minor capitalization and wording fixes. (DLR) + - Update description of --enable-extra, and add missing line + breaks. (DLR) - doc/nanorc.sample: - In the "nanorc" regexes, tweak the "color" regex to properly color a line that specifies a background color without a foreground color, and update the associated comments. Also, tweak the "comment" regex to color comments that don't start at the beginning of a line. (DLR) + - Update comment referring to --enable-extra. (DLR) - doc/man/fr/Makefile.am: - Set mandir to @mandir@/fr, so French manpages get installed where they belong (Jordi). diff --git a/configure.ac b/configure.ac index 2df63185..3ad46bf4 100644 --- a/configure.ac +++ b/configure.ac @@ -75,10 +75,9 @@ if test x$debug_support != xyes; then fi AC_ARG_ENABLE(extra, -[ --enable-extra Enable extra (optional) functions, including easter eggs], +[ --enable-extra Enable extra features, currently only easter eggs], [if test x$enableval = xyes; then AC_DEFINE(NANO_EXTRA, 1, [Define this to enable the extra stuff.]) extra_support=yes - AC_DEFINE(ENABLE_MULTIBUFFER, 1, [Define this to enable multiple file buffers.]) multibuffer_support=yes fi]) AC_ARG_ENABLE(tiny, diff --git a/doc/faq.html b/doc/faq.html index 2d66c51c..451a7ee0 100644 --- a/doc/faq.html +++ b/doc/faq.html @@ -154,7 +154,7 @@

There's also the --enable-tiny option which disables everything above, as well as some larger chunks of the program (like the marker code that you use Control-^ to select with). Also, if you know you aren't going to be using other languages you can use --disable-nls to disable internationalization and save a few K to a few dozen K depending on if you have locale support on your system. And finally there's always good old strip to strip all debugging code and code that exists in libraries on your system.

If, on the other hand, you can't live without bells and whistles, you could try:

-  --enable-extra          Enable extra functions, including easter eggs
+  --enable-extra          Enable extra features, currently only easter eggs
   --enable-nanorc         Enable use of .nanorc file
   --enable-color          Enable color and syntax highlighting
   --enable-multibuffer    Enable having multiple file buffers open
@@ -163,7 +163,7 @@
                           Turn off wrapping of text by default when the
                           user is root

3.7. Tell me more about this multibuffer stuff!

-

To use multiple file buffers, you must be using nano 1.1.0 or newer, and you must have configured nano with --enable-multibuffer or --enable-extra (use nano -V to check). Then when you want to enable inserting a file into its own buffer instead of into the current file, just hit Meta-F, then insert the file as normal with ^R. If you always want files to be loaded into their own buffers, use the --multibuffer or -F flag when you invoke nano.

+

To use multiple file buffers, you must be using nano 1.1.0 or newer, and you must have configured nano with --enable-multibuffer (use nano -V to check). Then when you want to enable inserting a file into its own buffer instead of into the current file, just hit Meta-F, then insert the file as normal with ^R. If you always want files to be loaded into their own buffers, use the --multibuffer or -F flag when you invoke nano.

You can move between the buffers you have open with the Meta-< and Meta-> keys, or more easily with Meta-, and Meta-. (clear as mud, right? =-). When you have more than one file buffer open, the ^X shortcut will say "Close", instead of the normal "Exit" when only one buffer is open.

3.8. Tell me more about this verbatim input stuff!

To use verbatim input, you must be using nano 1.3.1 or newer. When you want to insert a literal character into the file you're editing, such as a control character that nano usually treats as a command, first press Meta-V. (If you're not at a prompt, you'll get the message "Verbatim Input".) Then press the key(s) that generate the character you want.

@@ -250,8 +250,9 @@

8. ChangeLog

-2005/06/13 - Minor capitalization and wording fixes. (DLR) -2005/06/08 - Updated section 1.1 to mention the current maintainer. (DLR) +2005/06/15 - Update description of --enable-extra, and add missing line breaks. (DLR)
+2005/06/13 - Minor capitalization and wording fixes. (DLR)
+2005/06/08 - Updated section 1.1 to mention the current maintainer. (DLR)
2005/03/09 - Added question about opening files with names beginning with '+'s, and added a few more miscellaneous cosmetic fixes. (DLR)
2005/01/03 - Removed now-inaccurate note about verbatim input's not working at prompts, and update its description to mention that it handles hexadecimal values now. (DLR)
2004/11/21 - Listed sh as an example of a Bourne shell. (DLR)
diff --git a/doc/nanorc.sample b/doc/nanorc.sample index 76b6d4c4..d81eaf42 100644 --- a/doc/nanorc.sample +++ b/doc/nanorc.sample @@ -47,7 +47,7 @@ ## Allow multiple file buffers (inserting a file will put it into a ## separate buffer). You must have configured with --enable-multibuffer -## or --enable-extra for this to work. +## for this to work. ## # set multibuffer -- 2.39.5