simplify edit_update() so as not to require the fileptr parameter

anymore, since it's set to current in all calls

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

diff --git a/ChangeLog b/ChangeLog
index 7c1428a31081f19d5325837ba26f33796ce5cbc7..da283fe185ac82ffa42340bf0fdc46bb7a0a9487 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -29,6 +29,9 @@ CVS code -
        - If there are more than MAIN_VISIBLE shortcuts available, only
          register clicks on the first MAIN_VISIBLE shortcuts, since
          bottombars() only shows that many shortcuts. (DLR)
+  edit_update()
+       - Simplify so as not to require the fileptr parameter anymore,
+         since it's set to current in all calls. (DLR)
   do_yesno()
        - Don't bother assigning the value of get_mouseinput() to
          anything.  Since allow_shortcuts is FALSE, its return value

diff --git a/src/move.c b/src/move.c
index 84b907fa78a7ce9d02a755ebeeb2f6a3c019ea67..7e22d338a09912a69371e012e9ee191a1a93d358 100644 (file)
--- a/src/move.c
+++ b/src/move.c
@@ -35,7 +35,7 @@ void do_first_line(void)
     placewewant = 0;
     current_x = 0;
     if (edittop != fileage || need_vertical_update(old_pww))
-       edit_update(current, TOP);
+       edit_update(TOP);
 }
 
 void do_last_line(void)
@@ -46,7 +46,7 @@ void do_last_line(void)
     current_x = 0;
     if (edittop->lineno + (editwinrows / 2) != filebot->lineno ||
        need_vertical_update(old_pww))
-       edit_update(current, CENTER);
+       edit_update(CENTER);
 }
 
 void do_home(void)

diff --git a/src/proto.h b/src/proto.h
index 5ea8c11bff25e5d8dd261acce3062353faf3838c..a975326b5e2d92f417ca6e2dad31ecff91935227 100644 (file)
--- a/src/proto.h
+++ b/src/proto.h
@@ -565,7 +565,7 @@ int need_vertical_update(size_t old_pww);
 void edit_scroll(updown direction, int nlines);
 void edit_redraw(const filestruct *old_current, size_t old_pww);
 void edit_refresh(void);
-void edit_update(filestruct *fileptr, topmidnone location);
+void edit_update(topmidnone location);
 int statusq(int allowtabs, const shortcut *s, const char *def,
 #ifndef NANO_SMALL
                historyheadtype *history_list,

diff --git a/src/search.c b/src/search.c
index 63596897cd46ddb9f6b9fa90d038ff5d3c113bf2..79e36239f4798481f168f6220922cea02c9121c9 100644 (file)
--- a/src/search.c
+++ b/src/search.c
@@ -877,7 +877,7 @@ void do_gotoline(int line, bool save_pos)
 
     /* If save_pos is TRUE, don't change the cursor position when
      * updating the edit window. */
-    edit_update(current, save_pos ? NONE : CENTER);
+    edit_update(save_pos ? NONE : CENTER);
 
     placewewant = 0;
     display_main_list();

diff --git a/src/winio.c b/src/winio.c
index 4e155e3733f3d46ccf78ebef31a01f89881c70bb..a4a3a0b171407f457c5b2ca74a22815147ae99d3 100644 (file)
--- a/src/winio.c
+++ b/src/winio.c
@@ -2897,7 +2897,7 @@ void edit_refresh(void)
         * current->lineno = edittop->lineno + editwinrows / 2.  Thus
         * when it then calls edit_refresh(), there is no danger of
         * getting an infinite loop. */
-       edit_update(current, CENTER);
+       edit_update(CENTER);
     else {
        int nlines = 0;
        const filestruct *foo = edittop;
@@ -2922,20 +2922,22 @@ void edit_refresh(void)
     }
 }
 
-/* Nice generic routine to update the edit buffer, given a pointer to the
- * file struct =) */
-void edit_update(filestruct *fileptr, topmidnone location)
+/* A nice generic routine to update the edit buffer. */
+void edit_update(topmidnone location)
 {
-    if (fileptr == NULL)
+    filestruct *foo = current;
+
+    /* We shouldn't need this check.  Yuck. */
+    if (current == NULL)
        return;
 
     if (location != TOP) {
        int goal = (location == NONE) ? current_y : editwinrows / 2;
 
-       for (; goal > 0 && fileptr->prev != NULL; goal--)
-           fileptr = fileptr->prev;
+       for (; goal > 0 && foo->prev != NULL; goal--)
+           foo = foo->prev;
     }
-    edittop = fileptr;
+    edittop = foo;
     edit_refresh();
 }