vimamsa 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4d45a54c1e25d490c27465b9649d09fa3b0e5db85e91324fb8c70201de9ff5a1
-  data.tar.gz: f7393daa458da9e7c3b1e769049f7205e96e4ba157c162f9dacbdae700b6731d
+  metadata.gz: d29e057a168e6c2152c0d8da4c6957b863bd44e7dd9328ba2d5520ae11ab49a2
+  data.tar.gz: 4cdad5268d59c11e83335818bbcdd5627fe3e75045ab2602f84fd0d7440c6d7d
 SHA512:
-  metadata.gz: e4d8be7daf217add0cef74e246bebf114d886f60739bc700d532035067f9a3c26dabde5ffbec7ef662278a6f7829f0513210a961e4b9c661b0f9c52ea839971a
-  data.tar.gz: 33315be557aaf4f294005e80a1c8b9be61da65b9d0d21cc90b8e03bddb0c4cf34df332217e11787d5e2dd3da1a0de459065c342b44f8a37f1aec5cd34f7ed4c1
+  metadata.gz: c9ac4b15042dd07cab99b7be0859e714684073ff4438b8048f33bd9c21779b545d61f1ff17608d1ab15fe2e31a356e2af24df6002d027621958776b42c568db8
+  data.tar.gz: afdf6cab6f002f925542831c7e439eace41b9fd4217e8f659d9774e2c7609309ba55e1d1042447d0c091437ab379ca76c0c6fb515c7a90a7720603f1bad68b89

data/demo.txt

@@ -15,7 +15,7 @@ Extension .txt can be omitted:
 ⟦help:keybindings⟧
 
 Customizations:
-⟦~/.vimamsa/custom.rb⟧
+⟦~/.config/vimamsa/custom.rb⟧
 
 ◼ Images
 Images work in .txt-files by drag&drop. (experimental)

data/exe/vimamsa

@@ -9,7 +9,7 @@ selfpath = File.readlink(selfpath) if File.lstat(selfpath).symlink?
 scriptdir = File.expand_path(File.dirname(selfpath) + "/..")
 
 # If process is already running, open the parameter file in the running process and exit.
-listen_dir = File.expand_path("~/.vimamsa/listen")
+listen_dir = File.expand_path("~/.config/vimamsa/listen")
 if File.exist?(listen_dir) and !ARGV[0].nil?
   tmpf = Tempfile.new("vmarun", listen_dir)
   fp = tmpf.path

data/lib/vimamsa/editor.rb

@@ -91,23 +91,23 @@ class Editor
 
     @gui.init_menu
 
-    mkdir_if_not_exists("~/.vimamsa")
-    mkdir_if_not_exists("~/.vimamsa/backup")
-    mkdir_if_not_exists("~/.vimamsa/listen")
-    listen_dir = File.expand_path "~/.vimamsa/listen"
+    mkdir_if_not_exists("~/.config/vimamsa")
+    mkdir_if_not_exists("~/.config/vimamsa/backup")
+    mkdir_if_not_exists("~/.config/vimamsa/listen")
+    listen_dir = File.expand_path "~/.config/vimamsa/listen"
     listener = Listen.to(listen_dir) do |modified, added, removed|
       debug([modified: modified, added: added, removed: removed])
       open_file_listener(added)
     end
     listener.start
 
-    custom_fn = File.expand_path("~/.vimamsa/custom.rb")
+    custom_fn = File.expand_path("~/.config/vimamsa/custom.rb")
     if !File.exist?(custom_fn)
       example_custom = IO.read(ppath("custom_example.rb"))
       IO.write(custom_fn, example_custom)
     end
 
-    mkdir_if_not_exists("~/.vimamsa/custom.rb")
+    mkdir_if_not_exists("~/.config/vimamsa/custom.rb")
 
     $cnf[:theme] = "Twilight_edit"
     $cnf[:syntax_highlight] = true
@@ -119,7 +119,7 @@ class Editor
     # set_gui_style(1)
 
     #TODO: remove
-    dotfile = read_file("", "~/.vimamsarc")
+    dotfile = read_file("", "~/.config/vimamsarc")
     eval(dotfile) if dotfile
 
     custom_script = read_file("", custom_fn)
@@ -290,7 +290,6 @@ end
 
 def _quit()
   vma.shutdown
-  # Gtk.main_quit
 end
 
 def fatal_error(msg)
@@ -623,7 +622,7 @@ def hook_draw()
 end
 
 def get_dot_path(sfx)
-  dot_dir = File.expand_path("~/.vimamsa")
+  dot_dir = File.expand_path("~/.config/vimamsa")
   Dir.mkdir(dot_dir) unless File.exist?(dot_dir)
   dpath = "#{dot_dir}/#{sfx}"
   return dpath

data/lib/vimamsa/gui.rb

@@ -219,6 +219,7 @@ class VMAgui
         t.exit
       end
     end
+    @app.quit
   end
 
   def scale_all_images
@@ -764,6 +765,10 @@ class VMAgui
 
   def set_one_column
     return if !@two_column
+    #This always closes the leftmost column/window
+    #TODO: close rightmost column if left active
+    set_active_window(1)
+    
     @windows[2][:sw].set_child(nil)
     @windows.delete(2)
 

data/lib/vimamsa/gui_sourceview.rb

@@ -587,6 +587,7 @@ class VSourceView < GtkSource::View
     # end
 
     sv = vma.gui.sw.child
+    return if sv.nil? #TODO: should not happen?
     mode = vma.kbd.get_mode
     ctype = vma.kbd.get_cursor_type
     ctype = :visual if vma.buf.selection_active?

data/lib/vimamsa/macro.rb

@@ -165,7 +165,7 @@ class Macro
     m = @recorded_macros[name]
     return if !(m.kind_of?(Array) and m.any?)
     contents = m.join(";")
-    dot_dir = File.expand_path("~/.vimamsa")
+    dot_dir = File.expand_path("~/.config/.vimamsa")
     Dir.mkdir(dot_dir) unless File.exist?(dot_dir)
     save_fn = "#{dot_dir}/macro_#{name}.rb"
 

data/lib/vimamsa/version.rb

@@ -1,3 +1,3 @@
 module Vimamsa
-  VERSION = "0.1.18"
+  VERSION = "0.1.19"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vimamsa
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - Sami Sieranoja
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-03-17 00:00:00.000000000 Z
+date: 2024-03-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler