Merge branch 'master' into configurable-tags-column

Author: joaomsa

DOCS.md

@@ -216,7 +216,7 @@ require('orgmode').setup({
     f = {
       label = 'Export to RTF format',
       action = function(exporter)
-        local current_file = vim.fn.bufname()
+        local current_file = vim.api.nvim_buf_get_name(0)
         local target = vim.fn.fnamemodify(current_file, ':p:r')..'.rtf'
         local command = {'pandoc', current_file, '-o', target}
         local on_success = function(output)

README.md

@@ -227,6 +227,22 @@ set conceallevel=2
 set concealcursor=nc
 ```
 
+##### Jumping to file path is not working for paths with forward slash
+If you are using Windows, paths are by default written with backslashes.
+To use forward slashes, you must enable `shellslash` option (see `:help 'shellslash'`).
+
+```lua
+vim.opt.shellslash = true
+```
+
+Or if you are using `init.vim`:
+
+```vim
+set shellslash
+```
+
+More info on issue [#281](https://github.com/nvim-orgmode/orgmode/issues/281#issuecomment-1120200775)
+
 ### Features (TL;DR):
 * Agenda view
 * Search by tags/keyword

doc/orgmode.txt

@@ -401,7 +401,7 @@ For example, lets add option to export to `rtf` format via `pandoc`:
         f = {
           label = 'Export to RTF format',
           action = function(exporter)
-            local current_file = vim.fn.bufname()
+            local current_file = vim.api.nvim_buf_get_name(0)
             local target = vim.fn.fnamemodify(current_file, ':p:r')..'.rtf'
             local command = {'pandoc', current_file, '-o', target}
             local on_success = function(output)

lua/orgmode/capture/init.lua

@@ -134,7 +134,7 @@ function Capture:_get_refile_vars()
   local template = vim.api.nvim_buf_get_var(0, 'org_template') or {}
   local file = vim.fn.fnamemodify(template.target or config.org_default_notes_file, ':p')
   local lines = vim.api.nvim_buf_get_lines(0, 0, -1, true)
-  local org_file = File.from_content(lines, 'capture', vim.fn.bufname())
+  local org_file = File.from_content(lines, 'capture', utils.current_file_path())
   local item = nil
   if org_file then
     item = org_file:get_headlines()[1]
@@ -242,7 +242,7 @@ function Capture:_refile_to(file, lines, item, destination_line)
     return false
   end
 
-  local is_same_file = file == vim.fn.bufname()
+  local is_same_file = file == utils.current_file_path()
   local cur_win = vim.api.nvim_get_current_win()
 
   if is_same_file and item then

lua/orgmode/capture/templates.lua

@@ -1,5 +1,6 @@
 local config = require('orgmode.config')
 local Date = require('orgmode.objects.date')
+local utils = require('orgmode.utils')
 local expansions = {
   ['%f'] = function()
     return vim.fn.expand('%')
@@ -26,7 +27,7 @@ local expansions = {
     return string.format('[%s]', Date.now():to_string())
   end,
   ['%a'] = function()
-    return string.format('[[file:%s +%s]]', vim.fn.bufname(), vim.api.nvim_win_get_cursor(0)[1])
+    return string.format('[[file:%s +%s]]', utils.current_file_path(), vim.api.nvim_win_get_cursor(0)[1])
   end,
 }
 

lua/orgmode/clock/init.lua

@@ -68,7 +68,7 @@ function Clock:org_clock_goto()
     utils.echo_info('No running clock, this is the most recently clocked task')
   end
 
-  if vim.fn.bufname() ~= active_headline.file then
+  if utils.current_file_path() ~= active_headline.file then
     vim.cmd('edit ' .. vim.fn.fnameescape(active_headline.file))
   end
   vim.fn.cursor({ active_headline.range.start_line, 0 })