Okay, don't define nano_small_msg or nano_disabled_msg id not needed

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@356 35c25a1d-7b9e-4130-9fde-d3aeb78583b8

diff --git a/ChangeLog b/ChangeLog
index 7a03a7f497d4e08f4a28b87fb50a13fa0404dd81..a365d78b2540fa2eebee4ee808909d1b50a2adf8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -50,6 +50,9 @@ CVS code -
   version()
        - Took out huge check for the various --disabled macros,
          eventually there will be too many to reasonably check for.  
+  nano_small_msg(), nano_disabled_msg()
+       - Added checks for disabled functions to see whether or not to
+         declare them.
 - search.c:
   do_replace_hilight()
        - New function, displays the currently selected word as hilighted

diff --git a/nano.c b/nano.c
index ce31f4241b81e7fb845f52dd147404f2500a8f16..027c96d85ca00ab1ec4d43383433c456ee19a4b5 100644 (file)
--- a/nano.c
+++ b/nano.c
@@ -499,15 +499,19 @@ int no_help(void)
        return 0;
 }
 
+#ifdef NANO_SMALL
 void nano_small_msg(void)
 {
     statusbar("Sorry, this function not available with nano-tiny option");
 }
+#endif
 
+#if defined(DISABLE_JUSTIFY) || defined(DISABLE_SPELL)
 void nano_disabled_msg(void)
 {
     statusbar("Sorry, support for this function has been disabled");
 }
+#endif
 
 /* The user typed a printable character; add it to the edit buffer */
 void do_char(char ch)

diff --git a/po/nano.pot b/po/nano.pot
index a54d93ad5e3ad5eb55048769ebdeaf4ed0bca8b3..c54c24e0c8ddbc06a0f41a117ddb18f6e500cc9a 100644 (file)
--- a/po/nano.pot
+++ b/po/nano.pot
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-12-01 13:36-0500\n"
+"POT-Creation-Date: 2000-12-01 13:55-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -55,7 +55,7 @@ msgstr ""
 msgid "File to insert [from ./] "
 msgstr ""
 
-#: files.c:284 files.c:309 files.c:517 nano.c:1393
+#: files.c:284 files.c:309 files.c:517 nano.c:1397
 msgid "Cancelled"
 msgstr ""
 
@@ -627,116 +627,116 @@ msgstr ""
 msgid "Mark UNset"
 msgstr ""
 
-#: nano.c:914
+#: nano.c:918
 #, c-format
 msgid "check_wrap called with inptr->data=\"%s\"\n"
 msgstr ""
 
-#: nano.c:965
+#: nano.c:969
 #, c-format
 msgid "current->data now = \"%s\"\n"
 msgstr ""
 
-#: nano.c:1018
+#: nano.c:1022
 #, c-format
 msgid "After, data = \"%s\"\n"
 msgstr ""
 
-#: nano.c:1118
+#: nano.c:1122
 msgid "Edit a replacement"
 msgstr ""
 
-#: nano.c:1342
+#: nano.c:1346
 #, c-format
 msgid "Could not create a temporary filename: %s"
 msgstr ""
 
-#: nano.c:1358
+#: nano.c:1362
 msgid "Finished checking spelling"
 msgstr ""
 
-#: nano.c:1360
+#: nano.c:1364
 msgid "Spell checking failed"
 msgstr ""
 
-#: nano.c:1380
+#: nano.c:1384
 msgid "Save modified buffer (ANSWERING \"No\" WILL DESTROY CHANGES) ? "
 msgstr ""
 
-#: nano.c:1543
+#: nano.c:1547
 msgid "Cannot resize top win"
 msgstr ""
 
-#: nano.c:1545
+#: nano.c:1549
 msgid "Cannot move top win"
 msgstr ""
 
-#: nano.c:1547
+#: nano.c:1551
 msgid "Cannot resize edit win"
 msgstr ""
 
-#: nano.c:1549
+#: nano.c:1553
 msgid "Cannot move edit win"
 msgstr ""
 
-#: nano.c:1551
+#: nano.c:1555
 msgid "Cannot resize bottom win"
 msgstr ""
 
-#: nano.c:1553
+#: nano.c:1557
 msgid "Cannot move bottom win"
 msgstr ""
 
-#: nano.c:1841
+#: nano.c:1845
 msgid "Can now UnJustify!"
 msgstr ""
 
-#: nano.c:1936
+#: nano.c:1940
 #, c-format
 msgid "%s enable/disable"
 msgstr ""
 
-#: nano.c:1948
+#: nano.c:1952
 msgid "enabled"
 msgstr ""
 
-#: nano.c:1949
+#: nano.c:1953
 msgid "disabled"
 msgstr ""
 
-#: nano.c:2179
+#: nano.c:2183
 msgid "Main: set up windows\n"
 msgstr ""
 
-#: nano.c:2192
+#: nano.c:2196
 msgid "Main: bottom win\n"
 msgstr ""
 
-#: nano.c:2198
+#: nano.c:2202
 msgid "Main: open file\n"
 msgstr ""
 
-#: nano.c:2235
+#: nano.c:2239
 #, c-format
 msgid "I got Alt-O-%c! (%d)\n"
 msgstr ""
 
-#: nano.c:2257
+#: nano.c:2261
 #, c-format
 msgid "I got Alt-[-1-%c! (%d)\n"
 msgstr ""
 
-#: nano.c:2290
+#: nano.c:2294
 #, c-format
 msgid "I got Alt-[-2-%c! (%d)\n"
 msgstr ""
 
-#: nano.c:2338
+#: nano.c:2342
 #, c-format
 msgid "I got Alt-[-%c! (%d)\n"
 msgstr ""
 
-#: nano.c:2364
+#: nano.c:2368
 #, c-format
 msgid "I got Alt-%c! (%d)\n"
 msgstr ""