about summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorhut <hut@lavabit.com>2009-07-19 23:22:08 +0200
committerhut <hut@lavabit.com>2009-07-19 23:22:08 +0200
commit79ed1dfa8f327ab0aa2ed943bc822e62e47f5cc8 (patch)
tree4ac986a30fa0855d676995e045063e5ca6ba6c03
parent0a0c06e37f8a236cf780ee822357e5c59e197d5c (diff)
downloadranger-79ed1dfa8f327ab0aa2ed943bc822e62e47f5cc8.tar.gz
a couple of cleanups
-rw-r--r--code/fm.rb26
-rwxr-xr-xranger.rb4
2 files changed, 4 insertions, 26 deletions
diff --git a/code/fm.rb b/code/fm.rb
index 974e8c65..fc065afe 100644
--- a/code/fm.rb
+++ b/code/fm.rb
@@ -1,26 +1,5 @@
 require 'thread'
 
-## methods:
-## initialize(pwd=nil)
-## refresh
-## boot_up
-## lines
-## dump
-## on_interrupt
-## terminal_killed?
-## main_loop
-## current_path
-## reset_title
-## enter_dir_safely(dir)
-## enter_dir(dir)
-## currentfile
-## selection
-## move_to_trash!(filename)
-## move_to_trash(file)
-## bar_add(bar)
-## bar_del(bar)
-## getfiles
-##
 module Fm
 	extend self
 	COPY_PRIORITY = -2
@@ -75,6 +54,7 @@ module Fm
 			update_pointers
 			draw if CLI.running?
 		rescue
+			lograise
 		end
 	end
 
@@ -140,7 +120,6 @@ module Fm
 	end
 
 	def terminal_killed?
-#		`ps ho tname --pid #{Process.pid}`.strip == '?'
 		Process.ppid == 1
 	end
 
@@ -185,7 +164,6 @@ module Fm
 				enter_dir(dir)
 				return true
 			rescue
-				log("NIGGER" * 100)
 				log($!)
 				log(caller)
 				enter_dir(olddir)
@@ -218,7 +196,7 @@ module Fm
 
 		@pwd = @path.last
 		@pwd.refresh! if @pwd.changed?
-		@pwd.pos = @pwd.pos
+		@pwd.make_sure_cursor_is_in_range
 
 		## initialize directories in @pwd
 		@pwd.files_raw.dup.each do |x|
diff --git a/ranger.rb b/ranger.rb
index 485305e8..af062930 100755
--- a/ranger.rb
+++ b/ranger.rb
@@ -84,8 +84,8 @@ begin
 	Fm.initialize( pwd )
 	Fm.main_loop
 ensure
-	log "exiting!"
-	log ""
+	log "exiting!\n\n"
+
 	closei if CLI.running?
 	CLI.stop_mouse
 	Fm.dump