textbringer 15 → 16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ad5b7d9a5cc2022075f802db23f24781dcb3be366a4ba3ee27015a66ada834d
-  data.tar.gz: 1933c54c72c4e189b4f0a6ba81d6186d7618c9eaaa3eccbe5b61925d8959c108
+  metadata.gz: 0b838b91740f3985ebcdc6987e72ea7fe9daa28ad0b273a6f6e0f309818778a6
+  data.tar.gz: 51a55425c1cdaefb69b74451c3c9091f85138549a27a60e8ebb23161b4530847
 SHA512:
-  metadata.gz: 44736e20de4174e865ad160107e48461e26d46cd495e74000138c724753dafaae65b5e530902e8f1ad1f38659e301cfe2fbec71208913f85d01af5e23b124bc5
-  data.tar.gz: b07e7c3533f540b88157c268d498f7ec6bd077db6fce0e3adb154acc02fb9d960cee0bfb23cd91342a6dce12f0c8af1083dac1434fc67c9fddc361bd03623ded
+  metadata.gz: 128afb2fe777b9847ace11badce3121391576a98b7caba7f5bdb93faf4383e00b15db4ae23e263e8f1a26fc79ef1b3fa5b12d02e6ae8b590533088c680ef3532
+  data.tar.gz: 4e082735768a0d2647abf67ca9c7a5268ba6607fe59462de26dff2e59caca272c68224e061791cad58d6f81648bb17c9031b880361a56ce93912b3e27c487457

data/exe/txtb

@@ -29,6 +29,8 @@ begin
   Window.start do
     $stdout = DefaultOutput.new
     begin
+      transient_mark_mode(true)
+      Window.echo_area.clear_message
       load_user_config("~/.textbringer/init.rb")
       Plugin.load_plugins
       load_user_config("~/.textbringer.rb")

data/lib/textbringer/buffer.rb

@@ -1300,15 +1300,28 @@ module Textbringer
       Utils.run_hooks(mode_class.hook_name)
     end
 
-    def toggle_minor_mode(mode_class)
+    def set_minor_mode(mode_class, arg = nil)
       mode = @minor_modes.find { |mode| mode.instance_of?(mode_class) }
-      if mode
-        mode.disable
-        @minor_modes.delete(mode)
-      else
+      enabled = !!mode
+
+      enable =
+        case arg
+        when true, false
+          return if enabled == arg
+          arg
+        when nil
+          !enabled
+        else
+          raise ArgumentError, "wrong argument #{arg.inspect} (expected true, false, or nil)"
+        end
+
+      if enable
         mode = mode_class.new(self)
         @minor_modes.push(mode)
         mode.enable
+      else
+        mode.disable
+        @minor_modes.delete(mode)
       end
     end
 

data/lib/textbringer/global_minor_mode.rb

@@ -35,13 +35,26 @@ module Textbringer
       child.command_name = command
 
       # Define the toggle command
-      define_command(command) do
-        if child.enabled?
-          child.disable
-          child.enabled = false
-        else
+      define_command(command, doc: "Enable or disable #{command_name}.  " \
+                     "Toggle the mode if arg is nil.  " \
+                     "Enable the mode if arg is true.  " \
+                     "Disable the mode if arg is false") do |arg = nil|
+        enable =
+          case arg
+          when true, false
+            return if child.enabled? == arg
+            arg
+          when nil
+            !child.enabled?
+          else
+            raise ArgumentError, "wrong argument #{arg.inspect} (expected true, false, or nil)"
+          end
+        if enable
           child.enable
           child.enabled = true
+        else
+          child.disable
+          child.enabled = false
         end
       end
     end

data/lib/textbringer/minor_mode.rb

@@ -17,8 +17,11 @@ module Textbringer
         }
       command = command_name.intern
       child.command_name = command
-      define_command(command) do
-        Buffer.current.toggle_minor_mode(child)
+      define_command(command, doc: "Enable or disable #{command_name}.  " \
+                     "Toggle the mode if arg is nil.  " \
+                     "Enable the mode if arg is true.  " \
+                     "Disable the mode if arg is false") do |arg = nil|
+        Buffer.current.set_minor_mode(child, arg)
       end
     end
 

data/lib/textbringer/version.rb

@@ -1,3 +1,3 @@
 module Textbringer
-  VERSION = "15"
+  VERSION = "16"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: textbringer
 version: !ruby/object:Gem::Version
-  version: '15'
+  version: '16'
 platform: ruby
 authors:
 - Shugo Maeda