From 6e086c1310caa4182e919a9ba6fe35f6c3bf3725 Mon Sep 17 00:00:00 2001
From: mitchell <70453897+667e-11@users.noreply.github.com>
Date: Tue, 5 Apr 2016 20:45:51 -0400
Subject: Only convert filenames from `_CHARSET` to UTF-8, not UTF-8-encoded
 buffer names.

---
 modules/textadept/bookmarks.lua | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'modules')

diff --git a/modules/textadept/bookmarks.lua b/modules/textadept/bookmarks.lua
index ded52fa4..24eea717 100644
--- a/modules/textadept/bookmarks.lua
+++ b/modules/textadept/bookmarks.lua
@@ -53,13 +53,14 @@ function M.goto_mark(next)
         if current_buffer_first and _BUFFERS[i] == buffer or
            not current_buffer_first and _BUFFERS[i] ~= buffer then
           local buffer = _BUFFERS[i]
-          local filename = (buffer.filename or buffer._type or
-                            _L['Untitled']):match('[^/\\]+$')
+          local basename = (buffer.filename or ''):match('[^/\\]+$') or
+                           buffer._type or _L['Untitled']
+          if buffer.filename then
+            basename = basename:iconv('UTF-8', _CHARSET)
+          end
           local line = buffer:marker_next(0, 2^M.MARK_BOOKMARK)
           while line >= 0 do
-            local mark = string.format('%s:%d: %s',
-                                       filename:iconv('UTF-8', _CHARSET),
-                                       line + 1,
+            local mark = string.format('%s:%d: %s', basename, line + 1,
                                        buffer:get_line(line):match('^[^\r\n]*'))
             utf8_list[#utf8_list + 1], buffers[#utf8_list + 1] = mark, i
             line = buffer:marker_next(line + 1, 2^M.MARK_BOOKMARK)
-- 
cgit v1.2.3