aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--qbuffers.cpp11
-rw-r--r--qbuffers.h2
2 files changed, 4 insertions, 9 deletions
diff --git a/qbuffers.cpp b/qbuffers.cpp
index 1ac06c7..77fefd5 100644
--- a/qbuffers.cpp
+++ b/qbuffers.cpp
@@ -422,10 +422,9 @@ Ring::is_any_dirty(void)
return false;
}
-bool
+void
Ring::edit(const gchar *filename)
{
- bool new_in_ring = false;
Buffer *buffer = find(filename);
current_save_dot();
@@ -437,12 +436,11 @@ Ring::edit(const gchar *filename)
execute_hook(HOOK_EDIT);
} else {
- new_in_ring = true;
-
buffer = new Buffer();
LIST_INSERT_HEAD(&head, buffer, buffers);
current = buffer;
+ undo_close();
if (g_file_test(filename, G_FILE_TEST_IS_REGULAR)) {
buffer->load(filename);
@@ -464,8 +462,6 @@ Ring::edit(const gchar *filename)
execute_hook(HOOK_ADD);
}
-
- return new_in_ring;
}
#if 0
@@ -679,8 +675,7 @@ StateEditFile::do_edit(const gchar *filename)
ring.undo_edit();
else /* qregisters.current != NULL */
qregisters.undo_edit();
- if (ring.edit(filename))
- ring.undo_close();
+ ring.edit(filename);
}
void
diff --git a/qbuffers.h b/qbuffers.h
index b11d53d..a6d016c 100644
--- a/qbuffers.h
+++ b/qbuffers.h
@@ -349,7 +349,7 @@ public:
void dirtify(void);
bool is_any_dirty(void);
- bool edit(const gchar *filename);
+ void edit(const gchar *filename);
inline void
undo_edit(void)
{