fix still more breakage caused by the overhaul

git-svn-id: svn://svn.savannah.gnu.org/nano/trunk/nano@2842 35c25a1d-7b9e-4130-9fde-d3aeb78583b8
master
David Lawrence Ramsey 2005-07-09 05:38:21 +00:00
parent 1d696c0047
commit 2d705caec7
2 changed files with 4 additions and 6 deletions

View File

@ -169,8 +169,8 @@ void open_buffer(const char *filename)
/* If the filename isn't blank, open the file. Otherwise, treat it /* If the filename isn't blank, open the file. Otherwise, treat it
* as a new file. */ * as a new file. */
rc = (filename[0] != '\0') ? open_file(filename, new_buffer, &f) : rc = (filename[0] != '\0') ?
-2; open_file(filename, new_buffer, &f) : -2;
/* If we're loading into a new buffer, add a new openfile entry. */ /* If we're loading into a new buffer, add a new openfile entry. */
if (new_buffer) if (new_buffer)

View File

@ -4699,9 +4699,6 @@ int main(int argc, char **argv)
UNSET(VIEW_MODE); UNSET(VIEW_MODE);
} }
/* Update the screen to account for the current buffer. */
load_buffer();
#ifdef ENABLE_MULTIBUFFER #ifdef ENABLE_MULTIBUFFER
if (!old_multibuffer) if (!old_multibuffer)
UNSET(MULTIBUFFER); UNSET(MULTIBUFFER);
@ -4721,7 +4718,8 @@ int main(int argc, char **argv)
sigsetjmp(jmpbuf, 1); sigsetjmp(jmpbuf, 1);
#endif #endif
edit_refresh(); /* Update the screen to account for the current buffer. */
load_buffer();
while (TRUE) { while (TRUE) {
bool meta_key, func_key, s_or_t, ran_func, finished; bool meta_key, func_key, s_or_t, ran_func, finished;