commit 0cebe2e868771a1b064f44094a0a29fcf4eaac9b
parent d3fea1afa750f36dbf671027134a991a006669d7
Author: Hamish Downer <dmishd@gmail.com>
Date: Tue, 15 Feb 2011 21:38:12 +0000
resolved conflicts
Diffstat:
1 file changed, 39 insertions(+), 0 deletions(-)
diff --git a/lib/sup/modes/edit-message-async-mode.rb b/lib/sup/modes/edit-message-async-mode.rb
@@ -1,5 +1,6 @@
# edit-message-async-mode
#
+<<<<<<< HEAD
module Redwood
class EditMessageAsyncMode < LineCursorMode
@@ -12,10 +13,21 @@ class EditMessageAsyncMode < LineCursorMode
register_keymap do |k|
k.add :edit_finished, "Finished editing message", 'E'
end
+=======
+
+class EditMessageAsyncMode < Mode
+ # TODO:
+ #
+ # * set up keymap - just X to say you're done
+
+ # * generate buffer text
+ # * override mode bits - killable etc.
+>>>>>>> 5222f0defb5bcf3752ac3a59ad1ea60ecfa0e82e
# * initialize function - need
# ** file path
# ** info to restart edit mode it started in
+<<<<<<< HEAD
def initialize file_path, title, finish_condition
@file_path = file_path
@finish_condition = finish_condition
@@ -35,10 +47,18 @@ protected
# * override mode bits - killable etc.
def edit_finished
+=======
+ def initialize
+ end
+
+ def edit_finished
+ #
+>>>>>>> 5222f0defb5bcf3752ac3a59ad1ea60ecfa0e82e
# We need a edit_message_async_resume method, but maybe that
# should be in another mode?? The below code should run in it
# first make sure any external editor has exited
+<<<<<<< HEAD
File.open(@file_path, 'r') { |f|
if !f.flock(File::LOCK_EX|File::LOCK_NB)
# ask user to check that any editor of that file has exited
@@ -60,4 +80,23 @@ protected
end
end
+=======
+ File.open(@file.path, 'r') { |f|
+ while !f.flock(File::LOCK_EX|File::LOCK_NB)
+ # ask user to check that any editor of that file has exited
+ # press enter when ready to continue
+ end
+ }
+ @edited = true if File.mtime(@file.path) > @mtime
+
+ return @edited unless @edited
+
+ header, @body = parse_file @file.path
+ @header = header - NON_EDITABLE_HEADERS
+ handle_new_text @header, @body
+ update
+
+ @edited
+ end
+>>>>>>> 5222f0defb5bcf3752ac3a59ad1ea60ecfa0e82e
end