Merge edafb6b968 into e0bbd1e7ca

Erlang comments start with `%`. This is correctly highlighted
but the comment-line/comment-block commands don't work correctly.

doc/pages/hooks.asciidoc

@@ -147,6 +147,11 @@ name. Hooks with no description will always use an empty string.
 *SessionRenamed* `<old name>:<new name>`::
     executed when a session is renamed using the `rename-session` command
 
+*EnterDirectory* `path`::
+    executed on startup and when the current working directory is changed
+    using the `change-directory` command. The hook param is an absolute path
+    to the new working directory.
+
 *RuntimeError* `error message`::
     an error was encountered while executing a user command
 

rc/tools/comment.kak

@@ -75,7 +75,7 @@ hook global BufSetOption filetype=(html|xml) %{
     set-option buffer comment_block_end '-->'
 }
 
-hook global BufSetOption filetype=(latex|mercury) %{
+hook global BufSetOption filetype=(erlang|latex|mercury) %{
     set-option buffer comment_line '%'
 }
 

rc/tools/jump.kak

@@ -2,6 +2,8 @@ declare-option -docstring "name of the client in which all source code jumps wil
     str jumpclient
 declare-option -docstring "name of the client in which utilities display information" \
     str toolsclient
+declare-option -docstring "the pattern for the jump information in the line, such as file:line:col" \
+    str jump_pattern "^([^:\n]+)(?::(\d+))(?::(\d+))?"
 
 provide-module jump %{
 
@@ -11,7 +13,7 @@ define-command -hidden jump %{
     evaluate-commands -save-regs a %{ # use evaluate-commands to ensure jumps are collapsed
         try %{
             evaluate-commands -draft %{
-                execute-keys ',xs^([^:\n]+):(\d+):(\d+)?<ret>'
+                execute-keys ",xs%opt{jump_pattern}<ret>"
                 set-register a %reg{1} %reg{2} %reg{3}
             }
             set-option buffer jump_current_line %val{cursor_line}
@@ -41,7 +43,10 @@ define-command -hidden jump-select-next %{
     # First jump to end of buffer so that if jump_current_line == 0
     # 0g<a-l> will be a no-op and we'll jump to the first result.
     # Yeah, thats ugly...
-    execute-keys ge %opt{jump_current_line}g<a-l> /^[^:\n]+:\d+:<ret>
+    evaluate-commands -save-regs / %{
+        set-register / %opt{jump_pattern}
+        execute-keys ge %opt{jump_current_line}g<a-l>/<ret>
+    }
 }
 
 define-command jump-previous -params 1.. -docstring %{
@@ -62,7 +67,10 @@ define-command jump-previous -params 1.. -docstring %{
 complete-command jump-previous buffer
 define-command -hidden jump-select-previous %{
     # See comment in jump-select-next
-    execute-keys ge %opt{jump_current_line}g<a-h> <a-/>^[^:\n]+:\d+:<ret>
+    evaluate-commands -save-regs / %{
+        set-register / %opt{jump_pattern}
+        execute-keys ge %opt{jump_current_line}g<a-h> <a-/><ret>
+    }
 }
 
 }

src/commands.cc

@@ -2600,13 +2600,15 @@ const CommandDesc change_directory_cmd = {
                                         cursor_pos, FilenameFlags::OnlyDirectories),
                       Completions::Flags::Menu };
         }),
-    [](const ParametersParser& parser, Context&, const ShellContext&)
+    [](const ParametersParser& parser, Context& ctx, const ShellContext&)
     {
         StringView target = parser.positional_count() == 1 ? StringView{parser[0]} : "~";
-        if (chdir(parse_filename(target).c_str()) != 0)
+        auto path = real_path(parse_filename(target));
+        if (chdir(path.c_str()) != 0)
             throw runtime_error(format("unable to change to directory: '{}'", target));
         for (auto& buffer : BufferManager::instance())
             buffer->update_display_name();
+        ctx.hooks().run_hook(Hook::EnterDirectory, path, ctx);
     }
 };
 

src/hook_manager.hh

@@ -50,6 +50,7 @@ enum class Hook
     NextKeyIdle,
     NormalKey,
     ModeChange,
+    EnterDirectory,
     RawKey,
     RegisterModified,
     WinClose,
@@ -97,6 +98,7 @@ constexpr auto enum_desc(Meta::Type<Hook>)
         {Hook::NextKeyIdle, "NextKeyIdle"},
         {Hook::NormalKey, "NormalKey"},
         {Hook::ModeChange, "ModeChange"},
+        {Hook::EnterDirectory, "EnterDirectory"},
         {Hook::RawKey, "RawKey"},
         {Hook::RegisterModified, "RegisterModified"},
         {Hook::WinClose, "WinClose"},

src/main.cc

@@ -842,6 +842,7 @@ int run_server(StringView session, StringView server_init,
 
     {
         Context empty_context{Context::EmptyContextFlag{}};
+        global_scope.hooks().run_hook(Hook::EnterDirectory, real_path("."), empty_context);
         global_scope.hooks().run_hook(Hook::KakBegin, session, empty_context);
     }