From bb50b305d5eb2404779ca3190dadd17e7c743365 Mon Sep 17 00:00:00 2001
From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Thu, 12 Aug 2004 21:43:00 +0000
Subject: [PATCH] a few more #ifdef tweaks, plus a few cosmetic fixes
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@1899 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
ChangeLog | 3 ++-
src/nano.c | 7 ++++---
src/proto.h | 2 +-
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ec29716e..e01a4fed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -88,7 +88,8 @@ CVS code -
make some of them more consistent. (David Benbennick and DLR)
- Change some functions to take const char*'s instead of char*'s
where possible. (David Benbennick)
- - Tweak some #ifdefs to avoid warnings when compiling with
+ - Tweak some #ifdefs around indent_length() and references to
+ fill_flag_used to avoid warnings when compiling with
--disable-wrapping, --disable-justify, or a combination of the
two. (DLR)
- files.c:
diff --git a/src/nano.c b/src/nano.c
index 10153caf..07ca0c16 100644
--- a/src/nano.c
+++ b/src/nano.c
@@ -1879,8 +1879,9 @@ size_t indent_length(const char *line)
#ifndef DISABLE_JUSTIFY
/* justify_format() replaces Tab by Space and multiple spaces by 1
- * (except it maintains 2 after a . ! or ?). Note the terminating \0
- * counts as a space.
+ * (except it maintains 2 after a character in punct followed by a
+ * character in brackets). Note that the terminating \0 counts as a
+ * space.
*
* justify_format() might make line->data shorter, and change the actual
* pointer with null_at().
@@ -2257,7 +2258,7 @@ bool do_para_search(size_t *const quote, size_t *const par)
while (current->prev != NULL && quotes_match(current->data,
quote_len, current->prev->data)) {
size_t temp_id_len =
- indent_length(current->prev->data + quote_len);
+ indent_length(current->prev->data + quote_len);
/* The indentation length of the previous line. */
/* Is this line the beginning of a paragraph, according to
diff --git a/src/proto.h b/src/proto.h
index 141040cc..3ec5e3d9 100644
--- a/src/proto.h
+++ b/src/proto.h
@@ -321,7 +321,7 @@ const char *do_int_speller(const char *tempfile_name);
const char *do_alt_speller(char *tempfile_name);
void do_spell(void);
#endif
-#if !defined(DISABLE_WRAPPING) && !defined(NANO_SMALL) || !defined(DISABLE_JUSTIFY)
+#if !defined(NANO_SMALL) || !defined(DISABLE_JUSTIFY)
size_t indent_length(const char *line);
#endif
#ifndef DISABLE_JUSTIFY
--
GitLab