change enum "topmidbotnone" to "topmidnone", since we no longer have a

BOTTOM option

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

diff --git a/ChangeLog b/ChangeLog
index 72317981ad60ee82ffd7c24c31aca4e3632b70cb..56ebe609cf4d799d0b0159ac28d1df6475e6af15 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -35,7 +35,9 @@ CVS code -
        - Translation updates (see po/ChangeLog for details).
        - Since SAMELINEWRAP is only used in nano.c, make it a static
          variable in nano.c instead of a flag, and surround all
-         wrap_reset() calls with DISABLE_WRAPPING  #ifdefs. (DLR)
+         wrap_reset() calls with DISABLE_WRAPPING #ifdefs. (DLR)
+       - Change enum "topmidbotnone" to "topmidnone", as there's no
+         BOTTOM option anymore. (DLR)
 - files.c:
   do_browser()
        - Some of the Pico compatibility options in the file browser

diff --git a/src/nano.h b/src/nano.h
index 0945f0e5e5406db5058dd75e1f92a54a752e7793..32e254ed308b6e4382241279eeb89a3bbeef32ef 100644 (file)
--- a/src/nano.h
+++ b/src/nano.h
@@ -420,8 +420,8 @@ know what you're doing */
 #define NOVIEW 0
 
 typedef enum {
-    CENTER, TOP, NONE
-} topmidbotnone;
+    TOP, CENTER, NONE
+} topmidnone;
 
 /* Minimum editor window rows required for nano to work correctly */
 #define MIN_EDITOR_ROWS 3

diff --git a/src/proto.h b/src/proto.h
index ab7fad19d7e4ff99da3de7ac514f4781b714cf1c..62b3c46029115fa7d80fce214a3be806be6f17ec 100644 (file)
--- a/src/proto.h
+++ b/src/proto.h
@@ -483,7 +483,7 @@ void update_cursor(void);
 void center_cursor(void);
 void edit_refresh(void);
 void edit_refresh_clearok(void);
-void edit_update(filestruct *fileptr, topmidbotnone location);
+void edit_update(filestruct *fileptr, topmidnone location);
 int statusq(int tabs, const shortcut *s, const char *def,
 #ifndef NANO_SMALL
                historyheadtype *history_list,

diff --git a/src/winio.c b/src/winio.c
index 22056d79993aabd3ac02a6b085bd5ea9bd14c0f3..7b5f8de966794dfe2eb1c3c1b2b17525d17930b8 100644 (file)
--- a/src/winio.c
+++ b/src/winio.c
@@ -1381,7 +1381,7 @@ void edit_refresh_clearok(void)
  * Nice generic routine to update the edit buffer, given a pointer to the
  * file struct =) 
  */
-void edit_update(filestruct *fileptr, topmidbotnone location)
+void edit_update(filestruct *fileptr, topmidnone location)
 {
     if (fileptr == NULL)
        return;