Skip to content

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
stephenfin committed Sep 26, 2014
2 parents 675e7d8 + fa0e58e commit 79e60a7
Show file tree
Hide file tree
Showing 5 changed files with 32 additions and 6 deletions.
3 changes: 2 additions & 1 deletion README.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@
CTags
=====

.. image:: https://travis-ci.org/SublimeText/CTags.png?branch=development :target: https://travis-ci.org/SublimeText/CTags
.. image:: https://travis-ci.org/SublimeText/CTags.svg?branch=development
:target: https://travis-ci.org/SublimeText/CTags

About
=====
Expand Down
4 changes: 2 additions & 2 deletions ctags.py
Original file line number Diff line number Diff line change
Expand Up @@ -360,11 +360,11 @@ def resort_ctags(tag_file):
"""
keys = {}

with codecs.open(tag_file, encoding='utf-8', errors='ignore') as fh:
with codecs.open(tag_file, encoding='utf-8', errors='replace') as fh:
for line in fh:
keys.setdefault(line.split('\t')[FILENAME], []).append(line)

with codecs.open(tag_file+'_sorted_by_file', 'w', encoding='utf-8', errors='ignore') as fw:
with codecs.open(tag_file+'_sorted_by_file', 'w', encoding='utf-8', errors='replace') as fw:
for k in sorted(keys):
for line in keys[k]:
split = line.split('\t')
Expand Down
6 changes: 4 additions & 2 deletions ctagsplugin.py
Original file line number Diff line number Diff line change
Expand Up @@ -316,6 +316,8 @@ def find_with_scope(view, pattern, scope, start_pos=0, cond=True, flags=0):
max_pos = view.size()

while start_pos < max_pos:
estrs = pattern.split('\ufffd')
if(len(estrs)>1):pattern = estrs[0]
f = view.find(pattern, start_pos, flags)

if not f or view.match_selector(f.begin(), scope) is cond:
Expand Down Expand Up @@ -352,7 +354,7 @@ def follow_tag_path(view, tag_path, pattern):
if setting('debug'): # leave a visual trail for easy debugging
regions = regions + ([pattern_region] if pattern_region else [])
view.erase_regions('tag_path')
view.add_regions('tag_path', regions, 'comment', 1)
view.add_regions('tag_path', regions, 'comment', '', 1)

return pattern_region.begin() - 1 if pattern_region else None

Expand Down Expand Up @@ -409,7 +411,7 @@ def format_tag_for_quickopen(tag, show_path=True):
f += string.Template(
' %($field)s$punct%(symbol)s').substitute(locals())

format = [(f or tag.symbol) % tag, tag.ex_command]
format = [f % tag if f else tag.symbol, tag.ex_command]
format[1] = format[1].strip()

if show_path:
Expand Down
3 changes: 2 additions & 1 deletion messages.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,6 @@
"0.3.5": "messages/0.3.5.md",
"0.3.6": "messages/0.3.6.md",
"0.3.7": "messages/0.3.7.md",
"0.3.8": "messages/0.3.8.md"
"0.3.8": "messages/0.3.8.md",
"0.3.9": "messages/0.3.9.md"
}
22 changes: 22 additions & 0 deletions messages/0.3.9.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
Changes in 0.3.8
================

- Add build ctags options to sidebar
- Bug Fixes

Fixes
=====

* Add missing 'icon' parameter to 'add_regions', #261
* Fix accidentally using a symbol as a format string, #264
* Fix issues with non-UTF8 charset, #267

Resolves
========

N/A

*******************************************************************************

For more detailed information about these changes, run ``git v0.3.8..v0.3.9``
on the Git repository found [here](https://github.com/SublimeText/CTags).

0 comments on commit 79e60a7

Please sign in to comment.