From b6c4dbffdbbbb7046896e5c1d5ef6ad90b21eced Mon Sep 17 00:00:00 2001
From: David Lawrence Ramsey <pooka109@gmail.com>
Date: Sat, 25 Nov 2006 22:38:17 +0000
Subject: [PATCH] in do_spell(), when setting i to the return value of
write_(marked_)?file(), use the "?" operator instead of an if/else clause
git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@3970 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
---
ChangeLog | 4 ++++
src/text.c | 8 ++++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 2b5a02bb..1bf4fc78 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -32,6 +32,10 @@ GNU nano 2.0.1 - 2006.11.20
overwriting an existing file when in restricted mode. (DLR)
- Fix problem where a file could sometimes be overwritten
without a warning prompt. (DLR)
+- text.c:
+ do_spell()
+ - When setting i to the return value of write_(marked_)?file(),
+ use the "?" operator instead of an if/else clause. (DLR)
- winio.c:
do_replace_highlight()
- Include the code to display zero-length matches even when
diff --git a/src/text.c b/src/text.c
index 5dbfcdb9..48516f74 100644
--- a/src/text.c
+++ b/src/text.c
@@ -2311,12 +2311,12 @@ void do_spell(void)
return;
}
+ i =
#ifndef NANO_TINY
- if (openfile->mark_set)
- i = write_marked_file(temp, temp_file, TRUE, OVERWRITE);
- else
+ (openfile->mark_set) ? write_marked_file(temp, temp_file, TRUE,
+ OVERWRITE) :
#endif
- i = write_file(temp, temp_file, TRUE, OVERWRITE, FALSE);
+ write_file(temp, temp_file, TRUE, OVERWRITE, FALSE);
if (i == -1) {
statusbar(_("Error writing temp file: %s"), strerror(errno));
--
GitLab