From 94bd5162211f695d53c5928a2fcb8ba0397e572a Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Tue, 14 Oct 2014 10:28:10 +0100
Subject: [PATCH 01/52] Adding styling for inline code

---
 Evernote.sublime-settings | 1 +
 lib/markdown2.py          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Evernote.sublime-settings b/Evernote.sublime-settings
index 9707ea1..c18685d 100644
--- a/Evernote.sublime-settings
+++ b/Evernote.sublime-settings
@@ -2,6 +2,7 @@
     "inline_css": {
         "pre": "color: #000000; font-family: monospace,monospace; font-size: 0.9em; white-space: pre-wrap; word-wrap: break-word; background-color: #f8f8f8; border: 1px solid #cccccc; border-radius: 3px; overflow: auto; padding: 6px 10px; margin-bottom: 10px;",
         "code": "color: black; font-family: monospace,monospace; font-size: 0.9em;",
+        "inline-code": "color: #000000; font-family: monospace,monospace; padding: 0.1em 0.2em; margin: 0.1em; font-size: 85%; background-color: #F5F5F5; border-radius: 3px; border: 1px solid #cccccc;",
         "h1": "margin-bottom: 1em; margin-top: 1.2em;",
         "footnotes": "border-top: 1px solid #9AB39B; font-size: 80%;",
         "hr": "color:#9AB39B;background-color:#9AB39B;height:1px;border:none;",
diff --git a/lib/markdown2.py b/lib/markdown2.py
index d80642b..c293949 100644
--- a/lib/markdown2.py
+++ b/lib/markdown2.py
@@ -1635,7 +1635,7 @@ def _do_fenced_code_blocks(self, text):
     def _code_span_sub(self, match):
         c = match.group(2).strip(" \t")
         c = self._encode_code(c)
-        return "<code>%s</code>" % c
+        return "<code%s>%s</code>" % (self._html_class_str_from_tag("inline-code"), c)
 
     def _do_code_spans(self, text):
         #   *   Backtick quotes are used for <code></code> spans.

From bfdf0299174296890f2a2f332e7d8266f9603d3f Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Tue, 14 Oct 2014 19:44:11 +0100
Subject: [PATCH 02/52] Support Unicode HTML escapes and solve Python3
 incompatibility

---
 lib/html2text.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/html2text.py b/lib/html2text.py
index 7d36912..33bcaf8 100644
--- a/lib/html2text.py
+++ b/lib/html2text.py
@@ -39,7 +39,7 @@ def has_key(x, y):
     xrange = range
 
 # Use Unicode characters instead of their ascii psuedo-replacements
-UNICODE_SNOB = 0
+UNICODE_SNOB = 1
 
 # Escape all special characters.  Output is less readable, but avoids corner case formatting issues.
 ESCAPE_SNOB = 0
@@ -281,7 +281,7 @@ def close(self):
 
         self.outtext = self.outtext.join(self.outtextlist)
         if self.unicode_snob:
-            nbsp = unichr(name2cp('nbsp'))
+            nbsp = chr(name2cp('nbsp'))
         else:
             nbsp = u' '
         self.outtext = self.outtext.replace(u'&nbsp_place_holder;', nbsp)
@@ -801,7 +801,7 @@ def charref(self, name):
             return unifiable_n[c]
         else:
             try:
-                return unichr(c)
+                return chr(c)
             except NameError: #Python3
                 return chr(c)
 
@@ -813,7 +813,7 @@ def entityref(self, c):
             except KeyError: return "&" + c + ';'
             else:
                 try:
-                    return unichr(name2cp(c))
+                    return chr(name2cp(c))
                 except NameError: #Python3
                     return chr(name2cp(c))
 

From 9ee0844ae068fb4fede2351d5f81d15cbbbe1ecd Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Thu, 6 Nov 2014 11:21:14 +0000
Subject: [PATCH 03/52] Styling: inlined pre bg-color gets overwritten by
 pygments; correct white bg to #f8f8f8 in `github` style (solves #56)

---
 Evernote.sublime-settings     | 2 +-
 lib/pygments/styles/github.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/Evernote.sublime-settings b/Evernote.sublime-settings
index c18685d..31f7368 100644
--- a/Evernote.sublime-settings
+++ b/Evernote.sublime-settings
@@ -1,6 +1,6 @@
 {
     "inline_css": {
-        "pre": "color: #000000; font-family: monospace,monospace; font-size: 0.9em; white-space: pre-wrap; word-wrap: break-word; background-color: #f8f8f8; border: 1px solid #cccccc; border-radius: 3px; overflow: auto; padding: 6px 10px; margin-bottom: 10px;",
+        "pre": "color: #000000; font-family: monospace,monospace; font-size: 0.9em; white-space: pre-wrap; word-wrap: break-word; border: 1px solid #cccccc; border-radius: 3px; overflow: auto; padding: 6px 10px; margin-bottom: 10px;",
         "code": "color: black; font-family: monospace,monospace; font-size: 0.9em;",
         "inline-code": "color: #000000; font-family: monospace,monospace; padding: 0.1em 0.2em; margin: 0.1em; font-size: 85%; background-color: #F5F5F5; border-radius: 3px; border: 1px solid #cccccc;",
         "h1": "margin-bottom: 1em; margin-top: 1.2em;",
diff --git a/lib/pygments/styles/github.py b/lib/pygments/styles/github.py
index 552e1ca..9d7a1b4 100644
--- a/lib/pygments/styles/github.py
+++ b/lib/pygments/styles/github.py
@@ -25,7 +25,7 @@ class GithubStyle(Style):
 
     default_style = ''
 
-    background_color = '#ffffff'
+    background_color = '#f8f8f8'
 
     styles = {
         Comment.Multiline:              'italic #999988',

From 169d3a9a73b27fb9e17d4e7683abe5fed0a4fb02 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Thu, 20 Nov 2014 12:37:08 +0000
Subject: [PATCH 04/52] Bugfix: inline css needs to end with semicolon allowing
 further concatenation (solves #55)

---
 sublime_evernote.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/sublime_evernote.py b/sublime_evernote.py
index 29ef900..b7ce2bb 100644
--- a/sublime_evernote.py
+++ b/sublime_evernote.py
@@ -241,6 +241,10 @@ def load_settings(self):
             EvernoteDo.MD_EXTRAS['wiki-tables'] = None
         css = self.settings.get("inline_css")
         if css is not None:
+            for tag in css:
+                css[tag] = css[tag].strip()
+                if not css[tag].endswith(";"):
+                    css[tag] = css[tag] + ";"
             EvernoteDo.MD_EXTRAS['inline-css'] = css
         self.md_syntax = self.settings.get("md_syntax")
         if not self.md_syntax:

From 9f69e61c489fa1f5ef3c5fc0a728754dc26bfdc1 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Mon, 15 Dec 2014 23:55:00 +0000
Subject: [PATCH 05/52] Autocomplete: space and comma trigger autocomplete only
 when enabled

---
 Default.sublime-keymap | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Default.sublime-keymap b/Default.sublime-keymap
index ad96c35..cde7db7 100644
--- a/Default.sublime-keymap
+++ b/Default.sublime-keymap
@@ -1,6 +1,7 @@
 [
     { "keys": [","], "command": "run_macro_file", "args":{"file": "Packages/Evernote/EvernoteAutoTags.sublime-macro"}, "context":
      [
+         { "key": "setting.evernote_autocomplete", "operator": "equal", "operand": true },
          { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
          { "key": "preceding_text", "operator": "regex_match", "operand": "^\\s*tags\\s*:.*$", "match_all": true },
          { "key": "eol_selector", "operator": "not_equal", "operand": "string.quoted", "match_all": true },
@@ -10,6 +11,7 @@
     },
     { "keys": [" "], "command": "auto_complete", "context":
      [
+         { "key": "setting.evernote_autocomplete", "operator": "equal", "operand": true },
          { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
          { "key": "preceding_text", "operator": "regex_match", "operand": "^\\s*tags\\s*:\\s*$", "match_all": true },
          { "key": "eol_selector", "operator": "not_equal", "operand": "string.quoted", "match_all": true },
@@ -19,6 +21,7 @@
     },
     { "keys": [","], "command": "run_macro_file", "args":{"file": "Packages/Evernote/EvernoteAutoTagsQuoted.sublime-macro"}, "context":
      [
+         { "key": "setting.evernote_autocomplete", "operator": "equal", "operand": true },
          { "key": "selection_empty", "operator": "equal", "operand": true, "match_all": true },
          { "key": "preceding_text", "operator": "regex_match", "operand": "^\\s*tags\\s*:.*$", "match_all": true },
          { "key": "eol_selector", "operator": "not_equal", "operand": "string.quoted", "match_all": true },

From 936e1a9d3991d08164d39e30e32126bf8e837c24 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Mon, 15 Dec 2014 23:55:31 +0000
Subject: [PATCH 06/52] Add setting for smarty_pants Markdown extra

---
 README.md           | 1 +
 sublime_evernote.py | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 8e9f4a6..c5bf4e2 100644
--- a/README.md
+++ b/README.md
@@ -224,6 +224,7 @@ Setting                   | Purpose
 `inline_css`              | a dictionary associating some HTML element names to inline CSS styles; currently the only elements that can be styled in this way are: `pre`, `code`, `h1`, `hr`, `blockquote` and `sup`. Additionally `footnotes` can be associated to some style for the `div` containing the footnotes at the end of the note. The markdown of a note can contain (almost) arbitrary HTML blocks *but* Evernote only accepts a subset of the elements and attributes (`class` and `id` are disallowed). See [here](http://dev.evernote.com/doc/articles/enml.php) for details.
 `code_highlighting_style` | a pygments style among `autumn`, `default`, `github`, `monokai`, `perldoc`, `vim`, `borland`, `emacs`, `igor`, `murphy`, `rrt`, `vs`,   `bw`, `friendly`, `native`, `tango`, `xcode`,   `colorful`, `fruity`, `manni`, `pastie`, `trac`.
 `code_friendly`           | if `true` the `code-friendly` extra of markdown2 is enabled
+`smarty_pants`            | if `true` the `smarty-pants` extra of markdown2 is enabled
 `evernote_autocomplete`   | when this setting is true, suggestions will be offered for autocompletion of the `notebook` and `tags` fields in metadata. Default is true.
 `notes_order`             | how to sort the notes in the panels; possible values: `created`, `updated`, `relevance`, `update_sequence_number`, `title`. Set the `notes_order_ascending` setting to `true` to reverse the selected order.
 `max_notes`               | maximum number of notes in a panel; default is 100.
diff --git a/sublime_evernote.py b/sublime_evernote.py
index b7ce2bb..34a082d 100644
--- a/sublime_evernote.py
+++ b/sublime_evernote.py
@@ -239,6 +239,8 @@ def load_settings(self):
             EvernoteDo.MD_EXTRAS['code-friendly'] = None
         if self.settings.get("wiki_tables"):
             EvernoteDo.MD_EXTRAS['wiki-tables'] = None
+        if self.settings.get("smarty_pants"):
+            EvernoteDo.MD_EXTRAS['smarty-pants'] = None
         css = self.settings.get("inline_css")
         if css is not None:
             for tag in css:

From ee0fbc2da40c4bd2973cd510ed411fa74e79f80d Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Fri, 23 Jan 2015 00:58:14 +0000
Subject: [PATCH 07/52] If only one results of search, open it directly
 skipping panel (solves #65)

---
 sublime_evernote.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sublime_evernote.py b/sublime_evernote.py
index 34a082d..cccfe4c 100644
--- a/sublime_evernote.py
+++ b/sublime_evernote.py
@@ -646,6 +646,11 @@ def on_note(i):
                     return
                 self.message('Retrieving note "%s"...' % notes[i].title)
                 self.open_note(notes[i].guid, **kwargs)
+
+            if len(notes) == 1:
+                on_note(0)
+                return
+
             if show_notebook:
                 menu = ["[%s] » %s" % (self.notebook_from_guid(note.notebookGuid).name, note.title) for note in notes]
                 # menu = [[note.title, self.notebook_from_guid(note.notebookGuid).name] for note in notes]

From a285a5f38e8ea9a1e592b768e074b2b6f114e01b Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Wed, 7 Jan 2015 09:41:57 +0000
Subject: [PATCH 08/52] Track edits and ask user what to do on close

---
 sublime_evernote.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/sublime_evernote.py b/sublime_evernote.py
index 34a082d..6c6f46c 100644
--- a/sublime_evernote.py
+++ b/sublime_evernote.py
@@ -594,6 +594,7 @@ def __update_note():
                 self.view.settings().set("$evernote", True)
                 self.view.settings().set("$evernote_guid", cnote.guid)
                 self.view.settings().set("$evernote_title", cnote.title)
+                self.view.settings().set("$evernote_modified", False)
                 self.message("Successfully updated note: guid:%s" % cnote.guid)
                 self.update_status_info(cnote)
             except Exception as e:
@@ -1097,6 +1098,25 @@ def on_post_save(self, view):
         if self.settings.get('update_on_save'):
             view.run_command("save_evernote_note")
 
+    def on_modified(self, view):
+        if view.settings().get("$evernote"):
+            view.settings().set("$evernote_modified", True)
+
+    def on_pre_close(self, view):
+        if view.settings().get("$evernote") and view.settings().get("$evernote_modified"):
+            # There is no API to cancel the closing of a view
+            # so we let Sublime close it but clone it first and then ask the user.
+            choices = ["Close and discard changes", "Save to Evernote and close"]
+            view.window().run_command("clone_file")
+            cloned = view.window().active_view()
+            def on_choice(i):
+                if i == 1:
+                    cloned.run_command("save_evernote_note")
+                if i >= 0:
+                    cloned.settings().set("$evernote_modified", False)
+                    cloned.close()
+            cloned.window().show_quick_panel(choices, on_choice)
+
     def on_query_context(self, view, key, operator, operand, match_all):
         if key != "evernote_note":
             return None

From 12399170158d8e353ff9b9db255d8a38c56c5860 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Fri, 23 Jan 2015 02:37:30 +0000
Subject: [PATCH 09/52] Better query context listener (added
 `evernote_has_guid`)

---
 sublime_evernote.py | 19 +++++++++++--------
 1 file changed, 11 insertions(+), 8 deletions(-)

diff --git a/sublime_evernote.py b/sublime_evernote.py
index cccfe4c..711a439 100644
--- a/sublime_evernote.py
+++ b/sublime_evernote.py
@@ -1103,14 +1103,17 @@ def on_post_save(self, view):
             view.run_command("save_evernote_note")
 
     def on_query_context(self, view, key, operator, operand, match_all):
-        if key != "evernote_note":
-            return None
-
-        res = view.settings().get("$evernote", False)
-        if (operator == sublime.OP_NOT_EQUAL) ^ (not operand):
-            res = not res
-
-        return res
+        if key == "evernote_note":
+            res = view.settings().get("$evernote", False)
+            if (operator == sublime.OP_NOT_EQUAL) ^ (not operand):
+                res = not res
+            return res
+        elif key == "evernote_has_guid":
+            res = bool(view.settings().get("$evernote_guid"))
+            if (operator == sublime.OP_NOT_EQUAL) ^ (not operand):
+                res = not res
+            return res
+        return None
 
     first_time = True
 

From fdd5e5049ada7ff28e78b91848354e4c655166dd Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Fri, 23 Jan 2015 03:07:45 +0000
Subject: [PATCH 10/52] Make send, save and load note run on separate thread

---
 sublime_evernote.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/sublime_evernote.py b/sublime_evernote.py
index 711a439..9ac57d4 100644
--- a/sublime_evernote.py
+++ b/sublime_evernote.py
@@ -543,6 +543,9 @@ def on_notebook(notebook):
                 on_cancel()
 
         def __send_note(notebookGuid):
+            sublime.set_timeout_async(lambda: __send_note_async(notebookGuid), 0)
+
+        def __send_note_async(notebookGuid):
             note.notebookGuid = notebookGuid
 
             LOG(note.title)
@@ -600,7 +603,7 @@ def __update_note():
                 if sublime.ok_cancel_dialog('Evernote complained:\n\n%s\n\nRetry?' % explain_error(e)):
                     self.connect(self.__update_note)
 
-        __update_note()
+        sublime.set_timeout_async(__update_note, 0)
 
     def is_enabled(self):
         if self.view.settings().get("$evernote_guid", False):
@@ -698,6 +701,9 @@ def find_notes(self, search_args, max_notes=None):
             NoteStore.NotesMetadataResultSpec(includeTitle=True, includeNotebookGuid=True)).notes
 
     def open_note(self, guid, convert=True, **unk_args):
+        sublime.set_timeout_async(lambda: self.do_open_note(guid, convert, **unk_args),0)
+
+    def do_open_note(self, guid, convert=True, **unk_args):
         try:
             noteStore = self.get_note_store()
             note = noteStore.getNote(self.token(), guid, True, False, False, False)

From aac69d0d15ee6f68980e82615dfc01b1a19c0881 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Fri, 23 Jan 2015 12:26:11 +0000
Subject: [PATCH 11/52] Readme: acknowledge donor

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index c5bf4e2..f7bfc3a 100644
--- a/README.md
+++ b/README.md
@@ -262,6 +262,8 @@ The plugin has been made possible by the contribution of several people:
 
 If you think your name should be here, let us know!
 
+Also thanks to first donor, Matthew Baltrusitis! 
+
 Libraries (some adapted to work with Evernote formats):
 
  * Markdown2 converter: [trentm](https://github.com/trentm/python-markdown2/)

From 4314534613c397df729b8bc376c1ba4018fa9055 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Fri, 23 Jan 2015 15:42:40 +0000
Subject: [PATCH 12/52] Revert "Add setting for smarty_pants Markdown extra"
 This is due to conflict with `<en-media>` tags where attributes quote would
 get replaced with smart quotes making the markup invalid.

This reverts commit 936e1a9d3991d08164d39e30e32126bf8e837c24.
---
 README.md           | 1 -
 sublime_evernote.py | 2 --
 2 files changed, 3 deletions(-)

diff --git a/README.md b/README.md
index f7bfc3a..d5629bc 100644
--- a/README.md
+++ b/README.md
@@ -224,7 +224,6 @@ Setting                   | Purpose
 `inline_css`              | a dictionary associating some HTML element names to inline CSS styles; currently the only elements that can be styled in this way are: `pre`, `code`, `h1`, `hr`, `blockquote` and `sup`. Additionally `footnotes` can be associated to some style for the `div` containing the footnotes at the end of the note. The markdown of a note can contain (almost) arbitrary HTML blocks *but* Evernote only accepts a subset of the elements and attributes (`class` and `id` are disallowed). See [here](http://dev.evernote.com/doc/articles/enml.php) for details.
 `code_highlighting_style` | a pygments style among `autumn`, `default`, `github`, `monokai`, `perldoc`, `vim`, `borland`, `emacs`, `igor`, `murphy`, `rrt`, `vs`,   `bw`, `friendly`, `native`, `tango`, `xcode`,   `colorful`, `fruity`, `manni`, `pastie`, `trac`.
 `code_friendly`           | if `true` the `code-friendly` extra of markdown2 is enabled
-`smarty_pants`            | if `true` the `smarty-pants` extra of markdown2 is enabled
 `evernote_autocomplete`   | when this setting is true, suggestions will be offered for autocompletion of the `notebook` and `tags` fields in metadata. Default is true.
 `notes_order`             | how to sort the notes in the panels; possible values: `created`, `updated`, `relevance`, `update_sequence_number`, `title`. Set the `notes_order_ascending` setting to `true` to reverse the selected order.
 `max_notes`               | maximum number of notes in a panel; default is 100.
diff --git a/sublime_evernote.py b/sublime_evernote.py
index 711a439..2a2be22 100644
--- a/sublime_evernote.py
+++ b/sublime_evernote.py
@@ -239,8 +239,6 @@ def load_settings(self):
             EvernoteDo.MD_EXTRAS['code-friendly'] = None
         if self.settings.get("wiki_tables"):
             EvernoteDo.MD_EXTRAS['wiki-tables'] = None
-        if self.settings.get("smarty_pants"):
-            EvernoteDo.MD_EXTRAS['smarty-pants'] = None
         css = self.settings.get("inline_css")
         if css is not None:
             for tag in css:

From 4313095bc8180edfc24e1145e70c80d29b45bede Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Fri, 23 Jan 2015 16:23:05 +0000
Subject: [PATCH 13/52] Introduce `async_do` and make most operations
 asyncronous

---
 sublime_evernote.py | 94 +++++++++++++++++++++++++++++----------------
 1 file changed, 61 insertions(+), 33 deletions(-)

diff --git a/sublime_evernote.py b/sublime_evernote.py
index 9ac57d4..a2bb120 100644
--- a/sublime_evernote.py
+++ b/sublime_evernote.py
@@ -195,6 +195,30 @@ def explain_error(err):
         return 'Evernote plugin error, please contact developer at\n'\
                'https://github.com/bordaigorl/sublime-evernote/issues'
 
+def async_do(f, progress_msg="Evernote operation", done_msg=None):
+    if not done_msg:
+        done_msg = progress_msg + ': ' + "done!"
+    status = {'done': False, 'i': 0}
+    def do_stuff(s):
+        try:
+            f()
+        except:
+            raise
+        finally:
+            s['done'] = True
+
+    def progress(s):
+        if s['done']:
+            sublime.status_message(done_msg)
+        else:
+            i = s['i']
+            bar = "... [%s=%s]" % (' '*i, ' '*(7-i))
+            sublime.status_message(progress_msg + bar)
+            s['i'] = (i + 1) % 8
+            sublime.set_timeout(lambda: progress(s), 100)
+
+    sublime.set_timeout(lambda: progress(status), 0)
+    sublime.set_timeout_async(lambda: do_stuff(status), 0)
 
 class EvernoteDo():
 
@@ -543,7 +567,7 @@ def on_notebook(notebook):
                 on_cancel()
 
         def __send_note(notebookGuid):
-            sublime.set_timeout_async(lambda: __send_note_async(notebookGuid), 0)
+            async_do(lambda: __send_note_async(notebookGuid), "Sending note")
 
         def __send_note_async(notebookGuid):
             note.notebookGuid = notebookGuid
@@ -603,7 +627,7 @@ def __update_note():
                 if sublime.ok_cancel_dialog('Evernote complained:\n\n%s\n\nRetry?' % explain_error(e)):
                     self.connect(self.__update_note)
 
-        sublime.set_timeout_async(__update_note, 0)
+        async_do(__update_note, "Updating note")
 
     def is_enabled(self):
         if self.view.settings().get("$evernote_guid", False):
@@ -666,12 +690,12 @@ def on_notebook(notebook):
                 return
             search_args['notebookGuid'] = notebooks[notebook].guid
             notes = self.find_notes(search_args, max_notes)
-            sublime.set_timeout(lambda: notes_panel(notes), 0)
+            async_do(lambda: notes_panel(notes), "Fetching notes list")
 
         def do_search(query):
             self.message("Searching notes...")
             search_args['words'] = query
-            notes_panel(self.find_notes(search_args, max_notes), True)
+            async_do(lambda: notes_panel(self.find_notes(search_args, max_notes), True), "Fetching notes list")
 
         if note_guid:
             self.open_note(note_guid, **kwargs)
@@ -701,7 +725,7 @@ def find_notes(self, search_args, max_notes=None):
             NoteStore.NotesMetadataResultSpec(includeTitle=True, includeNotebookGuid=True)).notes
 
     def open_note(self, guid, convert=True, **unk_args):
-        sublime.set_timeout_async(lambda: self.do_open_note(guid, convert, **unk_args),0)
+        async_do(lambda: self.do_open_note(guid, convert, **unk_args), "Retrieving note")
 
     def do_open_note(self, guid, convert=True, **unk_args):
         try:
@@ -804,8 +828,10 @@ def open_note(self, guid, insert_in_content=True, filename=None, prompt=False, *
                 note.content = content[0:-10] + \
                     '<en-media type="%s" hash="%s"/></en-note>' % (mime, h.hexdigest())
             note.resources = resources
-            noteStore.updateNote(self.token(), note)
-            self.message("Successfully attached to note '%s'" % note.title)
+            def do():
+                noteStore.updateNote(self.token(), note)
+                self.message("Successfully attached to note '%s'" % note.title)
+            async_do(do, "Uploading attachment")
         except Exception as e:
             sublime.error_message(explain_error(e))
 
@@ -950,30 +976,32 @@ def do_run(self, edit, insert_in_content=True, filename=None, prompt=False):
                     explain_error(e))
                 return
 
-            try:
-                guid = self.view.settings().get("$evernote_guid")
-                noteStore = self.get_note_store()
-                note = noteStore.getNote(self.token(), guid, False, False, False, False)
-                mime = mimetypes.guess_type(filename)[0] or "application/octet-stream"
-                h = hashlib.md5(filecontents)
-                attachment = Types.Resource(
-                    # noteGuid=guid,
-                    mime=mime,
-                    data=Types.Data(body=filecontents, size=len(filecontents), bodyHash=h.digest()),
-                    attributes=Types.ResourceAttributes(attachment=not insert_in_content, **attr))
-                resources = note.resources or []
-                resources.append(attachment)
-                note.resources = resources
-                self.message("Uploading attachment...")
-                noteStore.updateNote(self.token(), note)
-                if insert_in_content:
-                    view.insert(edit, view.sel()[0].a,
-                                '<en-media type="%s" hash="%s"/>' % (mime, h.hexdigest()))
-                    sublime.set_timeout(lambda: view.run_command("save_evernote_note"), 10)
-            except Exception as e:
-                sublime.error_message(
-                    "Evernote plugin cannot insert the attachment.\n" +
-                    explain_error(e))
+            def upload_async():
+                try:
+                    guid = self.view.settings().get("$evernote_guid")
+                    noteStore = self.get_note_store()
+                    note = noteStore.getNote(self.token(), guid, False, False, False, False)
+                    mime = mimetypes.guess_type(filename)[0] or "application/octet-stream"
+                    h = hashlib.md5(filecontents)
+                    attachment = Types.Resource(
+                        # noteGuid=guid,
+                        mime=mime,
+                        data=Types.Data(body=filecontents, size=len(filecontents), bodyHash=h.digest()),
+                        attributes=Types.ResourceAttributes(attachment=not insert_in_content, **attr))
+                    resources = note.resources or []
+                    resources.append(attachment)
+                    note.resources = resources
+                    noteStore.updateNote(self.token(), note)
+                    if insert_in_content:
+                        tag = '<en-media type="%s" hash="%s"/>' % (mime, h.hexdigest())
+                        view.run_command('insert', {'characters': tag})
+                        sublime.set_timeout(lambda: view.run_command("save_evernote_note"), 10)
+                except Exception as e:
+                    sublime.error_message(
+                        "Evernote plugin cannot insert the attachment.\n" +
+                        explain_error(e))
+
+            async_do(upload_async, "Uploading attachment")
 
         def is_enabled(self):
             if self.view.settings().get("$evernote_guid", False):
@@ -1008,9 +1036,9 @@ def do_run(self, edit, filename=None, prompt=False):
                     for r in resources]
 
             def on_done(i):
-                sublime.set_timeout_async(lambda: on_done2(i), 10)
+                async_do(lambda: on_done_async(i), "Fetching Attachment")
 
-            def on_done2(i):
+            def on_done_async(i):
                 if i >= 0:
                     import tempfile, mimetypes
                     try:

From 6bb5dbfbe6cc7b16338d531338ca8179534a424d Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Fri, 23 Jan 2015 17:36:07 +0000
Subject: [PATCH 14/52] Better bookeeping of `$evernote_modified`

---
 sublime_evernote.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sublime_evernote.py b/sublime_evernote.py
index 6c6f46c..a39516d 100644
--- a/sublime_evernote.py
+++ b/sublime_evernote.py
@@ -737,6 +737,7 @@ def open_note(self, guid, convert=True, **unk_args):
             newview.show(0)
             self.message('Note "%s" opened!' % note.title)
             self.update_status_info(note, newview)
+            newview.settings().set("$evernote_modified", False)
         except Exception as e:
             sublime.error_message(explain_error(e))
 
@@ -1103,7 +1104,7 @@ def on_modified(self, view):
             view.settings().set("$evernote_modified", True)
 
     def on_pre_close(self, view):
-        if view.settings().get("$evernote") and view.settings().get("$evernote_modified"):
+        if view and view.settings().get("$evernote") and view.settings().get("$evernote_modified"):
             # There is no API to cancel the closing of a view
             # so we let Sublime close it but clone it first and then ask the user.
             choices = ["Close and discard changes", "Save to Evernote and close"]

From 827ce9f7b2991ee51950ee09550a1b4673f686f4 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Sun, 25 Jan 2015 13:06:54 +0000
Subject: [PATCH 15/52] Set syntax before appending context in open note to
 avoid FOUC

---
 sublime_evernote.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sublime_evernote.py b/sublime_evernote.py
index 2a2be22..a151b7b 100644
--- a/sublime_evernote.py
+++ b/sublime_evernote.py
@@ -730,12 +730,13 @@ def open_note(self, guid, convert=True, **unk_args):
                 newview.settings().set("$evernote", True)
                 newview.settings().set("$evernote_guid", note.guid)
                 newview.settings().set("$evernote_title", note.title)
-                append_to_view(newview, meta+mdtxt)
                 syntax = self.md_syntax
+                note_contents = meta+mdtxt
             else:
                 syntax = find_syntax("XML")
-                append_to_view(newview, note.content)
+                note_contents = note.content
             newview.set_syntax_file(syntax)
+            append_to_view(newview, note_contents)
             newview.show(0)
             self.message('Note "%s" opened!' % note.title)
             self.update_status_info(note, newview)

From 21bf8cfde42d7390af641fab79678e7c803998db Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Sun, 25 Jan 2015 13:11:10 +0000
Subject: [PATCH 16/52] Check cloned view has been created

---
 sublime_evernote.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sublime_evernote.py b/sublime_evernote.py
index a39516d..d48b0e8 100644
--- a/sublime_evernote.py
+++ b/sublime_evernote.py
@@ -1110,6 +1110,8 @@ def on_pre_close(self, view):
             choices = ["Close and discard changes", "Save to Evernote and close"]
             view.window().run_command("clone_file")
             cloned = view.window().active_view()
+            if not cloned:
+                return
             def on_choice(i):
                 if i == 1:
                     cloned.run_command("save_evernote_note")

From 51bb25fecf1b380d2c53d27119c485fe53365473 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Sun, 25 Jan 2015 16:01:12 +0000
Subject: [PATCH 17/52] Adding version

---
 sublime_evernote.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/sublime_evernote.py b/sublime_evernote.py
index a151b7b..2cdb9d7 100644
--- a/sublime_evernote.py
+++ b/sublime_evernote.py
@@ -36,7 +36,8 @@
 
 from base64 import b64encode, b64decode
 
-USER_AGENT = {'User-Agent': 'SublimeEvernote/2.0'}
+EVERNOTE_PLUGIN_VERSION = "2.6"
+USER_AGENT = {'User-Agent': 'SublimeEvernote/' + EVERNOTE_PLUGIN_VERSION}
 
 EVERNOTE_SETTINGS = "Evernote.sublime-settings"
 SUBLIME_EVERNOTE_COMMENT_BEG = "<!-- Sublime:"

From 09b7c123c2b92a57da8cb5f63bf8b847caaba379 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Sun, 25 Jan 2015 16:47:02 +0000
Subject: [PATCH 18/52] Better error reporting

---
 sublime_evernote.py | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/sublime_evernote.py b/sublime_evernote.py
index 2cdb9d7..2cb3d03 100644
--- a/sublime_evernote.py
+++ b/sublime_evernote.py
@@ -156,7 +156,7 @@ def err_reason(err):
 
 def explain_error(err):
     if isinstance(err, EDAMUserException):
-        print("Evernote error: [%s] %s" % (errcode2name(err), err.parameter))
+        printError("Evernote error: [%s]\n\t%s" % (errcode2name(err), err.parameter))
         if err.errorCode in error_groups["contents"][1]:
             explanation = "The contents of the note are not valid.\n"
             msg = err.parameter.split('"')
@@ -182,20 +182,35 @@ def explain_error(err):
         else:
             return err_reason(err)
     elif isinstance(err, EDAMSystemException):
-        print("Evernote error: [%s] %s" % (errcode2name(err), err.message))
+        printError("Evernote error: [%s]\n\t%s" % (errcode2name(err), err.message))
         return "Evernote cannot perform the requested action:\n" + err_reason(err)
     elif isinstance(err, EDAMNotFoundException):
-        print("Evernote error: [%s = %s] Not found" % (err.identifier, err.key))
+        printError("Evernote error: [%s = %s]\n\tNot found" % (err.identifier, err.key))
         return "Cannot find %s" % err.identifier.split('.', 1)[0]
     elif isinstance(err, gaierror):
-        print("Evernote error: [socket] %s" % str(err))
+        printError("Evernote error: [socket]\n\t%s" % str(err))
         return 'The Evernote services seem unreachable.\n'\
                'Please check your connection and retry.'
     else:
-        print("Evernote plugin error: %s" % str(err))
-        return 'Evernote plugin error, please contact developer at\n'\
+        printError("Evernote plugin error: %s" % str(err))
+        return 'Evernote plugin error, please see the console for more details.\nThen contact developer at\n'\
                'https://github.com/bordaigorl/sublime-evernote/issues'
 
+def printError(msg):
+    print(msg)
+    last_cmd, last_args, _ = sublime.active_window().active_view().command_history(-1)
+    print("\tLast command: %s %s" % (last_cmd, last_args or {}))
+    print("\tBEFORE SUBMITTING AN ISSUE (https://github.com/bordaigorl/sublime-evernote/issues):")
+    print("\t  1. Enable the `debug` setting in your Evernote.sublime-settings file and try again. If the problem persists take a note of the output in the console.\n\t     Make sure you delete personal information (e.g. Developer Token) from the output before posting it in an issue.")
+    print("\t  2. Check the wiki at https://github.com/bordaigorl/sublime-evernote/wiki")
+    print("\t  3. Search for similar issues at https://github.com/bordaigorl/sublime-evernote/issues?q=is%3Aissue")
+    print("\t(Evernote plugin v%s, ST %s, Python %s, %s %s%s)" % (
+        EVERNOTE_PLUGIN_VERSION,
+        sublime.version(),
+        "%s.%s.%s" % sys.version_info[:3],
+        sublime.platform(),
+        sublime.arch(),
+        ', debug' if DEBUG else '' ))
 
 class EvernoteDo():
 

From f644de85ca46ca0cea9f28206f4887bdb682cad2 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Sun, 25 Jan 2015 18:00:02 +0000
Subject: [PATCH 19/52] Update Todo

---
 TODO.md | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/TODO.md b/TODO.md
index 4c1866c..18cd7cb 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,3 +1,20 @@
+# Release Checklist
+
+ * update `EVERNOTE_PLUGIN_VERSION`
+ * check `DEBUG` is `False`
+ * update Changelog in Readme
+ * update Contributors in Readme if needed
+ * update wiki if needed
+ * add release on GitHub with release notes from Readme
+
+# Documentation
+
+ * Known bugs in wiki:
+     - paragraphs and spacing #71, #67
+     - proxy
+ * More notes on issues in Readme
+ * See [issues with `needs-docs` label](https://github.com/bordaigorl/sublime-evernote/labels/needs-docs)
+
 # Under consideration
 
 Define a unified restricted format for metadata:

From 5395fede6ba0c7cdb8234ad54e162ec7ed460423 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Sun, 25 Jan 2015 18:13:00 +0000
Subject: [PATCH 20/52] Do not re-raise exceptions in async_do

---
 sublime_evernote.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sublime_evernote.py b/sublime_evernote.py
index a2bb120..05c1070 100644
--- a/sublime_evernote.py
+++ b/sublime_evernote.py
@@ -203,7 +203,7 @@ def do_stuff(s):
         try:
             f()
         except:
-            raise
+            pass
         finally:
             s['done'] = True
 

From d5ea448a7486abb6102763e64031fdf6881285c4 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Wed, 28 Jan 2015 22:43:47 +0000
Subject: [PATCH 21/52] Readme: donation plea

---
 README.md | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index d5629bc..578be7d 100644
--- a/README.md
+++ b/README.md
@@ -7,6 +7,8 @@ This package is based on [SublimeEvernote](https://github.com/jamiesun/SublimeEv
 
 To start using it install it from Package Control and type "Evernote" on the Command Pallette (<kbd>ctrl+shift+p</kbd>). See [First Use](#first-use) for linking the plugin to your account.
 
+If you like this plugin and would like to support its development please consider donating through a [paypal donation](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JFWLSUZYXUHAQ) or using [gratipay].
+
 # Main Features
 
  * **Send a note to Evernote:** converts the markdown document in the current view into rich text and sends it to your Evernote. You will be able to choose a title, tags and the notebook where to store it.
@@ -237,7 +239,7 @@ Setting                   | Purpose
 
 The current maintainer is [bordaigorl].
 
-If you like this plugin and would like to support its development please consider donating through a [paypal donation](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JFWLSUZYXUHAQ) or using [gittip](https://www.gittip.com/bordaigorl/).
+If you like this plugin and would like to support its development please consider donating through a [paypal donation](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JFWLSUZYXUHAQ) or using [gratipay].
 
 If you would like to contribute, please see [CONTRIBUTING].
 
@@ -261,7 +263,7 @@ The plugin has been made possible by the contribution of several people:
 
 If you think your name should be here, let us know!
 
-Also thanks to first donor, Matthew Baltrusitis! 
+Also thanks to our first donor, Matthew Baltrusitis! 
 
 Libraries (some adapted to work with Evernote formats):
 
@@ -272,4 +274,5 @@ Libraries (some adapted to work with Evernote formats):
 
 [CONTRIBUTING]: <CONTRIBUTING.md>
 [wiki]: <https://github.com/bordaigorl/sublime-evernote/wiki/>
-[bordaigorl]: <https://github.com/bordaigorl>
\ No newline at end of file
+[bordaigorl]: <https://github.com/bordaigorl>
+[gratipay]: <https://gratipay.com/bordaigorl/>
\ No newline at end of file

From 20ef427357dc7716344ed085a133380c7f815654 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Thu, 29 Jan 2015 10:33:08 +0000
Subject: [PATCH 22/52] Avoid opening new view before conversion to Markdown

---
 sublime_evernote.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/sublime_evernote.py b/sublime_evernote.py
index 2cb3d03..0355c63 100644
--- a/sublime_evernote.py
+++ b/sublime_evernote.py
@@ -716,8 +716,6 @@ def open_note(self, guid, convert=True, **unk_args):
             noteStore = self.get_note_store()
             note = noteStore.getNote(self.token(), guid, True, False, False, False)
             nb_name = self.notebook_from_guid(note.notebookGuid).name
-            newview = self.window.new_file()
-            newview.set_scratch(True)
             LOG(note.content)
             LOG(note.guid)
             if convert:
@@ -743,15 +741,18 @@ def open_note(self, guid, convert=True, **unk_args):
                     except Exception as e:
                         mdtxt = note.content
                         LOG("Conversion failed", e)
+                newview = self.window.new_file()
                 newview.settings().set("$evernote", True)
                 newview.settings().set("$evernote_guid", note.guid)
                 newview.settings().set("$evernote_title", note.title)
                 syntax = self.md_syntax
                 note_contents = meta+mdtxt
             else:
+                newview = self.window.new_file()
                 syntax = find_syntax("XML")
                 note_contents = note.content
             newview.set_syntax_file(syntax)
+            newview.set_scratch(True)
             append_to_view(newview, note_contents)
             newview.show(0)
             self.message('Note "%s" opened!' % note.title)

From ea7c80c3ef30baed35856b44de5fdd3e5b11eac6 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Thu, 29 Jan 2015 10:34:06 +0000
Subject: [PATCH 23/52] Detect ssl: Package Control 3 adds support for it in
 ST3!

---
 sublime_evernote.py | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/sublime_evernote.py b/sublime_evernote.py
index 0355c63..b76222a 100644
--- a/sublime_evernote.py
+++ b/sublime_evernote.py
@@ -4,6 +4,11 @@
 import json
 import re
 
+try:
+    import ssl
+except:
+    ssl = None
+
 if sys.version_info < (3, 3):
     raise RuntimeError('The Evernote plugin works with Sublime Text 3 only')
 
@@ -283,7 +288,8 @@ def connect(self, callback, **kwargs):
         self.message("initializing..., please wait...")
 
         def __connect(token, noteStoreUrl):
-            if noteStoreUrl.startswith("https://"):
+            if noteStoreUrl.startswith("https://") and not ssl:
+                LOG("Not using SSL")
                 noteStoreUrl = "http://" + noteStoreUrl[8:]
             self.settings.set("token", token)
             self.settings.set("noteStoreUrl", noteStoreUrl)
@@ -292,7 +298,11 @@ def __connect(token, noteStoreUrl):
 
         def __derive_note_store_url(token):
             id = self.get_shard_id(token)
-            url = "http://www.evernote.com/shard/" + id + "/notestore"
+            url = "www.evernote.com/shard/" + id + "/notestore"
+            if ssl:
+                url = "https://" + url
+            else:
+                url = "http://" + url
             return url
 
         def on_token(token):

From dba0b90493a7c4bbb42dae0611556bbef48a786a Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Wed, 4 Feb 2015 10:11:39 +0000
Subject: [PATCH 24/52] html2text: make default marks for emphasis and list
 items global settings

---
 lib/html2text.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/lib/html2text.py b/lib/html2text.py
index 33bcaf8..3906a0d 100644
--- a/lib/html2text.py
+++ b/lib/html2text.py
@@ -65,6 +65,10 @@ def has_key(x, y):
 IGNORE_IMAGES = False
 IGNORE_EMPHASIS = False
 
+UL_ITEM_MARK = '*'
+EMPHASIS_MARK = '_'
+STRONG_MARK = '**'
+
 ### Entity Nonsense ###
 
 def name2cp(k):
@@ -207,9 +211,9 @@ def __init__(self, out=None, baseurl=''):
         self.ignore_images = IGNORE_IMAGES
         self.ignore_emphasis = IGNORE_EMPHASIS
         self.google_doc = False
-        self.ul_item_mark = '*'
-        self.emphasis_mark = '_'
-        self.strong_mark = '**'
+        self.ul_item_mark = UL_ITEM_MARK
+        self.emphasis_mark = EMPHASIS_MARK
+        self.strong_mark = STRONG_MARK
 
         if out is None:
             self.out = self.outtextf

From 5e11022aafb0f3ffe3a74de0a29474fdb22b1d2e Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Wed, 4 Feb 2015 10:18:57 +0000
Subject: [PATCH 25/52] Introduce settings `emphasis_mark`, `item_mark` and
 `strong_mark`

---
 sublime_evernote.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/sublime_evernote.py b/sublime_evernote.py
index b76222a..809add8 100644
--- a/sublime_evernote.py
+++ b/sublime_evernote.py
@@ -258,6 +258,9 @@ def load_settings(self):
             EvernoteDo.MD_EXTRAS['fenced-code-blocks']['style'] = pygm_style
         if self.settings.get("code_friendly"):
             EvernoteDo.MD_EXTRAS['code-friendly'] = None
+            html2text.EMPHASIS_MARK = "*"
+        else:
+            html2text.EMPHASIS_MARK = self.settings.get('emphasis_mark', html2text.EMPHASIS_MARK)
         if self.settings.get("wiki_tables"):
             EvernoteDo.MD_EXTRAS['wiki-tables'] = None
         css = self.settings.get("inline_css")
@@ -270,6 +273,8 @@ def load_settings(self):
         self.md_syntax = self.settings.get("md_syntax")
         if not self.md_syntax:
             self.md_syntax = find_syntax("Evernote")
+        html2text.UL_ITEM_MARK = self.settings.get('item_mark', html2text.UL_ITEM_MARK)
+        html2text.STRONG_MARK = self.settings.get('strong_mark', html2text.STRONG_MARK)
 
     def message(self, msg):
         sublime.status_message(msg)

From 1f74d9736f6b53e4975223f809bce04c36822e39 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Wed, 4 Feb 2015 10:47:44 +0000
Subject: [PATCH 26/52] markdown2: incorporate changes from version 2.3

---
 lib/markdown2.py | 83 ++++++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 80 insertions(+), 3 deletions(-)

diff --git a/lib/markdown2.py b/lib/markdown2.py
index c293949..e435107 100644
--- a/lib/markdown2.py
+++ b/lib/markdown2.py
@@ -73,6 +73,9 @@
 * toc: The returned HTML string gets a new "toc_html" attribute which is
   a Table of Contents for the document. (experimental)
 * xml: Passes one-liner processing instructions and namespaced XML tags.
+* tables: Tables using the same format as GFM
+  <https://help.github.com/articles/github-flavored-markdown#tables> and
+  PHP-Markdown Extra <https://michelf.ca/projects/php-markdown/extra/#table>.
 * wiki-tables: Google Code Wiki-style tables. See
   <http://code.google.com/p/support/wiki/WikiSyntax#Tables>.
 """
@@ -82,13 +85,13 @@
 #   not yet sure if there implications with this. Compare 'pydoc sre'
 #   and 'perldoc perlre'.
 
-__version_info__ = (2, 2, 1)
+__version_info__ = (2, 3, 0)
 __version__ = '.'.join(map(str, __version_info__))
 __author__ = "Trent Mick"
 
 import os
 import sys
-from pprint import pprint
+from pprint import pprint, pformat
 import re
 import logging
 try:
@@ -308,7 +311,7 @@ def convert(self, text):
 
         text = self.preprocess(text)
 
-        if "fenced-code-blocks" in self.extras:
+        if "fenced-code-blocks" in self.extras and not self.safe_mode:
             text = self._do_fenced_code_blocks(text)
 
         if self.safe_mode:
@@ -317,6 +320,9 @@ def convert(self, text):
         # Turn block-level HTML blocks into hash entries
         text = self._hash_html_blocks(text, raw=True)
 
+        if "fenced-code-blocks" in self.extras and self.safe_mode:
+            text = self._do_fenced_code_blocks(text)
+
         # Strip link definitions, store in hashes.
         if "footnotes" in self.extras:
             # Must do footnotes first because an unlucky footnote defn
@@ -816,6 +822,8 @@ def _run_block_gamut(self, text):
             text = self._prepare_pyshell_blocks(text)
         if "wiki-tables" in self.extras:
             text = self._do_wiki_tables(text)
+        if "tables" in self.extras:
+            text = self._do_tables(text)
 
         text = self._do_code_blocks(text)
 
@@ -856,6 +864,75 @@ def _prepare_pyshell_blocks(self, text):
 
         return _pyshell_block_re.sub(self._pyshell_block_sub, text)
 
+    def _table_sub(self, match):
+        head, underline, body = match.groups()
+
+        # Determine aligns for columns.
+        cols = [cell.strip() for cell in underline.strip('| \t\n').split('|')]
+        align_from_col_idx = {}
+        for col_idx, col in enumerate(cols):
+            if col[0] == ':' and col[-1] == ':':
+                align_from_col_idx[col_idx] = ' align="center"'
+            elif col[0] == ':':
+                align_from_col_idx[col_idx] = ' align="left"'
+            elif col[-1] == ':':
+                align_from_col_idx[col_idx] = ' align="right"'
+
+        # thead
+        hlines = ['<table>', '<thead>', '<tr>']
+        cols = [cell.strip() for cell in head.strip('| \t\n').split('|')]
+        for col_idx, col in enumerate(cols):
+            hlines.append('  <th%s>%s</th>' % (
+                align_from_col_idx.get(col_idx, ''),
+                self._run_span_gamut(col)
+            ))
+        hlines.append('</tr>')
+        hlines.append('</thead>')
+
+        # tbody
+        hlines.append('<tbody>')
+        for line in body.strip('\n').split('\n'):
+            hlines.append('<tr>')
+            cols = [cell.strip() for cell in line.strip('| \t\n').split('|')]
+            for col_idx, col in enumerate(cols):
+                hlines.append('  <td%s>%s</td>' % (
+                    align_from_col_idx.get(col_idx, ''),
+                    self._run_span_gamut(col)
+                ))
+            hlines.append('</tr>')
+        hlines.append('</tbody>')
+        hlines.append('</table>')
+
+        return '\n'.join(hlines) + '\n'
+
+    def _do_tables(self, text):
+        """Copying PHP-Markdown and GFM table syntax. Some regex borrowed from
+        https://github.com/michelf/php-markdown/blob/lib/Michelf/Markdown.php#L2538
+        """
+        less_than_tab = self.tab_width - 1
+        table_re = re.compile(r'''
+                (?:(?<=\n\n)|\A\n?)             # leading blank line
+
+                ^[ ]{0,%d}                      # allowed whitespace
+                (.*[|].*)  \n                   # $1: header row (at least one pipe)
+
+                ^[ ]{0,%d}                      # allowed whitespace
+                (                               # $2: underline row
+                    # underline row with leading bar
+                    (?:  \|\ *:?-+:?\ *  )+  \|?  \n
+                    |
+                    # or, underline row without leading bar
+                    (?:  \ *:?-+:?\ *\|  )+  (?:  \ *:?-+:?\ *  )?  \n
+                )
+
+                (                               # $3: data rows
+                    (?:
+                        ^[ ]{0,%d}(?!\ )         # ensure line begins with 0 to less_than_tab spaces
+                        .*\|.*  \n
+                    )+
+                )
+            ''' % (less_than_tab, less_than_tab, less_than_tab), re.M | re.X)
+        return table_re.sub(self._table_sub, text)
     def _wiki_table_sub(self, match):
         ttext = match.group(0).strip()
         #print 'wiki table: %r' % match.group(0)

From 4d80808ca3af4b1991ee69740ebea40afdfd8706 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Wed, 4 Feb 2015 11:09:42 +0000
Subject: [PATCH 27/52] markdown2: adapt table generation to support inline-css
 setting

---
 lib/markdown2.py | 23 +++++++++++++++--------
 1 file changed, 15 insertions(+), 8 deletions(-)

diff --git a/lib/markdown2.py b/lib/markdown2.py
index e435107..9facc10 100644
--- a/lib/markdown2.py
+++ b/lib/markdown2.py
@@ -91,7 +91,6 @@
 
 import os
 import sys
-from pprint import pprint, pformat
 import re
 import logging
 try:
@@ -867,6 +866,13 @@ def _prepare_pyshell_blocks(self, text):
     def _table_sub(self, match):
         head, underline, body = match.groups()
 
+        table_style = self._html_class_str_from_tag("table")
+        td_style =  self._html_class_str_from_tag("td")
+        th_style =  self._html_class_str_from_tag("th")
+        tr_style =  self._html_class_str_from_tag("tr")
+        tr_odd_style =  self._html_class_str_from_tag("tr:odd")
+        tr_even_style =  self._html_class_str_from_tag("tr:even")
+
         # Determine aligns for columns.
         cols = [cell.strip() for cell in underline.strip('| \t\n').split('|')]
         align_from_col_idx = {}
@@ -879,11 +885,12 @@ def _table_sub(self, match):
                 align_from_col_idx[col_idx] = ' align="right"'
 
         # thead
-        hlines = ['<table>', '<thead>', '<tr>']
+        hlines = ['<table%s>' % table_style, '<thead>', '<tr%s>' % tr_style]
         cols = [cell.strip() for cell in head.strip('| \t\n').split('|')]
         for col_idx, col in enumerate(cols):
-            hlines.append('  <th%s>%s</th>' % (
+            hlines.append('  <th%s%s>%s</th>' % (
                 align_from_col_idx.get(col_idx, ''),
+                th_style,
                 self._run_span_gamut(col)
             ))
         hlines.append('</tr>')
@@ -891,12 +898,13 @@ def _table_sub(self, match):
 
         # tbody
         hlines.append('<tbody>')
-        for line in body.strip('\n').split('\n'):
-            hlines.append('<tr>')
+        for i, line in enumerate(body.strip('\n').split('\n')):
+            hlines.append('<tr%s%s>' % (tr_style, tr_even_style if i % 2 else tr_odd_style))
             cols = [cell.strip() for cell in line.strip('| \t\n').split('|')]
             for col_idx, col in enumerate(cols):
-                hlines.append('  <td%s>%s</td>' % (
+                hlines.append('  <td%s%s>%s</td>' % (
                     align_from_col_idx.get(col_idx, ''),
+                    td_style,
                     self._run_span_gamut(col)
                 ))
             hlines.append('</tr>')
@@ -933,15 +941,14 @@ def _do_tables(self, text):
                 )
             ''' % (less_than_tab, less_than_tab, less_than_tab), re.M | re.X)
         return table_re.sub(self._table_sub, text)
+
     def _wiki_table_sub(self, match):
         ttext = match.group(0).strip()
-        #print 'wiki table: %r' % match.group(0)
         rows = []
         for line in ttext.splitlines(0):
             line = line.strip()[2:-2].strip()
             row = [c.strip() for c in re.split(r'(?<!\\)\|\|', line)]
             rows.append(row)
-        #pprint(rows)
         table_style = self._html_class_str_from_tag("table")
         td_style =  self._html_class_str_from_tag("td")
         tr_style =  self._html_class_str_from_tag("tr")

From 48b218e486cd7743c504ce5174c40420302dc8ec Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Wed, 4 Feb 2015 11:44:56 +0000
Subject: [PATCH 28/52] Adding `gfm_tables` setting (true by default)

---
 Evernote.sublime-settings | 1 +
 sublime_evernote.py       | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/Evernote.sublime-settings b/Evernote.sublime-settings
index 31f7368..46cbb9b 100644
--- a/Evernote.sublime-settings
+++ b/Evernote.sublime-settings
@@ -16,6 +16,7 @@
     },
     "code_highlighting_style": "github",
     "code_friendly": true,
+    "gfm_tables": true,
     "notes_order": "updated",
     "evernote_autocomplete": true,
     "sort_notebooks": false,
diff --git a/sublime_evernote.py b/sublime_evernote.py
index 809add8..2deeed9 100644
--- a/sublime_evernote.py
+++ b/sublime_evernote.py
@@ -263,6 +263,8 @@ def load_settings(self):
             html2text.EMPHASIS_MARK = self.settings.get('emphasis_mark', html2text.EMPHASIS_MARK)
         if self.settings.get("wiki_tables"):
             EvernoteDo.MD_EXTRAS['wiki-tables'] = None
+        if self.settings.get("gfm_tables"):
+            EvernoteDo.MD_EXTRAS['tables'] = None
         css = self.settings.get("inline_css")
         if css is not None:
             for tag in css:

From d2fc844fd3c00aefedefbdcd99a2d39bea38bf2f Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Thu, 5 Feb 2015 10:49:09 +0000
Subject: [PATCH 29/52] markdown2: add strikethrough and underline support
 (Evernote style)  * strikethrough: `~~text~~`  * underlined: `==text==`

---
 lib/markdown2.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/lib/markdown2.py b/lib/markdown2.py
index 9facc10..6942e07 100644
--- a/lib/markdown2.py
+++ b/lib/markdown2.py
@@ -1767,6 +1767,8 @@ def _encode_code(self, text):
 
     _strong_re = re.compile(r"(\*\*|__)(?=\S)(.+?[*_]*)(?<=\S)\1", re.S)
     _em_re = re.compile(r"(\*|_)(?=\S)(.+?)(?<=\S)\1", re.S)
+    _strike_re = re.compile(r"~~(?=\S)(.+?)(?<=\S)~~", re.S)
+    _underline_re = re.compile(r"==(?=\S)(.+?)(?<=\S)==", re.S)
     _code_friendly_strong_re = re.compile(r"\*\*(?=\S)(.+?[*_]*)(?<=\S)\*\*", re.S)
     _code_friendly_em_re = re.compile(r"\*(?=\S)(.+?)(?<=\S)\*", re.S)
     def _do_italics_and_bold(self, text):
@@ -1777,6 +1779,9 @@ def _do_italics_and_bold(self, text):
         else:
             text = self._strong_re.sub(r"<strong>\2</strong>", text)
             text = self._em_re.sub(r"<em>\2</em>", text)
+        # text = self._strike_re.sub(r"<del>\1</del>", text)  # GFM way
+        text = self._strike_re.sub(r'<span style="text-decoration: line-through;">\1</span>', text)  # Evernote way
+        text = self._underline_re.sub(r'<span style="text-decoration: underline;">\1</span>', text)  # Evernote way
         return text
 
     # "smarty-pants" extra: Very liberal in interpreting a single prime as an

From beaa39b46d10428fa57ecab8107700816dcd4e98 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Thu, 5 Feb 2015 10:52:29 +0000
Subject: [PATCH 30/52] html2text: add support for strikethrough and underline

---
 lib/html2text.py | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/lib/html2text.py b/lib/html2text.py
index 3906a0d..34dd977 100644
--- a/lib/html2text.py
+++ b/lib/html2text.py
@@ -258,6 +258,7 @@ def __init__(self, out=None, baseurl=''):
         self.abbr_data = None  # last inner HTML (for abbr being defined)
         self.abbr_list = {}  # stack of abbreviations to write later
         self.baseurl = baseurl
+        self.span_stack = []
 
         try: del unifiable_n[name2cp('nbsp')]
         except KeyError: pass
@@ -502,12 +503,40 @@ def handle_tag(self, tag, attrs, start):
 
         if tag in ['em', 'i', 'u'] and not self.ignore_emphasis: self.o(self.emphasis_mark)
         if tag in ['strong', 'b'] and not self.ignore_emphasis: self.o(self.strong_mark)
-        if tag in ['del', 'strike', 's', 'kbd']:
+
+        if tag == 'kbd':
             if start:
                 self.o("<"+tag+">")
             else:
                 self.o("</"+tag+">")
 
+        if tag in ['del', 'strike', 's']:
+            self.o("~~")
+
+        if tag in ['ins', 'u']:
+            self.o("==")
+
+        # evernote strikethrough and underlined
+        if tag == "span":
+            if start:
+                style = attrs.get('style')
+                if style == "text-decoration: line-through;":
+                    self.span_stack.append("strike")
+                    self.o("~~")
+                elif style == "text-decoration: underline;":
+                    self.span_stack.append("underline")
+                    # self.o('<span style="text-decoration: underline;">')
+                    self.o('==')
+                else:
+                    self.span_stack.append(False)
+            else:
+                style = self.span_stack.pop()
+                if style == "strike":
+                    self.o("~~")
+                elif style == "underline":
+                    # self.o('</span>')
+                    self.o('==')
+
         if self.google_doc:
             if not self.inheader:
                 # handle some font attributes, but leave headers clean

From abde35dce34b0d8b3a6a7f913c9edd8106b2c721 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Thu, 5 Feb 2015 10:59:11 +0000
Subject: [PATCH 31/52] GFM tables: add style for header

---
 Evernote.sublime-settings | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Evernote.sublime-settings b/Evernote.sublime-settings
index 46cbb9b..b49df50 100644
--- a/Evernote.sublime-settings
+++ b/Evernote.sublime-settings
@@ -11,6 +11,7 @@
         // ONLY USED IF wiki_tables = true
         "table": "border-collapse: collapse; border-spacing: 0; margin: 1em;",
         "td": "border: 1px solid #DDD; padding: 6px 13px;",
+        "th": "border: 1px solid #DDD; padding: 6px 13px;",
         "tr:odd": "border: 1px solid #DDD; padding: 6px 13px;",
         "tr:even": "border: 1px solid #DDD; padding: 6px 13px; background-color: #F8F8F8;"
     },

From 4d22f866e62c7b4e89c63d83885918edfff0ff7b Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Thu, 5 Feb 2015 17:05:55 +0000
Subject: [PATCH 32/52] markdown2: Generate more readable tags for
 strikethrough and underline, still Evernote compatible

---
 lib/markdown2.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/lib/markdown2.py b/lib/markdown2.py
index 6942e07..b32a86c 100644
--- a/lib/markdown2.py
+++ b/lib/markdown2.py
@@ -1780,8 +1780,10 @@ def _do_italics_and_bold(self, text):
             text = self._strong_re.sub(r"<strong>\2</strong>", text)
             text = self._em_re.sub(r"<em>\2</em>", text)
         # text = self._strike_re.sub(r"<del>\1</del>", text)  # GFM way
-        text = self._strike_re.sub(r'<span style="text-decoration: line-through;">\1</span>', text)  # Evernote way
-        text = self._underline_re.sub(r'<span style="text-decoration: underline;">\1</span>', text)  # Evernote way
+        # text = self._strike_re.sub(r'<span style="text-decoration: line-through;">\1</span>', text)  # Evernote way
+        # text = self._underline_re.sub(r'<span style="text-decoration: underline;">\1</span>', text)  # Evernote way
+        text = self._strike_re.sub(r'<strike>\1</strike>', text)
+        text = self._underline_re.sub(r'<u>\1</u>', text)
         return text
 
     # "smarty-pants" extra: Very liberal in interpreting a single prime as an

From a1f96fd2719459c90294ab59ace33eb1444d4a66 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Thu, 5 Feb 2015 17:12:36 +0000
Subject: [PATCH 33/52] Do not show quick panel if only one notebook

---
 sublime_evernote.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/sublime_evernote.py b/sublime_evernote.py
index 2deeed9..891371a 100644
--- a/sublime_evernote.py
+++ b/sublime_evernote.py
@@ -714,6 +714,8 @@ def do_search(query):
 
         if from_notebook or with_tags:
             notes_panel(self.find_notes(search_args, max_notes), not from_notebook)
+        elif len(notebooks) == 1:
+            on_notebook(0)
         else:
             if self.settings.get("show_stacks", True):
                 menu = ["%s » %s" % (nb.stack, nb.name) if nb.stack else nb.name for nb in notebooks]

From 48cabb75c1c15974e8f3c5f24f6966896042cdfe Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Thu, 5 Feb 2015 22:51:41 +0000
Subject: [PATCH 34/52] Use view.change_count() to detect changes instead of
 using on_modified

---
 sublime_evernote.py | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/sublime_evernote.py b/sublime_evernote.py
index d48b0e8..539b5a3 100644
--- a/sublime_evernote.py
+++ b/sublime_evernote.py
@@ -594,7 +594,7 @@ def __update_note():
                 self.view.settings().set("$evernote", True)
                 self.view.settings().set("$evernote_guid", cnote.guid)
                 self.view.settings().set("$evernote_title", cnote.title)
-                self.view.settings().set("$evernote_modified", False)
+                self.view.settings().set("$evernote_modified", self.view.change_count())
                 self.message("Successfully updated note: guid:%s" % cnote.guid)
                 self.update_status_info(cnote)
             except Exception as e:
@@ -737,7 +737,7 @@ def open_note(self, guid, convert=True, **unk_args):
             newview.show(0)
             self.message('Note "%s" opened!' % note.title)
             self.update_status_info(note, newview)
-            newview.settings().set("$evernote_modified", False)
+            newview.settings().set("$evernote_modified", newview.change_count())
         except Exception as e:
             sublime.error_message(explain_error(e))
 
@@ -1099,12 +1099,8 @@ def on_post_save(self, view):
         if self.settings.get('update_on_save'):
             view.run_command("save_evernote_note")
 
-    def on_modified(self, view):
-        if view.settings().get("$evernote"):
-            view.settings().set("$evernote_modified", True)
-
     def on_pre_close(self, view):
-        if view and view.settings().get("$evernote") and view.settings().get("$evernote_modified"):
+        if view and view.settings().get("$evernote") and view.change_count() > view.settings().get("$evernote_modified"):
             # There is no API to cancel the closing of a view
             # so we let Sublime close it but clone it first and then ask the user.
             choices = ["Close and discard changes", "Save to Evernote and close"]
@@ -1112,12 +1108,14 @@ def on_pre_close(self, view):
             cloned = view.window().active_view()
             if not cloned:
                 return
+
             def on_choice(i):
                 if i == 1:
                     cloned.run_command("save_evernote_note")
                 if i >= 0:
-                    cloned.settings().set("$evernote_modified", False)
+                    cloned.settings().set("$evernote_modified", cloned.change_count())
                     cloned.close()
+
             cloned.window().show_quick_panel(choices, on_choice)
 
     def on_query_context(self, view, key, operator, operand, match_all):

From ab72a2ea71b3fd6be9c779725a9372f99316db85 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Fri, 6 Feb 2015 02:10:05 +0000
Subject: [PATCH 35/52] Allow `by_searching` to be `{"snippet": snippet}` and
 prepopulate prompt Partially addresses #54

---
 sublime_evernote.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sublime_evernote.py b/sublime_evernote.py
index 21e42a7..9cf058e 100644
--- a/sublime_evernote.py
+++ b/sublime_evernote.py
@@ -742,7 +742,9 @@ def do_search(query):
             if isinstance(by_searching, str):
                 do_search(by_searching)
             else:
-                self.window.show_input_panel("Enter search query:", "", do_search, None, None)
+                p = self.window.show_input_panel("Enter search query:", "", do_search, None, None)
+                if isinstance(by_searching, dict):
+                    p.run_command("insert_snippet", {"contents": by_searching.get("snippet", "")})
             return
 
         if from_notebook or with_tags:

From 6795b72ede86fbcec7eaa43938cc34758d16a776 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Fri, 6 Feb 2015 15:04:44 +0000
Subject: [PATCH 36/52] Readme: badges

---
 README.md | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 578be7d..edff9bc 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,15 @@
 Evernote for Sublime Text
 =========================
 
+![release] ![licence] ![stars] ![issues] ![donations]
+
 [Sublime Text](http://www.sublimetext.com/3) plugin for [Evernote](http://www.evernote.com).
 
 This package is based on [SublimeEvernote](https://github.com/jamiesun/SublimeEvernote) for ST2 but is only supported on ST3 and adds many new features.
 
 To start using it install it from Package Control and type "Evernote" on the Command Pallette (<kbd>ctrl+shift+p</kbd>). See [First Use](#first-use) for linking the plugin to your account.
 
-If you like this plugin and would like to support its development please consider donating through a [paypal donation](https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JFWLSUZYXUHAQ) or using [gratipay].
+If you like this plugin and would like to support its development please consider donating through a [paypal donation] or using [gratipay].
 
 # Main Features
 
@@ -275,4 +277,11 @@ Libraries (some adapted to work with Evernote formats):
 [CONTRIBUTING]: <CONTRIBUTING.md>
 [wiki]: <https://github.com/bordaigorl/sublime-evernote/wiki/>
 [bordaigorl]: <https://github.com/bordaigorl>
-[gratipay]: <https://gratipay.com/bordaigorl/>
\ No newline at end of file
+[gratipay]: <https://gratipay.com/bordaigorl/>
+[paypal]: <https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JFWLSUZYXUHAQ>
+
+[release]: https://img.shields.io/github/release/bordaigorl/sublime-evernote.svg
+[licence]: http://img.shields.io/badge/license-MIT-blue.svg?style=flat
+[stars]: https://img.shields.io/github/stars/bordaigorl/sublime-evernote.svg
+[issues]: https://img.shields.io/github/issues/bordaigorl/sublime-evernote.svg
+[donations]: https://img.shields.io/gratipay/bordaigorl.svg

From 14d1952cc37af58d86a4712689ae341f86385d96 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Sun, 8 Feb 2015 12:02:31 +0000
Subject: [PATCH 37/52] Add gitter chat badge

---
 README.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index edff9bc..a8d04c5 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 Evernote for Sublime Text
 =========================
 
-![release] ![licence] ![stars] ![issues] ![donations]
+![release] ![licence] ![stars] ![issues] [![donations]][gratipay] [![chat]][gitter]
 
 [Sublime Text](http://www.sublimetext.com/3) plugin for [Evernote](http://www.evernote.com).
 
@@ -279,9 +279,11 @@ Libraries (some adapted to work with Evernote formats):
 [bordaigorl]: <https://github.com/bordaigorl>
 [gratipay]: <https://gratipay.com/bordaigorl/>
 [paypal]: <https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JFWLSUZYXUHAQ>
+[gitter]: <https://gitter.im/bordaigorl/sublime-evernote>
 
 [release]: https://img.shields.io/github/release/bordaigorl/sublime-evernote.svg
 [licence]: http://img.shields.io/badge/license-MIT-blue.svg?style=flat
 [stars]: https://img.shields.io/github/stars/bordaigorl/sublime-evernote.svg
 [issues]: https://img.shields.io/github/issues/bordaigorl/sublime-evernote.svg
 [donations]: https://img.shields.io/gratipay/bordaigorl.svg
+[chat]: https://img.shields.io/badge/gitter-join%20chat-green.svg

From ca98c9a69b7fa6c1d1893832bf4fa547e79c5fc8 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Sun, 8 Feb 2015 12:53:47 +0000
Subject: [PATCH 38/52] Readme: Better badges

---
 README.md | 27 +++++++++++++++++++--------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/README.md b/README.md
index a8d04c5..e00682a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,13 @@
 Evernote for Sublime Text
 =========================
 
-![release] ![licence] ![stars] ![issues] [![donations]][gratipay] [![chat]][gitter]
+[![release badge]][release]
+[![licence badge]][licence]
+[![stars badge]][stars]
+[![issues badge]][issues]
+[![tips badge]][gratipay]
+[![paypal badge]][paypal]
+[![chat badge]][gitter]
 
 [Sublime Text](http://www.sublimetext.com/3) plugin for [Evernote](http://www.evernote.com).
 
@@ -9,7 +15,7 @@ This package is based on [SublimeEvernote](https://github.com/jamiesun/SublimeEv
 
 To start using it install it from Package Control and type "Evernote" on the Command Pallette (<kbd>ctrl+shift+p</kbd>). See [First Use](#first-use) for linking the plugin to your account.
 
-If you like this plugin and would like to support its development please consider donating through a [paypal donation] or using [gratipay].
+If you like this plugin and would like to support its development please consider donating through a [paypal donation][paypal] or using [gratipay].
 
 # Main Features
 
@@ -280,10 +286,15 @@ Libraries (some adapted to work with Evernote formats):
 [gratipay]: <https://gratipay.com/bordaigorl/>
 [paypal]: <https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JFWLSUZYXUHAQ>
 [gitter]: <https://gitter.im/bordaigorl/sublime-evernote>
+[release]: <https://github.com/bordaigorl/sublime-evernote/releases>
+[licence]: <https://raw.githubusercontent.com/bordaigorl/sublime-evernote/master/LICENSE>
+[stars]: <https://github.com/bordaigorl/sublime-evernote/>
+
+[release badge]: https://img.shields.io/github/release/bordaigorl/sublime-evernote.svg
+[licence badge]: http://img.shields.io/badge/license-MIT-blue.svg?style=flat
+[stars badge]: https://img.shields.io/github/stars/bordaigorl/sublime-evernote.svg
+[issues badge]: https://img.shields.io/github/issues/bordaigorl/sublime-evernote.svg
+[tips badge]: https://img.shields.io/gratipay/bordaigorl.svg
+[chat badge]: https://img.shields.io/badge/gitter-join%20chat-green.svg
+[paypal badge]: https://img.shields.io/badge/paypal-donate-blue.svg
 
-[release]: https://img.shields.io/github/release/bordaigorl/sublime-evernote.svg
-[licence]: http://img.shields.io/badge/license-MIT-blue.svg?style=flat
-[stars]: https://img.shields.io/github/stars/bordaigorl/sublime-evernote.svg
-[issues]: https://img.shields.io/github/issues/bordaigorl/sublime-evernote.svg
-[donations]: https://img.shields.io/gratipay/bordaigorl.svg
-[chat]: https://img.shields.io/badge/gitter-join%20chat-green.svg

From 30ab94f57355bfe538c0abb14126552b0e47ace3 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Sun, 8 Feb 2015 12:54:00 +0000
Subject: [PATCH 39/52] Readme: paragraph on issues

---
 README.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/README.md b/README.md
index e00682a..8052fcb 100644
--- a/README.md
+++ b/README.md
@@ -69,6 +69,19 @@ See [Commands](#commands) and the [wiki] for details.
 The Evernote plugin can be installed using Package Control.
 See the [wiki] for detailed instructions.
 
+# Issues
+
+You may encounter problems in using the plugin.
+Issues can be posted at the [github repository][issues].
+
+Before posting a new issue:
+
+  1. Enable the `debug` setting in your `Evernote.sublime-settings` file and try again.
+  If the problem persists take a note of the output in the console.
+  Make sure you delete personal information (e.g. Developer Token) from the output before posting it in an issue.
+  2. Check the [wiki]
+  3. Search for similar issues [here](https://github.com/bordaigorl/sublime-evernote/issues?q=is%3Aissue)
+
 # Usage
 
 ## First use

From abfe635af958fdbb8b7c833df31503bf0b571a15 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Mon, 16 Feb 2015 01:28:45 +0000
Subject: [PATCH 40/52] Add `warn_on_close` setting

---
 Evernote.sublime-settings | 3 ++-
 sublime_evernote.py       | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/Evernote.sublime-settings b/Evernote.sublime-settings
index b49df50..4cef58b 100644
--- a/Evernote.sublime-settings
+++ b/Evernote.sublime-settings
@@ -21,5 +21,6 @@
     "notes_order": "updated",
     "evernote_autocomplete": true,
     "sort_notebooks": false,
-    "show_stacks": true
+    "show_stacks": true,
+    "warn_on_close": true
 }
\ No newline at end of file
diff --git a/sublime_evernote.py b/sublime_evernote.py
index 9cf058e..e9b2140 100644
--- a/sublime_evernote.py
+++ b/sublime_evernote.py
@@ -1181,7 +1181,9 @@ def on_post_save(self, view):
             view.run_command("save_evernote_note")
 
     def on_pre_close(self, view):
-        if view and view.settings().get("$evernote") and view.change_count() > view.settings().get("$evernote_modified"):
+        if self.settings.get("warn_on_close") and
+           view and view.settings().get("$evernote") and
+           view.change_count() > view.settings().get("$evernote_modified"):
             # There is no API to cancel the closing of a view
             # so we let Sublime close it but clone it first and then ask the user.
             choices = ["Close and discard changes", "Save to Evernote and close"]

From 8299cb98772ba3d67fa2a29ff910a482bbd64828 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Mon, 16 Feb 2015 01:29:05 +0000
Subject: [PATCH 41/52] Add missing defaults to Default Settings

---
 Evernote.sublime-settings | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/Evernote.sublime-settings b/Evernote.sublime-settings
index 4cef58b..54575ee 100644
--- a/Evernote.sublime-settings
+++ b/Evernote.sublime-settings
@@ -18,7 +18,13 @@
     "code_highlighting_style": "github",
     "code_friendly": true,
     "gfm_tables": true,
+    "wiki_tables": false,
+    "emphasis_mark": "_",
+    "strong_mark": "**",
+    "item_mark": "*",
     "notes_order": "updated",
+    "max_notes": 100,
+    "update_on_save": false,
     "evernote_autocomplete": true,
     "sort_notebooks": false,
     "show_stacks": true,

From 70b86cf0385c6701aa43540f0ba0183096504452 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Mon, 16 Feb 2015 01:47:11 +0000
Subject: [PATCH 42/52] Correct syntax error

---
 sublime_evernote.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sublime_evernote.py b/sublime_evernote.py
index e9b2140..46be0ca 100644
--- a/sublime_evernote.py
+++ b/sublime_evernote.py
@@ -1181,8 +1181,8 @@ def on_post_save(self, view):
             view.run_command("save_evernote_note")
 
     def on_pre_close(self, view):
-        if self.settings.get("warn_on_close") and
-           view and view.settings().get("$evernote") and
+        if self.settings.get("warn_on_close") and \
+           view and view.settings().get("$evernote") and \
            view.change_count() > view.settings().get("$evernote_modified"):
             # There is no API to cancel the closing of a view
             # so we let Sublime close it but clone it first and then ask the user.

From 8b965a11204d9362137033289e7dfd2de7b745d1 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Mon, 16 Feb 2015 01:50:00 +0000
Subject: [PATCH 43/52] Readme: document new settings

---
 README.md | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 8052fcb..b396e67 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ Evernote for Sublime Text
 
 [![release badge]][release]
 [![licence badge]][licence]
-[![stars badge]][stars]
+[![stars badge]][repo]
 [![issues badge]][issues]
 [![tips badge]][gratipay]
 [![paypal badge]][paypal]
@@ -248,11 +248,17 @@ Setting                   | Purpose
 `code_highlighting_style` | a pygments style among `autumn`, `default`, `github`, `monokai`, `perldoc`, `vim`, `borland`, `emacs`, `igor`, `murphy`, `rrt`, `vs`,   `bw`, `friendly`, `native`, `tango`, `xcode`,   `colorful`, `fruity`, `manni`, `pastie`, `trac`.
 `code_friendly`           | if `true` the `code-friendly` extra of markdown2 is enabled
 `evernote_autocomplete`   | when this setting is true, suggestions will be offered for autocompletion of the `notebook` and `tags` fields in metadata. Default is true.
+`emphasis_mark`           | when converting from HTML to markdown, use this as emphasis markup. Valid values are `"*"` or `"_"` (default). It is set to `"*"` when `code_friendly` is true.
+`strong_mark`             | when converting from HTML to markdown, use this as emphasis markup. Valid values are `"__"` or `"**"` (default)
+`item_mark`               | when converting from HTML to markdown, use this as unordered list item markup. Valid values are `"+"`, `"-"` or `"*"` (default)
 `notes_order`             | how to sort the notes in the panels; possible values: `created`, `updated`, `relevance`, `update_sequence_number`, `title`. Set the `notes_order_ascending` setting to `true` to reverse the selected order.
 `max_notes`               | maximum number of notes in a panel; default is 100.
 `update_on_save`          | when this setting is true, saving a file containing a note will also update (overwriting it) the online version. Default is false.
 `sort_notebooks`          | sorts notebooks alphabetically in pallette
 `show_stacks`             | shows the stack of notebooks in pallette
+`warn_on_close`           | when closing a modified note without saving to Evernote, offer a choice to save or discard changes (defaults to `true`)
+`gfm_tables`              | enable GFM table syntax (default `true`)
+`wiki_tables`             | enable Wiki table syntax (default `false`)
 `debug`                   | enables logging in the console
 
 
@@ -301,7 +307,7 @@ Libraries (some adapted to work with Evernote formats):
 [gitter]: <https://gitter.im/bordaigorl/sublime-evernote>
 [release]: <https://github.com/bordaigorl/sublime-evernote/releases>
 [licence]: <https://raw.githubusercontent.com/bordaigorl/sublime-evernote/master/LICENSE>
-[stars]: <https://github.com/bordaigorl/sublime-evernote/>
+[repo]: <https://github.com/bordaigorl/sublime-evernote/>
 
 [release badge]: https://img.shields.io/github/release/bordaigorl/sublime-evernote.svg
 [licence badge]: http://img.shields.io/badge/license-MIT-blue.svg?style=flat

From 1ba06467b3a5146c90b10abb09c1f85ad9e64f92 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Mon, 16 Feb 2015 01:50:11 +0000
Subject: [PATCH 44/52] Readme: changelog

---
 README.md | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index b396e67..9dd88bc 100644
--- a/README.md
+++ b/README.md
@@ -31,6 +31,20 @@ See [Commands](#commands) and the [wiki] for details.
 
 ## What's new
 
+**v2.6.0**
+
+ + Asynchronous operations: save/update/load from server does not block the UI 
+ + Warn on close if modified but not uploaded (`warn_on_close` setting)
+ + Added support for GFM tables syntax (#51, #58)
+ + Added support for strikethrough (#38)
+ + Added support for underline (see [special syntax][wiki-md])
+ + Settings for default emphasis/unordered list marks
+ + Better support for Unicode (#52) 
+ + CSS styling for inline code fixed (#53)
+ + Support for HTTPS for Package Control v3 users ([see wiki][wiki])
+ + If search has one result open it directly (#65)
+ + Added `evernote_has_guid` context key
+
 **v2.5.4**
 
  + Bugfix: solves a problem in setting a new token (see #48)
@@ -113,8 +127,8 @@ The plugin does not install keymaps, if you wish you may add a variation of the
 you can also overwrite the standard "save" bindings for Evernote notes as follows:
 
 ```
-{ "keys": ["ctrl+s"], "command": "save_evernote_note", "context": [{"key": "evernote_note"}] },
-{ "keys": ["ctrl+s"], "command": "send_to_evernote", "context": [{"key": "evernote_note", "operator": "equal", "operand": false}, {"key": "selector", "operator": "equal", "operand": "text.html.markdown.evernote"}] },
+{ "keys": ["ctrl+s"], "command": "save_evernote_note", "context": [{"key": "evernote_note"}, {"key": "evernote_has_guid"}] },
+{ "keys": ["ctrl+s"], "command": "send_to_evernote", "context": [{"key": "evernote_note"}, {"key": "evernote_has_guid", "operator": "equal", "operand": false}] },
 ```
 
 you would still be able to save the note as a file by using the `File > Save` menu. 
@@ -207,7 +221,7 @@ This command will open the currently opened note in your local Evernote client,
 
 You can use Markdown to write notes but there are some limitations due to Evernote's formats. For example, `class` and `id` are forbidden attributes in Evernote notes so the Markdown converter has been modified to never output them and raw HTML cannot contain them. If you write illegal content the plugin will display a dialog showing the reason why Evernote is complaining.
 
-Please see the [wiki documentation](https://github.com/bordaigorl/sublime-evernote/wiki/Supported-Markdown) for more details.
+Please see the [wiki documentation][wiki-md] for more details.
 
 ## Metadata
 
@@ -301,6 +315,7 @@ Libraries (some adapted to work with Evernote formats):
 
 [CONTRIBUTING]: <CONTRIBUTING.md>
 [wiki]: <https://github.com/bordaigorl/sublime-evernote/wiki/>
+[wiki-md]: <https://github.com/bordaigorl/sublime-evernote/wiki/Supported-Markdown>
 [bordaigorl]: <https://github.com/bordaigorl>
 [gratipay]: <https://gratipay.com/bordaigorl/>
 [paypal]: <https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JFWLSUZYXUHAQ>

From 860f2c91cb4e132374662f1e2a7b88ef5953a5e0 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Mon, 16 Feb 2015 11:01:08 +0000
Subject: [PATCH 45/52] Pointer to `inline_css` docs

---
 Evernote.sublime-settings | 3 ++-
 README.md                 | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/Evernote.sublime-settings b/Evernote.sublime-settings
index 54575ee..4ece5b8 100644
--- a/Evernote.sublime-settings
+++ b/Evernote.sublime-settings
@@ -1,4 +1,5 @@
 {
+    // inline_css is documented at https://github.com/bordaigorl/sublime-evernote/wiki/Styling
     "inline_css": {
         "pre": "color: #000000; font-family: monospace,monospace; font-size: 0.9em; white-space: pre-wrap; word-wrap: break-word; border: 1px solid #cccccc; border-radius: 3px; overflow: auto; padding: 6px 10px; margin-bottom: 10px;",
         "code": "color: black; font-family: monospace,monospace; font-size: 0.9em;",
@@ -8,7 +9,7 @@
         "hr": "color:#9AB39B;background-color:#9AB39B;height:1px;border:none;",
         "sup": "color:#6D6D6D;font-size:1ex",
         "blockquote": "border-left: .5ex solid #BFBFBF; margin-left: 0px; padding-left: 1em; margin-top: 1.4285em; margin-bottom: 1.4285em;",
-        // ONLY USED IF wiki_tables = true
+        // ONLY USED IF wiki_tables or gfm_tables are enabled
         "table": "border-collapse: collapse; border-spacing: 0; margin: 1em;",
         "td": "border: 1px solid #DDD; padding: 6px 13px;",
         "th": "border: 1px solid #DDD; padding: 6px 13px;",
diff --git a/README.md b/README.md
index 9dd88bc..878adab 100644
--- a/README.md
+++ b/README.md
@@ -258,7 +258,7 @@ The following settings can be customised:
 Setting                   | Purpose
 --------------------------|------------------------
 `md_syntax`               | a string pointing to a `tmLanguage` file which you want to associate with notes opened from Evernote.
-`inline_css`              | a dictionary associating some HTML element names to inline CSS styles; currently the only elements that can be styled in this way are: `pre`, `code`, `h1`, `hr`, `blockquote` and `sup`. Additionally `footnotes` can be associated to some style for the `div` containing the footnotes at the end of the note. The markdown of a note can contain (almost) arbitrary HTML blocks *but* Evernote only accepts a subset of the elements and attributes (`class` and `id` are disallowed). See [here](http://dev.evernote.com/doc/articles/enml.php) for details.
+`inline_css`              | a dictionary associating some HTML element names to inline CSS styles; this setting is documented in the [wiki](https://github.com/bordaigorl/sublime-evernote/wiki/Styling). The markdown of a note can contain (almost) arbitrary HTML blocks *but* Evernote only accepts a subset of the elements and attributes (`class` and `id` are disallowed). See [here](http://dev.evernote.com/doc/articles/enml.php) for details.
 `code_highlighting_style` | a pygments style among `autumn`, `default`, `github`, `monokai`, `perldoc`, `vim`, `borland`, `emacs`, `igor`, `murphy`, `rrt`, `vs`,   `bw`, `friendly`, `native`, `tango`, `xcode`,   `colorful`, `fruity`, `manni`, `pastie`, `trac`.
 `code_friendly`           | if `true` the `code-friendly` extra of markdown2 is enabled
 `evernote_autocomplete`   | when this setting is true, suggestions will be offered for autocompletion of the `notebook` and `tags` fields in metadata. Default is true.

From 42538e7732ce8315c065ace211445627a286c4d1 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Mon, 16 Feb 2015 11:45:29 +0000
Subject: [PATCH 46/52] Add `open_single_result` setting

---
 Evernote.sublime-settings | 1 +
 sublime_evernote.py       | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/Evernote.sublime-settings b/Evernote.sublime-settings
index 4ece5b8..410cd76 100644
--- a/Evernote.sublime-settings
+++ b/Evernote.sublime-settings
@@ -29,5 +29,6 @@
     "evernote_autocomplete": true,
     "sort_notebooks": false,
     "show_stacks": true,
+    "open_single_result": true,
     "warn_on_close": true
 }
\ No newline at end of file
diff --git a/sublime_evernote.py b/sublime_evernote.py
index 46be0ca..d4c2994 100644
--- a/sublime_evernote.py
+++ b/sublime_evernote.py
@@ -711,7 +711,7 @@ def on_note(i):
                 self.message('Retrieving note "%s"...' % notes[i].title)
                 self.open_note(notes[i].guid, **kwargs)
 
-            if len(notes) == 1:
+            if len(notes) == 1 and self.settings.get("open_single_result"):
                 on_note(0)
                 return
 

From ecd757c2250f7e87d44292c76776e66fa78d3321 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Mon, 16 Feb 2015 11:48:15 +0000
Subject: [PATCH 47/52] Readme: `open_single_result`

---
 README.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.md b/README.md
index 878adab..ad7ac7b 100644
--- a/README.md
+++ b/README.md
@@ -44,6 +44,7 @@ See [Commands](#commands) and the [wiki] for details.
  + Support for HTTPS for Package Control v3 users ([see wiki][wiki])
  + If search has one result open it directly (#65)
  + Added `evernote_has_guid` context key
+ + Search command now supports snippets for prompt (#54)
 
 **v2.5.4**
 
@@ -270,6 +271,7 @@ Setting                   | Purpose
 `update_on_save`          | when this setting is true, saving a file containing a note will also update (overwriting it) the online version. Default is false.
 `sort_notebooks`          | sorts notebooks alphabetically in pallette
 `show_stacks`             | shows the stack of notebooks in pallette
+`open_single_result`      | when a search returns only one note open it directly skipping the results pallette (defaults to `true`)
 `warn_on_close`           | when closing a modified note without saving to Evernote, offer a choice to save or discard changes (defaults to `true`)
 `gfm_tables`              | enable GFM table syntax (default `true`)
 `wiki_tables`             | enable Wiki table syntax (default `false`)

From 81da57f9ce2e9c6e2f57b0f4b0a162c670822d01 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Mon, 16 Feb 2015 12:02:57 +0000
Subject: [PATCH 48/52] Readme: summary of changelog + link to wiki

---
 README.md | 27 +--------------------------
 1 file changed, 1 insertion(+), 26 deletions(-)

diff --git a/README.md b/README.md
index ad7ac7b..d83fcf2 100644
--- a/README.md
+++ b/README.md
@@ -51,33 +51,8 @@ See [Commands](#commands) and the [wiki] for details.
  + Bugfix: solves a problem in setting a new token (see #48)
  + Added a `debug` flag in settings
 
-**v2.5.3**
+For earlier versions see the [wiki](https://github.com/bordaigorl/sublime-evernote/wiki/Changelog).
 
- + Added links to notes management (thanks to @rahul-ramadas, see #36)
- + Open note in Client command, tested on Windows only (thanks to @rahul-ramadas)
- + Bugfixes: better error messages, correct handling of unnamed attachments
-
-**v2.5.2**
-
- + Added attachments management: list, open, insert attachments from file or url (solves #24)
- + Notebook list can show stack names and be sorted (#30, thanks @danielfrg)
- + Added `wiki_tables` setting to enable Wiki-style tables syntax (solves #18)
- + Now notes in webapp are opened in default browser (solves #22)
- + Configuration asks for noteStoreUrl so the plugin works properly for yinxiang.com (solves #20)
-
-**v2.5.1**
-
- + Bugfix: metadata autocomplete now loads settings correctly 
-
-**v2.5.0**
-
- + [Search note](#search-note) command added
- + [Attach](#attach-to-note) command added
- + [Clip](#clip-to-note) command added
- + [View in WebApp](#view-note-in-webapp) command added
- + Autocomplete in metadata block
- + Unicode chars in tags properly displayed
- + Creation and update dates are displayed in status
 
 # Installation
 

From 09dfbceb74127bd325e7e71174e4dc89ef3ef1c6 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Mon, 16 Feb 2015 12:11:36 +0000
Subject: [PATCH 49/52] Add version message

---
 messages.json      |  3 ++-
 messages/2.6.0.txt | 30 ++++++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 messages/2.6.0.txt

diff --git a/messages.json b/messages.json
index f363134..e74d09f 100644
--- a/messages.json
+++ b/messages.json
@@ -2,5 +2,6 @@
     "install": "messages/install.txt",
     "2.5.0": "messages/2.5.0.txt",
     "2.5.2": "messages/2.5.2.txt",
-    "2.5.3": "messages/2.5.3.txt"
+    "2.5.3": "messages/2.5.3.txt",
+    "2.6.0": "messages/2.6.0.txt"
 }
\ No newline at end of file
diff --git a/messages/2.6.0.txt b/messages/2.6.0.txt
new file mode 100644
index 0000000..7b0cbef
--- /dev/null
+++ b/messages/2.6.0.txt
@@ -0,0 +1,30 @@
+What's new in v2.6.0
+====================
+
+If you like this plugin and would like to support its development please consider donating through a [paypal donation] or using [gratipay].
+
+Check out the [wiki] for documentation. There is also a [gitter] chat room for additional support. 
+
+If you already switched to Package Control 3 then you can use HTTPS in your `notestoreUrl`, see the [wiki] for details.
+
++ Asynchronous operations: save/update/load from server does not block the UI 
++ Warn on close if modified but not uploaded (`warn_on_close` setting)
++ Added support for GFM tables syntax (#51, #58)
++ Added support for strikethrough (#38)
++ Added support for underline (see [special syntax])
++ Settings for default emphasis/unordered list marks
++ Better support for Unicode (#52) 
++ CSS styling for inline code fixed (#53)
++ Support for HTTPS for Package Control v3 users (see [wiki])
++ If search has one result open it directly (#65)
++ Added `evernote_has_guid` context key
++ Search command now supports snippets for prompt (#54)
+
+
+[paypal donation]: <https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=JFWLSUZYXUHAQ>
+[gratipay]: <https://gratipay.com/bordaigorl/>
+
+[wiki]: <https://github.com/bordaigorl/sublime-evernote/wiki/>
+[gitter]: <https://gitter.im/bordaigorl/sublime-evernote>
+[special syntax]: <https://github.com/bordaigorl/sublime-evernote/wiki/Supported-Markdown>
+

From bbde019025b18dd6b880d06bab8879cf9b99bf77 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Mon, 16 Feb 2015 12:11:49 +0000
Subject: [PATCH 50/52] Bump version

---
 sublime_evernote.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sublime_evernote.py b/sublime_evernote.py
index d4c2994..3b9a175 100644
--- a/sublime_evernote.py
+++ b/sublime_evernote.py
@@ -41,7 +41,7 @@
 
 from base64 import b64encode, b64decode
 
-EVERNOTE_PLUGIN_VERSION = "2.6"
+EVERNOTE_PLUGIN_VERSION = "2.6.0"
 USER_AGENT = {'User-Agent': 'SublimeEvernote/' + EVERNOTE_PLUGIN_VERSION}
 
 EVERNOTE_SETTINGS = "Evernote.sublime-settings"

From 804a1f618d6de3d071c070f032b37d8869b4f397 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Mon, 16 Feb 2015 12:13:39 +0000
Subject: [PATCH 51/52] Todo: Minor

---
 TODO.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/TODO.md b/TODO.md
index 18cd7cb..71ff3d9 100644
--- a/TODO.md
+++ b/TODO.md
@@ -3,6 +3,7 @@
  * update `EVERNOTE_PLUGIN_VERSION`
  * check `DEBUG` is `False`
  * update Changelog in Readme
+ * add update message to `messages` and `messages.json`
  * update Contributors in Readme if needed
  * update wiki if needed
  * add release on GitHub with release notes from Readme

From 045e215604c64b6fb6798746cd936acaeb7dd007 Mon Sep 17 00:00:00 2001
From: bordaigorl <emanuele.dosualdo@gmail.com>
Date: Mon, 16 Feb 2015 12:15:35 +0000
Subject: [PATCH 52/52] Readme: Missing link to issues

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index d83fcf2..461a67d 100644
--- a/README.md
+++ b/README.md
@@ -299,6 +299,7 @@ Libraries (some adapted to work with Evernote formats):
 [gitter]: <https://gitter.im/bordaigorl/sublime-evernote>
 [release]: <https://github.com/bordaigorl/sublime-evernote/releases>
 [licence]: <https://raw.githubusercontent.com/bordaigorl/sublime-evernote/master/LICENSE>
+[issues]: <https://github.com/bordaigorl/sublime-evernote/issues>
 [repo]: <https://github.com/bordaigorl/sublime-evernote/>
 
 [release badge]: https://img.shields.io/github/release/bordaigorl/sublime-evernote.svg