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

diff --git a/ChangeLog b/ChangeLog
index 2b5a02bb0d333b9b2b162bcd3a7090f60e16861b..1bf4fc78c5881cf166ff4bb60c9398e231693afb 100644 (file)
--- 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 5dbfcdb942dd3a41f17a2bd87c24288abce732d0..48516f74a4bfcf577158d65f00aac7dac6e98544 100644 (file)
--- 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));