a few minor cleanups

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

diff --git a/ChangeLog b/ChangeLog
index 73f0a01e752c516cff8df053aa0bb1cdc30b14ac..242da3a9dc11c9f50493dc8414841d0a3cdeaa4f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -73,6 +73,10 @@ CVS code -
        - Add more descriptive comments explaining the termios and
          curses setup routines, and turn the keypad on before setting
          the input mode. (DLR)
+       - Remove stray HAVE_GETOPT_LONG $ifdefs. (DLR)
+- nano.h:
+       - Move the NANO_H include guard up before the first #include.
+         (DLR)
 - search.c:
   regexp_cleanup()
        - Only do anything if REGEXP_COMPILED is set. (David Benbennick)

diff --git a/src/nano.c b/src/nano.c
index 2c1832fb2465e54e2fb0301384f391c1a46fdc8d..acf4890a4d05bd355c148dc3b9134128b4c4dcad 100644 (file)
--- a/src/nano.c
+++ b/src/nano.c
@@ -3268,8 +3268,6 @@ int main(int argc, char *argv[])
 #endif
        case 'p':
            SET(PRESERVE);
-#ifdef HAVE_GETOPT_LONG
-#endif
            break;
 #ifndef DISABLE_WRAPJUSTIFY
        case 'r':

diff --git a/src/nano.h b/src/nano.h
index 8287307c04f62eab26d20ab9b887f96522e58cdf..7dd25befa3976e94b7d769c6bab134f5d2fee3f3 100644 (file)
--- a/src/nano.h
+++ b/src/nano.h
@@ -19,13 +19,13 @@
  *                                                                        *
  **************************************************************************/
 
+#ifndef NANO_H
+#define NANO_H 1
+
 #ifdef HAVE_LIMITS_H
 #include <limits.h>
 #endif
 
-#ifndef NANO_H
-#define NANO_H 1
-
 /* Macros for the flags int... */
 #define SET(bit) flags |= bit
 #define UNSET(bit) flags &= ~bit