diff --git a/faq.html b/faq.html
index 6a38b43..bd4f9c6 100644
--- a/faq.html
+++ b/faq.html
@@ -4,7 +4,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
 <title>Frequently Asked Questions</title>
-<!-- 2016-04-30 Sat 22:37 -->
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta  name="generator" content="Org-mode" />
 <style type="text/css">
@@ -140,7 +139,7 @@ for the JavaScript code in this tag.
 <nav>
   <ul class="center">
     <li> <a href="index.html">Overview</a>
-    <li> <a href="https://github.com/capitaomorte/yasnippet/blob/master/README.mdown">
+    <li> <a href="https://github.com/joaotavora/yasnippet/blob/master/README.mdown">
         Intro and Tutorial</a>
     <li class="center">Snippet
       <ul>
@@ -161,11 +160,10 @@ for the JavaScript code in this tag.
 <div id="text-table-of-contents">
 <ul>
 <li><a href="#sec-1">Why is there an extra newline?</a></li>
-<li><a href="#sec-2">Why doesn't TAB expand a snippet?</a></li>
-<li><a href="#sec-3">Why doesn't TAB navigation work with flyspell</a></li>
-<li><a href="#sec-4">How to I use alternative keys, i.e. not TAB?</a></li>
-<li><a href="#sec-5">How do I turn off the minor mode where in some buffers?</a></li>
-<li><a href="#sec-6">How do I define an abbrev key containing characters not supported by the filesystem?</a></li>
+<li><a href="#sec-2">Why doesn't TAB navigation work with flyspell</a></li>
+<li><a href="#sec-3">How to I use alternative keys, i.e. not TAB?</a></li>
+<li><a href="#sec-4">How do I turn off the minor mode where in some buffers?</a></li>
+<li><a href="#sec-5">How do I define an abbrev key containing characters not supported by the filesystem?</a></li>
 </ul>
 </div>
 </div>
@@ -174,120 +172,24 @@ for the JavaScript code in this tag.
 <h2 id="sec-1">Why is there an extra newline?</h2>
 <div class="outline-text-2" id="text-1">
 <p>
-If you have a newline at the end of the snippet definition file, then
-YASnippet will add a newline when you expanding a snippet. Please don't
-add a newline at the end if you don't want it when you saving the
-snippet file.
+If there is a newline at the end of a snippet definition file,
+YASnippet will add a newline when expanding that snippet. When editing
+or saving a snippet file, please be careful not to accidentally add a
+terminal newline.
 </p>
 
 <p>
-Note some editors will automatically add a newline for you. In Emacs, if
-you set <code>require-final-newline</code> to <code>t</code>, it will add the final newline
-for you automatically.
+Note that some editors will automatically add a newline for you. In
+Emacs, if you set <code>require-final-newline</code> to <code>t</code>, it will add the
+final newline automatically.
 </p>
 </div>
 </div>
 
 <div id="outline-container-sec-2" class="outline-2">
-<h2 id="sec-2">Why doesn't TAB expand a snippet?</h2>
+<h2 id="sec-2">Why doesn't TAB navigation work with flyspell</h2>
 <div class="outline-text-2" id="text-2">
 <p>
-First check the mode line to see if there's <code>yas</code>. If not, then try
-<code>M-x yas-minor-mode</code> to manually turn on the minor mode and try to
-expand the snippet again. If it works, then, you can add the following
-code to your <code>.emacs</code> <i>before</i> loading YASnippet:
-</p>
-
-<div class="org-src-container">
-
-<pre class="src src-emacs-lisp">(add-hook 'the-major-mode-hook 'yas-minor-mode-on)
-</pre>
-</div>
-
-<p>
-where <code>the-major-mode</code> is the major mode in which <a href="snippet-reference.html#yas-minor-mode"><code>yas-minor-mode</code></a> isn't
-enabled by default.
-</p>
-
-<p>
-From YASnippet 0.6 you can also use the command <code>M-x yas-global-mode</code> to
-turn on YASnippet automatically for <i>all</i> major modes.
-</p>
-
-<p>
-If <a href="snippet-reference.html#yas-minor-mode"><code>yas-minor-mode</code></a> is on but the snippet still not expanded. Then try
-to see what command is bound to the <code>TAB</code> key: press <code>C-h k</code> and then
-press <code>TAB</code>. Emacs will show you the result.
-</p>
-
-<p>
-You'll see a buffer prompted by Emacs saying that
-<code>TAB runs the command ...</code>. Alternatively, you might see
-<code>&lt;tab&gt; runs the command ...</code>, note the difference between <code>TAB</code> and
-<code>&lt;tab&gt;</code> where the latter has priority. If you see <code>&lt;tab&gt;</code> bound to a
-command other than <a href="snippet-reference.html#yas-expand"><code>yas-expand</code></a>, (e.g. in <code>org-mode</code>) you can try the
-following code to work around:
-</p>
-
-<div class="org-src-container">
-
-<pre class="src src-emacs-lisp">(add-hook 'org-mode-hook
-          (<span class="org-keyword">let</span> ((original-command (lookup-key org-mode-map [tab])))
-            `(<span class="org-keyword">lambda</span> ()
-               (setq yas-fallback-behavior
-                     '(apply ,original-command))
-               (local-set-key [tab] 'yas-expand))))
-</pre>
-</div>
-
-<p>
-replace <code>org-mode-hook</code> and <code>org-mode-map</code> with the major mode hook you
-are dealing with (Use <code>C-h m</code> to see what major mode you are in).
-</p>
-
-<p>
-As an alternative, you can also try
-</p>
-
-<div class="org-src-container">
-
-<pre class="src src-emacs-lisp">(<span class="org-keyword">defun</span> <span class="org-function-name">yas-advise-indent-function</span> (function-symbol)
-  (eval `(<span class="org-keyword">defadvice</span> ,function-symbol (around yas-try-expand-first activate)
-           ,(format
-             <span class="org-string">"Try to expand a snippet before point, then call `</span><span class="org-string"><span class="org-constant">%s</span></span><span class="org-string">' as usual"</span>
-             function-symbol)
-           (<span class="org-keyword">let</span> ((yas-fallback-behavior nil))
-             (<span class="org-keyword">unless</span> (and (interactive-p)
-                          (yas-expand))
-               ad-do-it)))))
-
-(yas-advise-indent-function 'ruby-indent-line)
-</pre>
-</div>
-
-<p>
-To <i>advise</i> the modes indentation function bound to TAB, (in this case
-<code>ruby-indent-line</code>) to first try to run <a href="snippet-reference.html#yas-expand"><code>yas-expand</code></a>.
-</p>
-
-<p>
-If the output of <code>C-h k RET &lt;tab&gt;</code> tells you that <code>&lt;tab&gt;</code> is indeed
-bound to <a href="snippet-reference.html#yas-expand"><code>yas-expand</code></a> but YASnippet still doesn't work, check your
-configuration and you may also ask for help on the <a href="http://groups.google.com/group/smart-snippet">discussion group</a>.
-See this particular <a href="http://code.google.com/p/yasnippet/issues/detail?id=93&can=1">thread</a> for quite some solutions and alternatives.
-</p>
-
-<p>
-Don't forget to attach the information on what command is bound to TAB
-as well as the mode information (Can be obtained by <code>C-h m</code>).
-</p>
-</div>
-</div>
-
-<div id="outline-container-sec-3" class="outline-2">
-<h2 id="sec-3">Why doesn't TAB navigation work with flyspell</h2>
-<div class="outline-text-2" id="text-3">
-<p>
 A workaround is to inhibit flyspell overlays while the snippet is
 active:
 </p>
@@ -295,8 +197,8 @@ active:
 <div class="org-src-container">
 
 <pre class="src src-emacs-lisp">(add-hook 'flyspell-incorrect-hook
-          #'(<span class="org-keyword">lambda</span> (dummy1 dummy2 dymmy3)
-              (and yas-active-field-overlay
+          #'(lambda (dummy1 dummy2 dymmy3)
+              (<span class="org-keyword">and</span> yas-active-field-overlay
                    (overlay-buffer yas-active-field-overlay))))
 </pre>
 </div>
@@ -312,9 +214,9 @@ solve this problem, drop a line in the
 </div>
 </div>
 
-<div id="outline-container-sec-4" class="outline-2">
-<h2 id="sec-4">How to I use alternative keys, i.e. not TAB?</h2>
-<div class="outline-text-2" id="text-4">
+<div id="outline-container-sec-3" class="outline-2">
+<h2 id="sec-3">How to I use alternative keys, i.e. not TAB?</h2>
+<div class="outline-text-2" id="text-3">
 <p>
 Edit the keymaps <a href="snippet-reference.html#yas-minor-mode-map"><code>yas-minor-mode-map</code></a> and
 <a href="snippet-reference.html#yas-keymap"><code>yas-keymap</code></a> as you would any other keymap:
@@ -324,7 +226,7 @@ Edit the keymaps <a href="snippet-reference.html#yas-minor-mode-map"><code>yas-m
 
 <pre class="src src-emacs-lisp">(define-key yas-minor-mode-map (kbd <span class="org-string">"&lt;tab&gt;"</span>) nil)
 (define-key yas-minor-mode-map (kbd <span class="org-string">"TAB"</span>) nil)
-(define-key yas-minor-mode-map (kbd <span class="org-string">"&lt;the new key&gt;"</span>) 'yas-expand)
+(define-key yas-minor-mode-map (kbd <span class="org-string">"&lt;the new key&gt;"</span>) yas-maybe-expand)
 
 <span class="org-comment-delimiter">;;</span><span class="org-comment">keys for navigation</span>
 (define-key yas-keymap [(tab)]       nil)
@@ -338,9 +240,9 @@ Edit the keymaps <a href="snippet-reference.html#yas-minor-mode-map"><code>yas-m
 </div>
 </div>
 
-<div id="outline-container-sec-5" class="outline-2">
-<h2 id="sec-5">How do I turn off the minor mode where in some buffers?</h2>
-<div class="outline-text-2" id="text-5">
+<div id="outline-container-sec-4" class="outline-2">
+<h2 id="sec-4">How do I turn off the minor mode where in some buffers?</h2>
+<div class="outline-text-2" id="text-4">
 <p>
 The best way, since version 0.6.1c, is to set the default value of the
 variable <a href="snippet-reference.html#yas-dont-activate"><code>yas-dont-activate</code></a> to a lambda function like so:
@@ -349,8 +251,8 @@ variable <a href="snippet-reference.html#yas-dont-activate"><code>yas-dont-activ
 <div class="org-src-container">
 
 <pre class="src src-emacs-lisp">(set-default 'yas-dont-activate
-             #'(<span class="org-keyword">lambda</span> ()
-                 (and yas-root-directory
+             #'(lambda ()
+                 (<span class="org-keyword">and</span> yas-root-directory
                       (null (yas-get-snippet-tables)))))
 </pre>
 </div>
@@ -363,9 +265,9 @@ but only once you have setup your yas-root-directory.
 </div>
 </div>
 
-<div id="outline-container-sec-6" class="outline-2">
-<h2 id="sec-6">How do I define an abbrev key containing characters not supported by the filesystem?</h2>
-<div class="outline-text-2" id="text-6">
+<div id="outline-container-sec-5" class="outline-2">
+<h2 id="sec-5">How do I define an abbrev key containing characters not supported by the filesystem?</h2>
+<div class="outline-text-2" id="text-5">
 <ul class="org-ul">
 <li><b>Note</b>: This question applies if you're still defining snippets
 whose key <i>is</i> the filename. This is behavior still provided by
@@ -399,8 +301,7 @@ directive:
 </div>
 </div>
 <div id="postamble" class="status">
-<hr><p class='creator'>Generated by <a href="http://www.gnu.org/software/emacs/">Emacs</a> 24.5.1 (<a href="http://orgmode.org">Org</a> mode 8.2.10) on  from df229b9ab8db87fe5a1133365fdc299a65f9be86
-</p>
+<hr><p class='creator'>Generated by <a href="http://www.gnu.org/software/emacs/">Emacs</a> 25.2.50.5 (<a href="http://orgmode.org">Org</a> mode 8.2.10) from 0.12.2 (2017-08-29 02:08:58)</p>
 <p class='xhtml-validation'><a href="http://validator.w3.org/check?uri=referer">Validate</a></p>
 </div>
 </body>
diff --git a/index.html b/index.html
index aef5de3..e24b774 100644
--- a/index.html
+++ b/index.html
@@ -4,7 +4,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
 <title>Yet another snippet extension</title>
-<!-- 2016-04-30 Sat 22:37 -->
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta  name="generator" content="Org-mode" />
 <style type="text/css">
@@ -140,7 +139,7 @@ for the JavaScript code in this tag.
 <nav>
   <ul class="center">
     <li> <a href="index.html">Overview</a>
-    <li> <a href="https://github.com/capitaomorte/yasnippet/blob/master/README.mdown">
+    <li> <a href="https://github.com/joaotavora/yasnippet/blob/master/README.mdown">
         Intro and Tutorial</a>
     <li class="center">Snippet
       <ul>
@@ -161,7 +160,7 @@ The YASnippet documentation has been split into separate parts:
 </p>
 
 <ol class="org-ol">
-<li><a href="https://github.com/capitaomorte/yasnippet/blob/master/README.mdown">README</a>
+<li><a href="https://github.com/joaotavora/yasnippet/blob/master/README.mdown">README</a>
 
 <p>
 Contains an introduction, installation instructions and other important
@@ -222,8 +221,7 @@ An automatically generated listing of all YASnippet commands,
 </ol>
 </div>
 <div id="postamble" class="status">
-<hr><p class='creator'>Generated by <a href="http://www.gnu.org/software/emacs/">Emacs</a> 24.5.1 (<a href="http://orgmode.org">Org</a> mode 8.2.10) on  from df229b9ab8db87fe5a1133365fdc299a65f9be86
-</p>
+<hr><p class='creator'>Generated by <a href="http://www.gnu.org/software/emacs/">Emacs</a> 25.2.50.5 (<a href="http://orgmode.org">Org</a> mode 8.2.10) from 0.12.2 (2017-08-29 02:08:58)</p>
 <p class='xhtml-validation'><a href="http://validator.w3.org/check?uri=referer">Validate</a></p>
 </div>
 </body>
diff --git a/snippet-development.html b/snippet-development.html
index 8a3979e..cb43e3c 100644
--- a/snippet-development.html
+++ b/snippet-development.html
@@ -4,7 +4,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
 <title>Writing snippets</title>
-<!-- 2016-04-30 Sat 22:37 -->
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta  name="generator" content="Org-mode" />
 <style type="text/css">
@@ -140,7 +139,7 @@ for the JavaScript code in this tag.
 <nav>
   <ul class="center">
     <li> <a href="index.html">Overview</a>
-    <li> <a href="https://github.com/capitaomorte/yasnippet/blob/master/README.mdown">
+    <li> <a href="https://github.com/joaotavora/yasnippet/blob/master/README.mdown">
         Intro and Tutorial</a>
     <li class="center">Snippet
       <ul>
@@ -163,7 +162,7 @@ for the JavaScript code in this tag.
 <li><a href="#sec-1">Snippet development</a>
 <ul>
 <li><a href="#sec-1-1">Quickly finding snippets</a></li>
-<li><a href="#sec-1-2">Using the <code>snippet-mode</code> major mode</a></li>
+<li><a href="#sec-1-2">Using the <code>snippet-mode</code> major mode </a></li>
 </ul>
 </li>
 <li><a href="#sec-2">File content</a>
@@ -182,7 +181,11 @@ for the JavaScript code in this tag.
 <li><a href="#sec-3">Template Syntax</a>
 <ul>
 <li><a href="#sec-3-1">Plain Text</a></li>
-<li><a href="#sec-3-2">Embedded Emacs-lisp code</a></li>
+<li><a href="#sec-3-2">Embedded Emacs-lisp code</a>
+<ul>
+<li><a href="#sec-3-2-1">Note: backquote expressions should not modify the buffer</a></li>
+</ul>
+</li>
 <li><a href="#sec-3-3">Tab stop fields</a></li>
 <li><a href="#sec-3-4">Placeholder fields</a></li>
 <li><a href="#sec-3-5">Mirrors </a></li>
@@ -190,6 +193,7 @@ for the JavaScript code in this tag.
 <li><a href="#sec-3-7">Fields with transformations</a></li>
 <li><a href="#sec-3-8">Choosing fields value from a list and other tricks</a></li>
 <li><a href="#sec-3-9">Nested placeholder fields</a></li>
+<li><a href="#sec-3-10">Indentation markers</a></li>
 </ul>
 </li>
 </ul>
@@ -207,30 +211,16 @@ There are some ways you can quickly find a snippet file or create a new one:
 </p>
 
 <ul class="org-ul">
-<li><code>M-x yas-new-snippet</code>
+<li><code>M-x yas-new-snippet</code>, key bindind: <code>C-c &amp; C-n</code>
 
 <p>
-Creates a new buffer with a template for making a new snippet.
-The buffer is in <code>snippet-mode</code> (see below). When you are done
-editing the new snippet, use <code>C-c C-c</code> to save it. This will
-prompt for a directory two steps: first, the snippet table
-(with a default based on the major mode you started in), and then
-then snippet collection directory (defaults to the first directory
-in <code>yas-snippet-dirs</code>. (See <a href="snippet-organization.html">Organizing Snippets</a>
-for more detail on how snippets are organized.)
+Creates a new buffer with a template for making a new snippet.  The
+buffer is in <code>snippet-mode</code> (see <a href="#snippet-mode">below</a>).  When you are done editing
+the new snippet, use <a href="#yas-load-snippet-buffer-and-close"><code>C-c C-c</code></a> to save it.
 </p>
 </li>
 
-<li><code>M-x yas-find-snippets</code>
-
-<p>
-Lets you find the snippet file in the directory the snippet was
-loaded from (if it exists) like <code>find-file-other-window</code>. The
-directory searching logic is similar to <code>M-x yas-new-snippet</code>.
-</p>
-</li>
-
-<li><code>M-x yas-visit-snippet-file</code>
+<li><code>M-x yas-visit-snippet-file</code>, key binding: <code>C-c &amp; C-v</code>
 
 <p>
 Prompts you for possible snippet expansions like
@@ -241,14 +231,14 @@ to the snippet definition's file, if it exists.
 </ul>
 
 <p>
-Once you find this file it will be set to <code>snippet-mode</code> (see ahead) and
-you can start editing your snippet.
+Once you find this file it will be set to <code>snippet-mode</code> (see <a href="#snippet-mode">ahead</a>)
+and you can start editing your snippet.
 </p>
 </div>
 </div>
 
 <div id="outline-container-sec-1-2" class="outline-3">
-<h3 id="sec-1-2">Using the <code>snippet-mode</code> major mode</h3>
+<h3 id="sec-1-2">Using the <code>snippet-mode</code> major mode <a id="snippet-mode" name="snippet-mode"></a></h3>
 <div class="outline-text-3" id="text-1-2">
 <p>
 There is a major mode <code>snippet-mode</code> to edit snippets. You can set the
@@ -257,26 +247,36 @@ useful syntax highlighting.
 </p>
 
 <p>
-Two commands are defined in this mode:
+Three commands are defined in this mode:
 </p>
 
 <ul class="org-ul">
-<li><code>M-x yas-load-snippet-buffer</code>
+<li><code>M-x yas-load-snippet-buffer</code>, key binding: <code>C-c C-l</code>
 
 <p>
-When editing a snippet, this loads the snippet into the correct
-mode and menu. Bound to <code>C-c C-c</code> by default while in
-<code>snippet-mode</code>.
+Prompts for a snippet table (with a default based on snippet's
+major mode) and loads the snippet currently being edited.
 </p>
 </li>
 
-<li><code>M-x yas-tryout-snippet</code>
+<li><code>M-x yas-load-snippet-buffer-and-close</code>, key binding: <code>C-c C-c</code>
+   <a id="yas-load-snippet-buffer-and-close" name="yas-load-snippet-buffer-and-close"></a>
+
+<p>
+Like <code>yas-load-snippet-buffer</code>, but also saves the snippet and
+calls <code>quit-window</code>.  The destination is decided based on the
+chosen snippet table and snippet collection directly (defaulting to
+the first directory in <code>yas-snippet-dirs</code> (see <a href="snippet-organization.html">Organizing Snippets</a>
+for more detail on how snippets are organized).
+</p>
+</li>
+
+<li><code>M-x yas-tryout-snippet</code>, key binding: <code>C-c C-t</code>
 
 <p>
 When editing a snippet, this opens a new empty buffer, sets it to
 the appropriate major mode and inserts the snippet there, so you
-can see what it looks like. This is bound to <code>C-c C-t</code> while in
-<code>snippet-mode</code>.
+can see what it looks like.
 </p>
 </li>
 </ul>
@@ -537,7 +537,7 @@ snippet being expanded.
 </p>
 
 <p>
-Here's an example for c-mode` to calculate the header file guard
+Here's an example for c-mode to calculate the header file guard
 dynamically:
 </p>
 
@@ -572,8 +572,44 @@ Alternatively, you can also customize the variable
 <a href="snippet-reference.html#yas-wrap-around-region"><code>yas-wrap-around-region</code></a> to <code>t</code> which will do this automatically.
 </p>
 </div>
+
+<div id="outline-container-sec-3-2-1" class="outline-4">
+<h4 id="sec-3-2-1">Note: backquote expressions should not modify the buffer</h4>
+<div class="outline-text-4" id="text-3-2-1">
+<p>
+Please note that the lisp forms in backquotes should <b>not</b> modify the
+buffer, doing so will trigger a warning.  For example, instead of
+doing
+</p>
+
+<div class="org-src-container">
+
+<pre class="src src-snippet">Timestamp: `(insert (current-time-string))`
+</pre>
 </div>
 
+<p>
+do this:
+</p>
+<div class="org-src-container">
+
+<pre class="src src-snippet">Timestamp: `(current-time-string)`
+</pre>
+</div>
+
+<p>
+The warning may be suppressed with the following code in your init file:
+</p>
+<div class="org-src-container">
+
+<pre class="src src-emacs-lisp">(add-to-list 'warning-suppress-types '(yasnippet backquote-change))
+</pre>
+</div>
+</div>
+</div>
+</div>
+
+
 <div id="outline-container-sec-3-3" class="outline-3">
 <h3 id="sec-3-3">Tab stop fields</h3>
 <div class="outline-text-3" id="text-3-3">
@@ -850,11 +886,21 @@ performs the normal Emacs <code>delete-char</code> command.
 </p>
 </div>
 </div>
+
+<div id="outline-container-sec-3-10" class="outline-3">
+<h3 id="sec-3-10">Indentation markers</h3>
+<div class="outline-text-3" id="text-3-10">
+<p>
+If <a href="snippet-reference.html#yas-indent-line"><code>yas-indent-line</code></a> is <b>not</b> set to '<code>auto</code>, it's still possible to
+indent specific lines by adding an indentation marker, <code>$&gt;</code>, somewhere
+on the line.
+</p>
+</div>
+</div>
 </div>
 </div>
 <div id="postamble" class="status">
-<hr><p class='creator'>Generated by <a href="http://www.gnu.org/software/emacs/">Emacs</a> 24.5.1 (<a href="http://orgmode.org">Org</a> mode 8.2.10) on  from df229b9ab8db87fe5a1133365fdc299a65f9be86
-</p>
+<hr><p class='creator'>Generated by <a href="http://www.gnu.org/software/emacs/">Emacs</a> 25.2.50.5 (<a href="http://orgmode.org">Org</a> mode 8.2.10) from 0.12.2 (2017-08-29 02:08:58)</p>
 <p class='xhtml-validation'><a href="http://validator.w3.org/check?uri=referer">Validate</a></p>
 </div>
 </body>
diff --git a/snippet-expansion.html b/snippet-expansion.html
index d42a22c..e9aacfe 100644
--- a/snippet-expansion.html
+++ b/snippet-expansion.html
@@ -4,7 +4,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
 <title>Expanding snippets</title>
-<!-- 2016-04-30 Sat 22:37 -->
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta  name="generator" content="Org-mode" />
 <style type="text/css">
@@ -140,7 +139,7 @@ for the JavaScript code in this tag.
 <nav>
   <ul class="center">
     <li> <a href="index.html">Overview</a>
-    <li> <a href="https://github.com/capitaomorte/yasnippet/blob/master/README.mdown">
+    <li> <a href="https://github.com/joaotavora/yasnippet/blob/master/README.mdown">
         Intro and Tutorial</a>
     <li class="center">Snippet
       <ul>
@@ -181,7 +180,7 @@ for the JavaScript code in this tag.
 <li><a href="#sec-2">Controlling expansion</a>
 <ul>
 <li><a href="#sec-2-1">Eligible snippets</a></li>
-<li><a href="#sec-2-2">The condition system</a></li>
+<li><a href="#sec-2-2">The condition system </a></li>
 <li><a href="#sec-2-3">Multiples snippet with the same key</a>
 <ul>
 <li><a href="#sec-2-3-1">Use the X window system</a></li>
@@ -247,22 +246,42 @@ TODO: example for this
 <div class="outline-text-3" id="text-1-1">
 <p>
 <a href="snippet-reference.html#yas-expand"><code>yas-expand</code></a> tries to expand a <i>snippet abbrev</i> (also known as
-<i>snippet key</i>) before point.
+<i>snippet key</i>) before point.  YASnippet also provides a <i>conditional
+binding</i> for this command: the variable <a href="snippet-reference.html#yas-expand"><code>yas-maybe-expand</code></a> contains a
+special value which, when bound in a keymap, tells Emacs to call
+<a href="snippet-reference.html#yas-expand"><code>yas-expand</code></a> if and only if there is a snippet abbrev before point.
+If there is no snippet to expand, Emacs will behave as if <a href="snippet-reference.html#yas-expand"><code>yas-expand</code></a>
+is unbound and so will run whatever command is bound to that key
+normally.
 </p>
 
 <p>
-When <a href="snippet-reference.html#yas-minor-mode"><code>yas-minor-mode</code></a> is enabled, it binds <a href="snippet-reference.html#yas-expand"><code>yas-expand</code></a> to <code>TAB</code> and
-<code>&lt;tab&gt;</code> by default, however, you can freely set it to some other key:
+When <a href="snippet-reference.html#yas-minor-mode"><code>yas-minor-mode</code></a> is enabled, it binds <a href="snippet-reference.html#yas-maybe-expand"><code>yas-maybe-expand</code></a> to <code>TAB</code>
+and <code>&lt;tab&gt;</code> by default, however, you can freely remove those bindings:
 </p>
 
 <div class="org-src-container">
 
 <pre class="src src-emacs-lisp">(define-key yas-minor-mode-map (kbd <span class="org-string">"&lt;tab&gt;"</span>) nil)
 (define-key yas-minor-mode-map (kbd <span class="org-string">"TAB"</span>) nil)
-(define-key yas-minor-mode-map (kbd <span class="org-string">"&lt;the new key&gt;"</span>) 'yas-expand)
 </pre>
 </div>
 
+<p>
+And set your own:
+</p>
+
+<div class="org-src-container">
+
+<pre class="src src-emacs-lisp"><span class="org-comment-delimiter">;; </span><span class="org-comment">Bind `</span><span class="org-comment"><span class="org-constant">SPC</span></span><span class="org-comment">' to `</span><span class="org-comment"><span class="org-constant">yas-expand</span></span><span class="org-comment">' when snippet expansion available (it</span>
+<span class="org-comment-delimiter">;; </span><span class="org-comment">will still call `</span><span class="org-comment"><span class="org-constant">self-insert-command</span></span><span class="org-comment">' otherwise).</span>
+(define-key yas-minor-mode-map (kbd <span class="org-string">"SPC"</span>) yas-maybe-expand)
+<span class="org-comment-delimiter">;; </span><span class="org-comment">Bind `C-c y' to `</span><span class="org-comment"><span class="org-constant">yas-expand</span></span><span class="org-comment">' ONLY.</span>
+(define-key yas-minor-mode-map (kbd <span class="org-string">"C-c y"</span>) #'yas-expand)
+</pre>
+</div>
+
+
 <p>
 To enable the YASnippet minor mode in all buffers globally use the
 command <a href="snippet-reference.html#yas-global-mode"><code>yas-global-mode</code></a>. This will enable a modeline indicator,
@@ -277,8 +296,8 @@ command <a href="snippet-reference.html#yas-global-mode"><code>yas-global-mode</
 
 <p>
 When you use <a href="snippet-reference.html#yas-global-mode"><code>yas-global-mode</code></a> you can also selectively disable
-YASnippet in some buffers by setting the buffer-local variable
-<a href="snippet-reference.html#yas-dont-active"><code>yas-dont-active</code></a> in the buffer's mode hook.
+YASnippet in some buffers by calling <a href="snippet-reference.html#yas-minor-mode"><code>yas-minor-mode</code></a> with a negative
+argument in the buffer's mode hook.
 </p>
 </div>
 
@@ -286,23 +305,9 @@ YASnippet in some buffers by setting the buffer-local variable
 <h4 id="sec-1-1-1">Fallback behaviour</h4>
 <div class="outline-text-4" id="text-1-1-1">
 <p>
-<a href="snippet-reference.html#yas-fallback-behaviour"><code>yas-fallback-behaviour</code></a> is a customization variable bound to
-'<code>call-other-command</code> by default. If <a href="snippet-reference.html#yas-expand"><code>yas-expand</code></a> failed to find any
-suitable snippet to expand, it will disable the minor mode temporarily
-and find if there's any other command bound to the same key.
-</p>
-
-<p>
-If found, the command will be called. Usually this works very well
-&#x2013;when there's a snippet, expand it, otherwise, call whatever command
-originally bind to the trigger key.
-</p>
-
-<p>
-However, you can change this behavior by customizing the
-<a href="snippet-reference.html#yas-fallback-behavior"><code>yas-fallback-behavior</code></a> variable. If you set this variable to
-'<code>return-nil</code>, it will return <code>nil</code> instead of trying to call the
-<i>original</i> command when no snippet is found.
+YASnippet used to support a more complicated way of sharing
+keybindings before <a href="snippet-reference.html#yas-expand"><code>yas-maybe-expand</code></a> was added.  This is now
+obsolete.
 </p>
 </div>
 </div>
@@ -474,21 +479,20 @@ mode. Typically, you call this from a minor mode hook, for example:
 <pre class="src src-emacs-lisp"><span class="org-comment-delimiter">;; </span><span class="org-comment">When entering rinari-minor-mode, consider also the snippets in the</span>
 <span class="org-comment-delimiter">;; </span><span class="org-comment">snippet table "rails-mode"</span>
 (add-hook 'rinari-minor-mode-hook
-          #'(<span class="org-keyword">lambda</span> ()
+          #'(lambda ()
               (yas-activate-extra-mode 'rails-mode)))
 </pre>
 </div>
 
 <ul class="org-ul">
-<li>Buffer-local
-<a href="snippet-reference.html#yas-buffer-local-condition"><code>yas-buffer-local-condition</code></a>
-variable
+<li>Buffer-local <a href="snippet-reference.html#yas-buffer-local-condition"><code>yas-buffer-local-condition</code></a> variable
 
 <p>
 This variable provides finer grained control over what snippets can
-be expanded in the current buffer. The default value won't let you
-expand snippets inside comments or string literals for example. See
-The condition system\_ for more info.
+be expanded in the current buffer.  For example, the constant
+<a href="snippet-reference.html#yas-not-string-or-comment-condition"><code>yas-not-string-or-comment-condition</code></a> has a value that disables
+snippet expansion inside comments or string literals.  See <a href="#condition-system">the
+condition system</a> for more info.
 </p>
 </li>
 </ul>
@@ -496,7 +500,7 @@ The condition system\_ for more info.
 </div>
 
 <div id="outline-container-sec-2-2" class="outline-3">
-<h3 id="sec-2-2">The condition system</h3>
+<h3 id="sec-2-2">The condition system <a id="condition-system" name="condition-system"></a></h3>
 <div class="outline-text-3" id="text-2-2">
 <p>
 Consider this scenario: you are an old Emacs hacker. You like the
@@ -506,36 +510,35 @@ block or a string (e.g. in <code>python-mode</code>).
 </p>
 
 <p>
-If you use the <code># condition :</code> directive (see
-<a href="./snippet-development.html">Writing Snippets</a>) you could just specify
-the condition for <code>if</code> to be <code>(not (python-in-string/comment))</code>. But how
-about <code>while</code>, <code>for</code>, etc. ? Writing the same condition for all the
-snippets is just boring. So has a buffer local variable
-<a href="snippet-reference.html#yas-buffer-local-condition"><code>yas-buffer-local-condition</code></a>. You can set this variable to
-<code>(not (python-in-string/comment))</code> in <code>python-mode-hook</code>.
+If you use the <code># condition :</code> directive (see <a href="./snippet-development.html">Writing Snippets</a>) you
+could just specify the condition for <code>if</code> to be <code>(not
+(python-syntax-comment-or-string-p))</code>.  But how about <code>while</code>, <code>for</code>,
+etc?  Writing the same condition for all the snippets is just boring.
+So you can instead set <a href="snippet-reference.html#yas-buffer-local-condition"><code>yas-buffer-local-condition</code></a> to <code>(not
+(python-syntax-comment-or-string-p))</code> in <code>python-mode-hook</code>.
 </p>
 
 <p>
 Then, what if you really want some particular snippet to expand even
-inside a comment? Set <a href="snippet-reference.html#yas-buffer-local-condition"><code>yas-buffer-local-condition</code></a> like this
+inside a comment?  Set <a href="snippet-reference.html#yas-buffer-local-condition"><code>yas-buffer-local-condition</code></a> like this
 </p>
 
 <div class="org-src-container">
 
 <pre class="src src-emacs-lisp">(add-hook 'python-mode-hook
           (<span class="org-keyword">lambda</span> ()
-            (setq yas-buffer-local-condition
-                  '(<span class="org-keyword">if</span> (python-in-string/comment)
+            (<span class="org-keyword">setq</span> yas-buffer-local-condition
+                  '(<span class="org-keyword">if</span> (python-syntax-comment-or-string-p)
                        '(require-snippet-condition . force-in-comment)
                      t))))
 </pre>
 </div>
 
 <p>
-&#x2026; and specify the condition for a snippet that you're going to expand
-in comment to be evaluated to the symbol <code>force-in-comment</code>. Then it can
-be expanded as you expected, while other snippets like <code>if</code> still can't
-expanded in comment.
+&#x2026; and for a snippet that you want to expand in comments, specify a
+condition which evaluates to the symbol <code>force-in-comment</code>.  Then it
+can be expanded as you expected, while other snippets like <code>if</code> still
+can't expanded in comments.
 </p>
 
 <p>
@@ -568,7 +571,7 @@ can put in your emacs-file:
 
 <div class="org-src-container">
 
-<pre class="src src-emacs-lisp">(setq yas-prompt-functions '(yas-x-prompt yas-dropdown-prompt))
+<pre class="src src-emacs-lisp">(<span class="org-keyword">setq</span> yas-prompt-functions '(yas-x-prompt yas-dropdown-prompt))
 </pre>
 </div>
 
@@ -656,8 +659,7 @@ See the documentation on variable <a href="snippet-reference.html#yas-prompt-fun
 </div>
 </div>
 <div id="postamble" class="status">
-<hr><p class='creator'>Generated by <a href="http://www.gnu.org/software/emacs/">Emacs</a> 24.5.1 (<a href="http://orgmode.org">Org</a> mode 8.2.10) on  from df229b9ab8db87fe5a1133365fdc299a65f9be86
-</p>
+<hr><p class='creator'>Generated by <a href="http://www.gnu.org/software/emacs/">Emacs</a> 25.2.50.5 (<a href="http://orgmode.org">Org</a> mode 8.2.10) from 0.12.2 (2017-08-29 02:08:58)</p>
 <p class='xhtml-validation'><a href="http://validator.w3.org/check?uri=referer">Validate</a></p>
 </div>
 </body>
diff --git a/snippet-menu.html b/snippet-menu.html
index 5565f97..d7c8db9 100644
--- a/snippet-menu.html
+++ b/snippet-menu.html
@@ -4,7 +4,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
 <title>YASnippet menu</title>
-<!-- 2016-04-30 Sat 22:37 -->
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta  name="generator" content="Org-mode" />
 <style type="text/css">
@@ -140,7 +139,7 @@ for the JavaScript code in this tag.
 <nav>
   <ul class="center">
     <li> <a href="index.html">Overview</a>
-    <li> <a href="https://github.com/capitaomorte/yasnippet/blob/master/README.mdown">
+    <li> <a href="https://github.com/joaotavora/yasnippet/blob/master/README.mdown">
         Intro and Tutorial</a>
     <li class="center">Snippet
       <ul>
@@ -284,8 +283,7 @@ variables.
 </div>
 </div>
 <div id="postamble" class="status">
-<hr><p class='creator'>Generated by <a href="http://www.gnu.org/software/emacs/">Emacs</a> 24.5.1 (<a href="http://orgmode.org">Org</a> mode 8.2.10) on  from df229b9ab8db87fe5a1133365fdc299a65f9be86
-</p>
+<hr><p class='creator'>Generated by <a href="http://www.gnu.org/software/emacs/">Emacs</a> 25.2.50.5 (<a href="http://orgmode.org">Org</a> mode 8.2.10) from 0.12.2 (2017-08-29 02:08:58)</p>
 <p class='xhtml-validation'><a href="http://validator.w3.org/check?uri=referer">Validate</a></p>
 </div>
 </body>
diff --git a/snippet-organization.html b/snippet-organization.html
index ecc523a..03ca816 100644
--- a/snippet-organization.html
+++ b/snippet-organization.html
@@ -4,7 +4,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
 <title>Organizing snippets</title>
-<!-- 2016-04-30 Sat 22:37 -->
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta  name="generator" content="Org-mode" />
 <style type="text/css">
@@ -140,7 +139,7 @@ for the JavaScript code in this tag.
 <nav>
   <ul class="center">
     <li> <a href="index.html">Overview</a>
-    <li> <a href="https://github.com/capitaomorte/yasnippet/blob/master/README.mdown">
+    <li> <a href="https://github.com/joaotavora/yasnippet/blob/master/README.mdown">
         Intro and Tutorial</a>
     <li class="center">Snippet
       <ul>
@@ -228,11 +227,11 @@ out:
 
 <pre class="src src-emacs-lisp"><span class="org-comment-delimiter">;; </span><span class="org-comment">Develop in ~/emacs.d/mysnippets, but also</span>
 <span class="org-comment-delimiter">;; </span><span class="org-comment">try out snippets in ~/Downloads/interesting-snippets</span>
-(setq yas-snippet-dirs '(<span class="org-string">"~/emacs.d/mysnippets"</span>
+(<span class="org-keyword">setq</span> yas-snippet-dirs '(<span class="org-string">"~/emacs.d/mysnippets"</span>
                            <span class="org-string">"~/Downloads/interesting-snippets"</span>))
 
 <span class="org-comment-delimiter">;; </span><span class="org-comment">OR, keeping YASnippet defaults try out ~/Downloads/interesting-snippets</span>
-(setq yas-snippet-dirs (append yas-snippet-dirs
+(<span class="org-keyword">setq</span> yas-snippet-dirs (append yas-snippet-dirs
                                '(<span class="org-string">"~/Downloads/interesting-snippets"</span>)))
 </pre>
 </div>
@@ -359,8 +358,7 @@ not to load snippets from there.
 </div>
 </div>
 <div id="postamble" class="status">
-<hr><p class='creator'>Generated by <a href="http://www.gnu.org/software/emacs/">Emacs</a> 24.5.1 (<a href="http://orgmode.org">Org</a> mode 8.2.10) on  from df229b9ab8db87fe5a1133365fdc299a65f9be86
-</p>
+<hr><p class='creator'>Generated by <a href="http://www.gnu.org/software/emacs/">Emacs</a> 25.2.50.5 (<a href="http://orgmode.org">Org</a> mode 8.2.10) from 0.12.2 (2017-08-29 02:08:58)</p>
 <p class='xhtml-validation'><a href="http://validator.w3.org/check?uri=referer">Validate</a></p>
 </div>
 </body>
diff --git a/snippet-reference.html b/snippet-reference.html
index acebf86..926d784 100644
--- a/snippet-reference.html
+++ b/snippet-reference.html
@@ -4,7 +4,6 @@
 <html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en">
 <head>
 <title>Reference</title>
-<!-- 2016-04-30 Sat 22:37 -->
 <meta  http-equiv="Content-Type" content="text/html;charset=utf-8" />
 <meta  name="generator" content="Org-mode" />
 <style type="text/css">
@@ -140,7 +139,7 @@ for the JavaScript code in this tag.
 <nav>
   <ul class="center">
     <li> <a href="index.html">Overview</a>
-    <li> <a href="https://github.com/capitaomorte/yasnippet/blob/master/README.mdown">
+    <li> <a href="https://github.com/joaotavora/yasnippet/blob/master/README.mdown">
         Intro and Tutorial</a>
     <li class="center">Snippet
       <ul>
@@ -164,6 +163,7 @@ for the JavaScript code in this tag.
 <ul>
 <li><a href="#yas-abort-snippet"><code>yas-abort-snippet</code> (<i>&amp;optional</i> <code>snippet</code>)</a></li>
 <li><a href="#yas-visit-snippet-file"><code>yas-visit-snippet-file</code> ()</a></li>
+<li><a href="#yas-describe-table-by-namehash"><code>yas-describe-table-by-namehash</code> ()</a></li>
 <li><a href="#yas-load-snippet-buffer"><code>yas-load-snippet-buffer</code> (<code>table</code> <i>&amp;optional</i> <code>interactive</code>)</a></li>
 <li><a href="#yas-global-mode"><code>yas-global-mode</code> (<i>&amp;optional</i> <code>arg</code>)</a></li>
 <li><a href="#yas-skip-and-clear-or-delete-char"><code>yas-skip-and-clear-or-delete-char</code> (<i>&amp;optional</i> <code>field</code>)</a></li>
@@ -184,7 +184,7 @@ for the JavaScript code in this tag.
 <li><a href="#yas-load-directory"><code>yas-load-directory</code> (<code>top-level-dir</code> <i>&amp;optional</i> <code>use-jit</code> <code>interactive</code>)</a></li>
 <li><a href="#yas-new-snippet"><code>yas-new-snippet</code> (<i>&amp;optional</i> <code>no-template</code>)</a></li>
 <li><a href="#yas-load-snippet-buffer-and-close"><code>yas-load-snippet-buffer-and-close</code> (<code>table</code> <i>&amp;optional</i> <code>kill</code>)</a></li>
-<li><a href="#yas-describe-tables"><code>yas-describe-tables</code> (<i>&amp;optional</i> <code>choose</code>)</a></li>
+<li><a href="#yas-describe-tables"><code>yas-describe-tables</code> (<i>&amp;optional</i> <code>with-nonactive</code>)</a></li>
 <li><a href="#yas-deactivate-extra-mode"><code>yas-deactivate-extra-mode</code> (<code>mode</code>)</a></li>
 <li><a href="#yas-next-field-or-maybe-expand"><code>yas-next-field-or-maybe-expand</code> ()</a></li>
 <li><a href="#yas-about"><code>yas-about</code> ()</a></li>
@@ -196,10 +196,13 @@ for the JavaScript code in this tag.
 <ul>
 <li><a href="#yas-choose-tables-first"><code>yas-choose-tables-first</code></a></li>
 <li><a href="#yas-snippet-revival"><code>yas-snippet-revival</code></a></li>
+<li><a href="#yas-overlay-priority"><code>yas-overlay-priority</code></a></li>
+<li><a href="#yas-alias-to-yas/prefix-p"><code>yas-alias-to-yas/prefix-p</code></a></li>
 <li><a href="#yas-also-auto-indent-first-line"><code>yas-also-auto-indent-first-line</code></a></li>
 <li><a href="#yas-new-snippet-default"><code>yas-new-snippet-default</code></a></li>
 <li><a href="#yas-choose-keys-first"><code>yas-choose-keys-first</code></a></li>
-<li><a href="#yas-fallback-behavior"><code>yas-fallback-behavior</code></a></li>
+<li><a href="#yas-buffer-local-condition"><code>yas-buffer-local-condition</code></a></li>
+<li><a href="#yas-also-indent-empty-lines"><code>yas-also-indent-empty-lines</code></a></li>
 <li><a href="#yas-wrap-around-region"><code>yas-wrap-around-region</code></a></li>
 <li><a href="#yas-prompt-functions"><code>yas-prompt-functions</code></a></li>
 <li><a href="#yas-visit-from-menu"><code>yas-visit-from-menu</code></a></li>
@@ -218,6 +221,7 @@ for the JavaScript code in this tag.
 <li><a href="#yas-completing-prompt"><code>yas-completing-prompt</code> (<code>prompt</code> <code>choices</code> <i>&amp;optional</i> <code>display-fn</code> <code>completion-fn</code>)</a></li>
 <li><a href="#yas-selected-text"><code>yas-selected-text</code> ()</a></li>
 <li><a href="#yas-hippie-try-expand"><code>yas-hippie-try-expand</code> (<code>first-time?</code>)</a></li>
+<li><a href="#yas-snippet-mode-buffer-p"><code>yas-snippet-mode-buffer-p</code> ()</a></li>
 <li><a href="#yas-global-mode-cmhh"><code>yas-global-mode-cmhh</code> ()</a></li>
 <li><a href="#yas-lookup-snippet"><code>yas-lookup-snippet</code> (<code>name</code> <i>&amp;optional</i> <code>mode</code> <code>noerror</code>)</a></li>
 <li><a href="#yas-throw"><code>yas-throw</code> (<code>text</code>)</a></li>
@@ -225,6 +229,7 @@ for the JavaScript code in this tag.
 <li><a href="#yas-next-field-will-exit-p"><code>yas-next-field-will-exit-p</code> (<i>&amp;optional</i> <code>arg</code>)</a></li>
 <li><a href="#yas-x-prompt"><code>yas-x-prompt</code> (<code>prompt</code> <code>choices</code> <i>&amp;optional</i> <code>display-fn</code>)</a></li>
 <li><a href="#yas-shortest-key-until-whitespace"><code>yas-shortest-key-until-whitespace</code> (<code>_start-point</code>)</a></li>
+<li><a href="#yas-maybe-load-snippet-buffer"><code>yas-maybe-load-snippet-buffer</code> ()</a></li>
 <li><a href="#yas-longest-key-from-whitespace"><code>yas-longest-key-from-whitespace</code> (<code>start-point</code>)</a></li>
 <li><a href="#yas-text"><code>yas-text</code> ()</a></li>
 <li><a href="#yas-ido-prompt"><code>yas-ido-prompt</code> (<code>prompt</code> <code>choices</code> <i>&amp;optional</i> <code>display-fn</code>)</a></li>
@@ -241,8 +246,10 @@ for the JavaScript code in this tag.
 <li><a href="#yas-field-value"><code>yas-field-value</code> (<code>number</code>)</a></li>
 <li><a href="#yas-verify-value"><code>yas-verify-value</code> (<code>possibilities</code>)</a></li>
 <li><a href="#yas-key-to-value"><code>yas-key-to-value</code> (<code>alist</code>)</a></li>
+<li><a href="#yas-escape-text"><code>yas-escape-text</code> (<code>text</code>)</a></li>
 <li><a href="#yas-choose-value"><code>yas-choose-value</code> (<i>&amp;rest</i> <code>possibilities</code>)</a></li>
 <li><a href="#yas-substr"><code>yas-substr</code> (<code>str</code> <code>pattern</code> <i>&amp;optional</i> <code>subexp</code>)</a></li>
+<li><a href="#yas-active-snippets"><code>yas-active-snippets</code> (<i>&amp;optional</i> <code>beg</code> <code>end</code>)</a></li>
 <li><a href="#yas-unimplemented"><code>yas-unimplemented</code> (<i>&amp;optional</i> <code>missing-feature</code>)</a></li>
 <li><a href="#yas-expand-snippet"><code>yas-expand-snippet</code> (<code>content</code> <i>&amp;optional</i> <code>start</code> <code>end</code> <code>expand-env</code>)</a></li>
 <li><a href="#yas-minor-mode-set-explicitly"><code>yas-minor-mode-set-explicitly</code> ()</a></li>
@@ -253,21 +260,23 @@ for the JavaScript code in this tag.
 <li><a href="#yas-global-mode-buffers"><code>yas-global-mode-buffers</code></a></li>
 <li><a href="#yas-after-reload-hook"><code>yas-after-reload-hook</code></a></li>
 <li><a href="#yas-snippet-beg"><code>yas-snippet-beg</code></a></li>
+<li><a href="#yas-maybe-expand"><code>yas-maybe-expand</code></a></li>
 <li><a href="#yas-after-exit-snippet-hook"><code>yas-after-exit-snippet-hook</code></a></li>
 <li><a href="#yas-global-mode-hook"><code>yas-global-mode-hook</code></a></li>
 <li><a href="#yas-minor-mode-map"><code>yas-minor-mode-map</code></a></li>
 <li><a href="#yas-moving-away-p"><code>yas-moving-away-p</code></a></li>
-<li><a href="#yas-buffer-local-condition"><code>yas-buffer-local-condition</code></a></li>
 <li><a href="#yas-modified-p"><code>yas-modified-p</code></a></li>
 <li><a href="#yas-before-expand-snippet-hook"><code>yas-before-expand-snippet-hook</code></a></li>
 <li><a href="#yas-keymap"><code>yas-keymap</code></a></li>
 <li><a href="#yas-key-syntaxes"><code>yas-key-syntaxes</code></a></li>
 <li><a href="#yas-snippet-end"><code>yas-snippet-end</code></a></li>
+<li><a href="#yas-not-string-or-comment-condition"><code>yas-not-string-or-comment-condition</code></a></li>
 <li><a href="#yas-dont-activate-functions"><code>yas-dont-activate-functions</code></a></li>
 <li><a href="#yas-minor-mode-hook"><code>yas-minor-mode-hook</code></a></li>
 <li><a href="#yas-verbosity"><code>yas-verbosity</code></a></li>
 <li><a href="#yas-minor-mode-major-mode"><code>yas-minor-mode-major-mode</code></a></li>
 <li><a href="#yas-installed-snippets-dir"><code>yas-installed-snippets-dir</code></a></li>
+<li><a href="#yas-maybe-expand-from-keymap"><code>yas-maybe-expand-from-keymap</code></a></li>
 </ul>
 </li>
 </ul>
@@ -300,25 +309,29 @@ visited file in <code>snippet-mode</code>.
 </div>
 </div>
 
+<div id="outline-container-yas-describe-table-by-namehash" class="outline-3">
+<h3 id="yas-describe-table-by-namehash"><a id="sec-1-3" name="sec-1-3"></a><code>yas-describe-table-by-namehash</code> ()</h3>
+<div class="outline-text-3" id="text-yas-describe-table-by-namehash">
+<p>
+Display snippet tables by <i>namehash</i>.
+</p>
+</div>
+</div>
+
 <div id="outline-container-yas-load-snippet-buffer" class="outline-3">
-<h3 id="yas-load-snippet-buffer"><a id="sec-1-3" name="sec-1-3"></a><code>yas-load-snippet-buffer</code> (<code>table</code> <i>&amp;optional</i> <code>interactive</code>)</h3>
+<h3 id="yas-load-snippet-buffer"><a id="sec-1-4" name="sec-1-4"></a><code>yas-load-snippet-buffer</code> (<code>table</code> <i>&amp;optional</i> <code>interactive</code>)</h3>
 <div class="outline-text-3" id="text-yas-load-snippet-buffer">
 <p>
 Parse and load current buffer's snippet definition into <code>table</code>.
-</p>
-
-<p>
-<code>table</code> is a symbol naming a passed to <code>yas--table-get-create</code>.
-</p>
-
-<p>
-When called interactively, prompt for the table name.
+<code>table</code> is a symbol name passed to <code>yas--table-get-create</code>.  When
+called interactively, prompt for the table name.
+Return the <code>yas--template</code> object created
 </p>
 </div>
 </div>
 
 <div id="outline-container-yas-global-mode" class="outline-3">
-<h3 id="yas-global-mode"><a id="sec-1-4" name="sec-1-4"></a><code>yas-global-mode</code> (<i>&amp;optional</i> <code>arg</code>)</h3>
+<h3 id="yas-global-mode"><a id="sec-1-5" name="sec-1-5"></a><code>yas-global-mode</code> (<i>&amp;optional</i> <code>arg</code>)</h3>
 <div class="outline-text-3" id="text-yas-global-mode">
 <p>
 Toggle Yas minor mode in all buffers.
@@ -336,7 +349,7 @@ See <a href="#yas-minor-mode"><code>yas-minor-mode</code></a> for more informati
 </div>
 
 <div id="outline-container-yas-skip-and-clear-or-delete-char" class="outline-3">
-<h3 id="yas-skip-and-clear-or-delete-char"><a id="sec-1-5" name="sec-1-5"></a><code>yas-skip-and-clear-or-delete-char</code> (<i>&amp;optional</i> <code>field</code>)</h3>
+<h3 id="yas-skip-and-clear-or-delete-char"><a id="sec-1-6" name="sec-1-6"></a><code>yas-skip-and-clear-or-delete-char</code> (<i>&amp;optional</i> <code>field</code>)</h3>
 <div class="outline-text-3" id="text-yas-skip-and-clear-or-delete-char">
 <p>
 Clears unmodified field if at field start, skips to next tab.
@@ -349,7 +362,7 @@ Otherwise deletes a character normally by calling <code>delete-char</code>.
 </div>
 
 <div id="outline-container-yas-next-field" class="outline-3">
-<h3 id="yas-next-field"><a id="sec-1-6" name="sec-1-6"></a><code>yas-next-field</code> (<i>&amp;optional</i> <code>arg</code>)</h3>
+<h3 id="yas-next-field"><a id="sec-1-7" name="sec-1-7"></a><code>yas-next-field</code> (<i>&amp;optional</i> <code>arg</code>)</h3>
 <div class="outline-text-3" id="text-yas-next-field">
 <p>
 Navigate to the <code>arg</code>th next field.
@@ -362,7 +375,7 @@ If there's none, exit the snippet.
 </div>
 
 <div id="outline-container-yas-insert-snippet" class="outline-3">
-<h3 id="yas-insert-snippet"><a id="sec-1-7" name="sec-1-7"></a><code>yas-insert-snippet</code> (<i>&amp;optional</i> <code>no-condition</code>)</h3>
+<h3 id="yas-insert-snippet"><a id="sec-1-8" name="sec-1-8"></a><code>yas-insert-snippet</code> (<i>&amp;optional</i> <code>no-condition</code>)</h3>
 <div class="outline-text-3" id="text-yas-insert-snippet">
 <p>
 Choose a snippet to expand, pop-up a list of choices according
@@ -377,7 +390,7 @@ by condition.
 </div>
 
 <div id="outline-container-yas-activate-extra-mode" class="outline-3">
-<h3 id="yas-activate-extra-mode"><a id="sec-1-8" name="sec-1-8"></a><code>yas-activate-extra-mode</code> (<code>mode</code>)</h3>
+<h3 id="yas-activate-extra-mode"><a id="sec-1-9" name="sec-1-9"></a><code>yas-activate-extra-mode</code> (<code>mode</code>)</h3>
 <div class="outline-text-3" id="text-yas-activate-extra-mode">
 <p>
 Activates the snippets for the given <code>mode</code> in the buffer.
@@ -391,7 +404,7 @@ activate snippets associated with that mode.
 </div>
 
 <div id="outline-container-yas-recompile-all" class="outline-3">
-<h3 id="yas-recompile-all"><a id="sec-1-9" name="sec-1-9"></a><code>yas-recompile-all</code> ()</h3>
+<h3 id="yas-recompile-all"><a id="sec-1-10" name="sec-1-10"></a><code>yas-recompile-all</code> ()</h3>
 <div class="outline-text-3" id="text-yas-recompile-all">
 <p>
 Compile every dir in <a href="#yas-snippet-dirs"><code>yas-snippet-dirs</code></a>.
@@ -400,7 +413,7 @@ Compile every dir in <a href="#yas-snippet-dirs"><code>yas-snippet-dirs</code></
 </div>
 
 <div id="outline-container-yas-compile-directory" class="outline-3">
-<h3 id="yas-compile-directory"><a id="sec-1-10" name="sec-1-10"></a><code>yas-compile-directory</code> (<code>top-level-dir</code>)</h3>
+<h3 id="yas-compile-directory"><a id="sec-1-11" name="sec-1-11"></a><code>yas-compile-directory</code> (<code>top-level-dir</code>)</h3>
 <div class="outline-text-3" id="text-yas-compile-directory">
 <p>
 Create .yas-compiled-snippets.el files under subdirs of <code>top-level-dir</code>.
@@ -414,7 +427,7 @@ This works by stubbing a few functions, then calling
 </div>
 
 <div id="outline-container-yas-direct-keymaps-reload" class="outline-3">
-<h3 id="yas-direct-keymaps-reload"><a id="sec-1-11" name="sec-1-11"></a><code>yas-direct-keymaps-reload</code> ()</h3>
+<h3 id="yas-direct-keymaps-reload"><a id="sec-1-12" name="sec-1-12"></a><code>yas-direct-keymaps-reload</code> ()</h3>
 <div class="outline-text-3" id="text-yas-direct-keymaps-reload">
 <p>
 Force reload the direct keybinding for active snippet tables.
@@ -423,7 +436,7 @@ Force reload the direct keybinding for active snippet tables.
 </div>
 
 <div id="outline-container-yas-exit-all-snippets" class="outline-3">
-<h3 id="yas-exit-all-snippets"><a id="sec-1-12" name="sec-1-12"></a><code>yas-exit-all-snippets</code> ()</h3>
+<h3 id="yas-exit-all-snippets"><a id="sec-1-13" name="sec-1-13"></a><code>yas-exit-all-snippets</code> ()</h3>
 <div class="outline-text-3" id="text-yas-exit-all-snippets">
 <p>
 Exit all snippets.
@@ -432,7 +445,7 @@ Exit all snippets.
 </div>
 
 <div id="outline-container-yas-tryout-snippet" class="outline-3">
-<h3 id="yas-tryout-snippet"><a id="sec-1-13" name="sec-1-13"></a><code>yas-tryout-snippet</code> (<i>&amp;optional</i> <code>debug</code>)</h3>
+<h3 id="yas-tryout-snippet"><a id="sec-1-14" name="sec-1-14"></a><code>yas-tryout-snippet</code> (<i>&amp;optional</i> <code>debug</code>)</h3>
 <div class="outline-text-3" id="text-yas-tryout-snippet">
 <p>
 Test current buffer's snippet template in other buffer.
@@ -441,7 +454,7 @@ Test current buffer's snippet template in other buffer.
 </div>
 
 <div id="outline-container-yas-exit-snippet" class="outline-3">
-<h3 id="yas-exit-snippet"><a id="sec-1-14" name="sec-1-14"></a><code>yas-exit-snippet</code> (<code>snippet</code>)</h3>
+<h3 id="yas-exit-snippet"><a id="sec-1-15" name="sec-1-15"></a><code>yas-exit-snippet</code> (<code>snippet</code>)</h3>
 <div class="outline-text-3" id="text-yas-exit-snippet">
 <p>
 Goto exit-marker of <code>snippet</code>.
@@ -450,11 +463,11 @@ Goto exit-marker of <code>snippet</code>.
 </div>
 
 <div id="outline-container-yas-expand" class="outline-3">
-<h3 id="yas-expand"><a id="sec-1-15" name="sec-1-15"></a><code>yas-expand</code> (<i>&amp;optional</i> <code>field</code>)</h3>
+<h3 id="yas-expand"><a id="sec-1-16" name="sec-1-16"></a><code>yas-expand</code> (<i>&amp;optional</i> <code>field</code>)</h3>
 <div class="outline-text-3" id="text-yas-expand">
 <p>
 Expand a snippet before point. If no snippet
-expansion is possible, defer to <a href="#yas-fallback-behavior"><code>yas-fallback-behavior</code></a> (which see).
+expansion is possible, defer to <code>yas-fallback-behavior</code> (which see).
 </p>
 
 <p>
@@ -465,7 +478,7 @@ object satisfying <code>yas--field-p</code> to restrict the expansion to.
 </div>
 
 <div id="outline-container-yas-expand-from-keymap" class="outline-3">
-<h3 id="yas-expand-from-keymap"><a id="sec-1-16" name="sec-1-16"></a><code>yas-expand-from-keymap</code> ()</h3>
+<h3 id="yas-expand-from-keymap"><a id="sec-1-17" name="sec-1-17"></a><code>yas-expand-from-keymap</code> ()</h3>
 <div class="outline-text-3" id="text-yas-expand-from-keymap">
 <p>
 Expand/run snippets from keymaps, possibly falling back to original binding.
@@ -475,7 +488,7 @@ Expand/run snippets from keymaps, possibly falling back to original binding.
 
 
 <div id="outline-container-yas-minor-mode" class="outline-3">
-<h3 id="yas-minor-mode"><a id="sec-1-17" name="sec-1-17"></a><code>yas-minor-mode</code> (<i>&amp;optional</i> <code>arg</code>)</h3>
+<h3 id="yas-minor-mode"><a id="sec-1-18" name="sec-1-18"></a><code>yas-minor-mode</code> (<i>&amp;optional</i> <code>arg</code>)</h3>
 <div class="outline-text-3" id="text-yas-minor-mode">
 <p>
 Toggle YASnippet mode.
@@ -501,7 +514,7 @@ Key bindings:
 </div>
 
 <div id="outline-container-yas-minor-mode-on" class="outline-3">
-<h3 id="yas-minor-mode-on"><a id="sec-1-18" name="sec-1-18"></a><code>yas-minor-mode-on</code> ()</h3>
+<h3 id="yas-minor-mode-on"><a id="sec-1-19" name="sec-1-19"></a><code>yas-minor-mode-on</code> ()</h3>
 <div class="outline-text-3" id="text-yas-minor-mode-on">
 <p>
 Turn on YASnippet minor mode.
@@ -514,7 +527,7 @@ Honour <a href="#yas-dont-activate-functions"><code>yas-dont-activate-functions<
 </div>
 
 <div id="outline-container-yas-reload-all" class="outline-3">
-<h3 id="yas-reload-all"><a id="sec-1-19" name="sec-1-19"></a><code>yas-reload-all</code> (<i>&amp;optional</i> <code>no-jit</code> <code>interactive</code>)</h3>
+<h3 id="yas-reload-all"><a id="sec-1-20" name="sec-1-20"></a><code>yas-reload-all</code> (<i>&amp;optional</i> <code>no-jit</code> <code>interactive</code>)</h3>
 <div class="outline-text-3" id="text-yas-reload-all">
 <p>
 Reload all snippets and rebuild the YASnippet menu.
@@ -534,7 +547,7 @@ prefix argument.
 </div>
 
 <div id="outline-container-yas-load-directory" class="outline-3">
-<h3 id="yas-load-directory"><a id="sec-1-20" name="sec-1-20"></a><code>yas-load-directory</code> (<code>top-level-dir</code> <i>&amp;optional</i> <code>use-jit</code> <code>interactive</code>)</h3>
+<h3 id="yas-load-directory"><a id="sec-1-21" name="sec-1-21"></a><code>yas-load-directory</code> (<code>top-level-dir</code> <i>&amp;optional</i> <code>use-jit</code> <code>interactive</code>)</h3>
 <div class="outline-text-3" id="text-yas-load-directory">
 <p>
 Load snippets in directory hierarchy <code>top-level-dir</code>.
@@ -551,7 +564,7 @@ With prefix argument <code>use-jit</code> do jit-loading of snippets.
 </div>
 
 <div id="outline-container-yas-new-snippet" class="outline-3">
-<h3 id="yas-new-snippet"><a id="sec-1-21" name="sec-1-21"></a><code>yas-new-snippet</code> (<i>&amp;optional</i> <code>no-template</code>)</h3>
+<h3 id="yas-new-snippet"><a id="sec-1-22" name="sec-1-22"></a><code>yas-new-snippet</code> (<i>&amp;optional</i> <code>no-template</code>)</h3>
 <div class="outline-text-3" id="text-yas-new-snippet">
 <p>
 Pops a new buffer for writing a snippet.
@@ -565,16 +578,13 @@ Expands a snippet-writing snippet, unless the optional prefix arg
 </div>
 
 <div id="outline-container-yas-load-snippet-buffer-and-close" class="outline-3">
-<h3 id="yas-load-snippet-buffer-and-close"><a id="sec-1-22" name="sec-1-22"></a><code>yas-load-snippet-buffer-and-close</code> (<code>table</code> <i>&amp;optional</i> <code>kill</code>)</h3>
+<h3 id="yas-load-snippet-buffer-and-close"><a id="sec-1-23" name="sec-1-23"></a><code>yas-load-snippet-buffer-and-close</code> (<code>table</code> <i>&amp;optional</i> <code>kill</code>)</h3>
 <div class="outline-text-3" id="text-yas-load-snippet-buffer-and-close">
 <p>
-Load the snippet with <a href="#yas-load-snippet-buffer"><code>yas-load-snippet-buffer</code></a>, possibly
-  save, then <code>quit-window</code> if saved.
-</p>
-
-<p>
-If the snippet is new, ask the user whether (and where) to save
-it. If the snippet already has a file, just save it.
+Load and save the snippet, then <code>quit-window</code> if saved.
+Loading is performed by <a href="#yas-load-snippet-buffer"><code>yas-load-snippet-buffer</code></a>.  If the
+snippet is new, ask the user whether (and where) to save it.  If
+the snippet already has a file, just save it.
 </p>
 
 <p>
@@ -589,7 +599,7 @@ and <code>kill-buffer</code> instead.
 </div>
 
 <div id="outline-container-yas-describe-tables" class="outline-3">
-<h3 id="yas-describe-tables"><a id="sec-1-23" name="sec-1-23"></a><code>yas-describe-tables</code> (<i>&amp;optional</i> <code>choose</code>)</h3>
+<h3 id="yas-describe-tables"><a id="sec-1-24" name="sec-1-24"></a><code>yas-describe-tables</code> (<i>&amp;optional</i> <code>with-nonactive</code>)</h3>
 <div class="outline-text-3" id="text-yas-describe-tables">
 <p>
 Display snippets for each table.
@@ -598,7 +608,7 @@ Display snippets for each table.
 </div>
 
 <div id="outline-container-yas-deactivate-extra-mode" class="outline-3">
-<h3 id="yas-deactivate-extra-mode"><a id="sec-1-24" name="sec-1-24"></a><code>yas-deactivate-extra-mode</code> (<code>mode</code>)</h3>
+<h3 id="yas-deactivate-extra-mode"><a id="sec-1-25" name="sec-1-25"></a><code>yas-deactivate-extra-mode</code> (<code>mode</code>)</h3>
 <div class="outline-text-3" id="text-yas-deactivate-extra-mode">
 <p>
 Deactivates the snippets for the given <code>mode</code> in the buffer.
@@ -607,7 +617,7 @@ Deactivates the snippets for the given <code>mode</code> in the buffer.
 </div>
 
 <div id="outline-container-yas-next-field-or-maybe-expand" class="outline-3">
-<h3 id="yas-next-field-or-maybe-expand"><a id="sec-1-25" name="sec-1-25"></a><code>yas-next-field-or-maybe-expand</code> ()</h3>
+<h3 id="yas-next-field-or-maybe-expand"><a id="sec-1-26" name="sec-1-26"></a><code>yas-next-field-or-maybe-expand</code> ()</h3>
 <div class="outline-text-3" id="text-yas-next-field-or-maybe-expand">
 <p>
 Try to expand a snippet at a key before point.
@@ -620,7 +630,7 @@ Otherwise delegate to <a href="#yas-next-field"><code>yas-next-field</code></a>.
 </div>
 
 <div id="outline-container-yas-about" class="outline-3">
-<h3 id="yas-about"><a id="sec-1-26" name="sec-1-26"></a><code>yas-about</code> ()</h3>
+<h3 id="yas-about"><a id="sec-1-27" name="sec-1-27"></a><code>yas-about</code> ()</h3>
 <div class="outline-text-3" id="text-yas-about">
 <p>
 <b><i>warning</i></b>: no doc for symbol <code>yas-about</code>
@@ -629,7 +639,7 @@ Otherwise delegate to <a href="#yas-next-field"><code>yas-next-field</code></a>.
 </div>
 
 <div id="outline-container-yas-prev-field" class="outline-3">
-<h3 id="yas-prev-field"><a id="sec-1-27" name="sec-1-27"></a><code>yas-prev-field</code> ()</h3>
+<h3 id="yas-prev-field"><a id="sec-1-28" name="sec-1-28"></a><code>yas-prev-field</code> ()</h3>
 <div class="outline-text-3" id="text-yas-prev-field">
 <p>
 Navigate to prev field.  If there's none, exit the snippet.
@@ -638,7 +648,7 @@ Navigate to prev field.  If there's none, exit the snippet.
 </div>
 
 <div id="outline-container-yas-expand-from-trigger-key" class="outline-3">
-<h3 id="yas-expand-from-trigger-key"><a id="sec-1-28" name="sec-1-28"></a><code>yas-expand-from-trigger-key</code> (<i>&amp;optional</i> <code>field</code>)</h3>
+<h3 id="yas-expand-from-trigger-key"><a id="sec-1-29" name="sec-1-29"></a><code>yas-expand-from-trigger-key</code> (<i>&amp;optional</i> <code>field</code>)</h3>
 <div class="outline-text-3" id="text-yas-expand-from-trigger-key">
 <p>
 Expand a snippet before point.
@@ -646,7 +656,7 @@ Expand a snippet before point.
 
 <p>
 If no snippet expansion is possible, fall back to the behaviour
-defined in <a href="#yas-fallback-behavior"><code>yas-fallback-behavior</code></a>.
+defined in <code>yas-fallback-behavior</code>.
 </p>
 
 <p>
@@ -686,21 +696,42 @@ Non-nil means re-activate snippet fields after undo/redo.
 </div>
 </div>
 
+<div id="outline-container-yas-overlay-priority" class="outline-3">
+<h3 id="yas-overlay-priority"><a id="sec-2-3" name="sec-2-3"></a><code>yas-overlay-priority</code></h3>
+<div class="outline-text-3" id="text-yas-overlay-priority">
+<p>
+Priority to use for yasnippets overlays.
+This is useful to control whether snippet navigation bindings
+override bindings from other packages (e.g., <code>company-mode</code>).
+</p>
+</div>
+</div>
+
+<div id="outline-container-yas-alias-to-yas/prefix-p" class="outline-3">
+<h3 id="yas-alias-to-yas/prefix-p"><a id="sec-2-4" name="sec-2-4"></a><code>yas-alias-to-yas/prefix-p</code></h3>
+<div class="outline-text-3" id="text-yas-alias-to-yas/prefix-p">
+<p>
+If non-nil make aliases for the old style yas/ prefixed symbols.
+It must be set to nil before loading yasnippet to take effect.
+</p>
+</div>
+</div>
+
 <div id="outline-container-yas-also-auto-indent-first-line" class="outline-3">
-<h3 id="yas-also-auto-indent-first-line"><a id="sec-2-3" name="sec-2-3"></a><code>yas-also-auto-indent-first-line</code></h3>
+<h3 id="yas-also-auto-indent-first-line"><a id="sec-2-5" name="sec-2-5"></a><code>yas-also-auto-indent-first-line</code></h3>
 <div class="outline-text-3" id="text-yas-also-auto-indent-first-line">
 <p>
 Non-nil means also auto indent first line according to mode.
 </p>
 
 <p>
-Naturally this is only valid when <a href="#yas-indent-line"><code>yas-indent-line</code></a> is <code>auto</code>
+Naturally this is only valid when <a href="#yas-indent-line"><code>yas-indent-line</code></a> is <code>auto</code>.
 </p>
 </div>
 </div>
 
 <div id="outline-container-yas-new-snippet-default" class="outline-3">
-<h3 id="yas-new-snippet-default"><a id="sec-2-4" name="sec-2-4"></a><code>yas-new-snippet-default</code></h3>
+<h3 id="yas-new-snippet-default"><a id="sec-2-6" name="sec-2-6"></a><code>yas-new-snippet-default</code></h3>
 <div class="outline-text-3" id="text-yas-new-snippet-default">
 <p>
 Default snippet to use when creating a new snippet.
@@ -710,7 +741,7 @@ If nil, don't use any snippet.
 </div>
 
 <div id="outline-container-yas-choose-keys-first" class="outline-3">
-<h3 id="yas-choose-keys-first"><a id="sec-2-5" name="sec-2-5"></a><code>yas-choose-keys-first</code></h3>
+<h3 id="yas-choose-keys-first"><a id="sec-2-7" name="sec-2-7"></a><code>yas-choose-keys-first</code></h3>
 <div class="outline-text-3" id="text-yas-choose-keys-first">
 <p>
 If non-nil, prompt for snippet key first, then for template.
@@ -726,33 +757,98 @@ This affects <a href="#yas-insert-snippet"><code>yas-insert-snippet</code></a> a
 </div>
 </div>
 
-<div id="outline-container-yas-fallback-behavior" class="outline-3">
-<h3 id="yas-fallback-behavior"><a id="sec-2-6" name="sec-2-6"></a><code>yas-fallback-behavior</code></h3>
-<div class="outline-text-3" id="text-yas-fallback-behavior">
+<div id="outline-container-yas-buffer-local-condition" class="outline-3">
+<h3 id="yas-buffer-local-condition"><a id="sec-2-8" name="sec-2-8"></a><code>yas-buffer-local-condition</code></h3>
+<div class="outline-text-3" id="text-yas-buffer-local-condition">
 <p>
-How to act when <a href="#yas-expand"><code>yas-expand</code></a> does <b>not</b> expand a snippet.
+Snippet expanding condition.
+</p>
+
+<p>
+This variable is a Lisp form which is evaluated every time a
+snippet expansion is attempted:
 </p>
 
 <ul class="org-ul">
-<li><code>call-other-command</code> means try to temporarily disable YASnippet
-and call the next command bound to whatever key was used to
-invoke <a href="#yas-expand"><code>yas-expand</code></a>.
+<li>If it evaluates to nil, no snippets can be expanded.
 </li>
 
-<li>nil or the symbol <code>return-nil</code> mean do nothing. (and
-<a href="#yas-expand"><code>yas-expand</code></a> returns nil)
+<li>If it evaluates to the a cons (require-snippet-condition
+. <i>requirement</i>)
+
+<ul class="org-ul">
+<li>Snippets bearing no "# condition:" directive are not
+considered
 </li>
 
-<li>A Lisp form (apply <i>command</i> . <i>args</i>) means interactively call
-<i>command</i>. If <i>args</i> is non-nil, call <i>command</i> non-interactively
-with <i>args</i> as arguments.
+<li>Snippets bearing conditions that evaluate to nil (or
+produce an error) won't be considered.
+</li>
+
+<li>If the snippet has a condition that evaluates to non-nil
+<i>result</i>:
+
+<ul class="org-ul">
+<li>If <i>requirement</i> is t, the snippet is considered
+</li>
+
+<li>If <i>requirement</i> is <code>eq</code> <i>result</i>, the snippet is
+considered
+</li>
+
+<li>Otherwise, the snippet is not considered.
 </li>
 </ul>
+</li>
+</ul>
+</li>
+
+<li>If it evaluates to the symbol <code>always</code>, all snippets are
+considered for expansion, regardless of any conditions.
+</li>
+
+<li>If it evaluates to t or some other non-nil value
+
+<ul class="org-ul">
+<li>Snippet bearing no conditions, or conditions that
+evaluate to non-nil, are considered for expansion.
+</li>
+
+<li>Otherwise, the snippet is not considered.
+</li>
+</ul>
+</li>
+</ul>
+
+<p>
+Here's an example preventing snippets from being expanded from
+inside comments, in <code>python-mode</code> only, with the exception of
+snippets returning the symbol <code>force-in-comment</code> in their
+conditions.
+</p>
+
+<p>
+(add-hook \='python-mode-hook
+          (lambda ()
+             (setq yas-buffer-local-condition
+                   \='(if (python-syntax-comment-or-string-p)
+                        \='(require-snippet-condition . force-in-comment)
+                      t))))
+</p>
+</div>
+</div>
+
+<div id="outline-container-yas-also-indent-empty-lines" class="outline-3">
+<h3 id="yas-also-indent-empty-lines"><a id="sec-2-9" name="sec-2-9"></a><code>yas-also-indent-empty-lines</code></h3>
+<div class="outline-text-3" id="text-yas-also-indent-empty-lines">
+<p>
+Non-nil means also indent empty lines according to mode.
+</p>
 </div>
 </div>
 
 <div id="outline-container-yas-wrap-around-region" class="outline-3">
-<h3 id="yas-wrap-around-region"><a id="sec-2-7" name="sec-2-7"></a><code>yas-wrap-around-region</code></h3>
+<h3 id="yas-wrap-around-region"><a id="sec-2-10" name="sec-2-10"></a><code>yas-wrap-around-region</code></h3>
 <div class="outline-text-3" id="text-yas-wrap-around-region">
 <p>
 What to insert for snippet's $0 field.
@@ -768,7 +864,7 @@ per-snippet basis.  A value of <code>cua</code> is considered equivalent to
 </div>
 
 <div id="outline-container-yas-prompt-functions" class="outline-3">
-<h3 id="yas-prompt-functions"><a id="sec-2-8" name="sec-2-8"></a><code>yas-prompt-functions</code></h3>
+<h3 id="yas-prompt-functions"><a id="sec-2-11" name="sec-2-11"></a><code>yas-prompt-functions</code></h3>
 <div class="outline-text-3" id="text-yas-prompt-functions">
 <p>
 Functions to prompt for keys, templates, etc interactively.
@@ -816,13 +912,13 @@ signal <code>quit</code> with
 </p>
 
 <p>
-(signal 'quit "user quit!").
+(signal \='quit "user quit!").
 </p>
 </div>
 </div>
 
 <div id="outline-container-yas-visit-from-menu" class="outline-3">
-<h3 id="yas-visit-from-menu"><a id="sec-2-9" name="sec-2-9"></a><code>yas-visit-from-menu</code></h3>
+<h3 id="yas-visit-from-menu"><a id="sec-2-12" name="sec-2-12"></a><code>yas-visit-from-menu</code></h3>
 <div class="outline-text-3" id="text-yas-visit-from-menu">
 <p>
 If non-nil visit snippets's files from menu, instead of expanding them.
@@ -835,7 +931,7 @@ This can only work when snippets are loaded from files.
 </div>
 
 <div id="outline-container-yas-triggers-in-field" class="outline-3">
-<h3 id="yas-triggers-in-field"><a id="sec-2-10" name="sec-2-10"></a><code>yas-triggers-in-field</code></h3>
+<h3 id="yas-triggers-in-field"><a id="sec-2-13" name="sec-2-13"></a><code>yas-triggers-in-field</code></h3>
 <div class="outline-text-3" id="text-yas-triggers-in-field">
 <p>
 If non-nil, allow stacked expansions (snippets inside snippets).
@@ -849,7 +945,7 @@ next field
 </div>
 
 <div id="outline-container-yas-trigger-symbol" class="outline-3">
-<h3 id="yas-trigger-symbol"><a id="sec-2-11" name="sec-2-11"></a><code>yas-trigger-symbol</code></h3>
+<h3 id="yas-trigger-symbol"><a id="sec-2-14" name="sec-2-14"></a><code>yas-trigger-symbol</code></h3>
 <div class="outline-text-3" id="text-yas-trigger-symbol">
 <p>
 The text that will be used in menu to represent the trigger.
@@ -858,7 +954,7 @@ The text that will be used in menu to represent the trigger.
 </div>
 
 <div id="outline-container-yas-use-menu" class="outline-3">
-<h3 id="yas-use-menu"><a id="sec-2-12" name="sec-2-12"></a><code>yas-use-menu</code></h3>
+<h3 id="yas-use-menu"><a id="sec-2-15" name="sec-2-15"></a><code>yas-use-menu</code></h3>
 <div class="outline-text-3" id="text-yas-use-menu">
 <p>
 Display a YASnippet menu in the menu bar.
@@ -881,7 +977,7 @@ menu and the modes set in <code>yas--extra-modes</code> are listed.
 <li>If set to <code>full</code>, every submenu is listed
 </li>
 
-<li>If set to <code>nil</code>, hide the menu.
+<li>If set to nil, hide the menu.
 </li>
 </ul>
 
@@ -892,7 +988,7 @@ Any other non-nil value, every submenu is listed.
 </div>
 
 <div id="outline-container-yas-indent-line" class="outline-3">
-<h3 id="yas-indent-line"><a id="sec-2-13" name="sec-2-13"></a><code>yas-indent-line</code></h3>
+<h3 id="yas-indent-line"><a id="sec-2-16" name="sec-2-16"></a><code>yas-indent-line</code></h3>
 <div class="outline-text-3" id="text-yas-indent-line">
 <p>
 Controls indenting applied to a recent snippet expansion.
@@ -919,7 +1015,7 @@ applies).
 </div>
 
 <div id="outline-container-yas-expand-only-for-last-commands" class="outline-3">
-<h3 id="yas-expand-only-for-last-commands"><a id="sec-2-14" name="sec-2-14"></a><code>yas-expand-only-for-last-commands</code></h3>
+<h3 id="yas-expand-only-for-last-commands"><a id="sec-2-17" name="sec-2-17"></a><code>yas-expand-only-for-last-commands</code></h3>
 <div class="outline-text-3" id="text-yas-expand-only-for-last-commands">
 <p>
 List of <code>last-command</code> values to restrict tab-triggering to, or nil.
@@ -932,7 +1028,7 @@ using whichever commands.
 </p>
 
 <p>
-Optionally, set this to something like '(self-insert-command) if
+Optionally, set this to something like (self-insert-command) if
 you to wish restrict expansion to only happen when the last
 letter of the snippet tab trigger was typed immediately before
 the trigger key itself.
@@ -941,7 +1037,7 @@ the trigger key itself.
 </div>
 
 <div id="outline-container-yas-snippet-dirs" class="outline-3">
-<h3 id="yas-snippet-dirs"><a id="sec-2-15" name="sec-2-15"></a><code>yas-snippet-dirs</code> ()</h3>
+<h3 id="yas-snippet-dirs"><a id="sec-2-18" name="sec-2-18"></a><code>yas-snippet-dirs</code> ()</h3>
 <div class="outline-text-3" id="text-yas-snippet-dirs">
 <p>
 Return variable <a href="#yas-snippet-dirs"><code>yas-snippet-dirs</code></a> as list of strings.
@@ -950,14 +1046,23 @@ Return variable <a href="#yas-snippet-dirs"><code>yas-snippet-dirs</code></a> as
 </div>
 
 <div id="outline-container-yas-good-grace" class="outline-3">
-<h3 id="yas-good-grace"><a id="sec-2-16" name="sec-2-16"></a><code>yas-good-grace</code></h3>
+<h3 id="yas-good-grace"><a id="sec-2-19" name="sec-2-19"></a><code>yas-good-grace</code></h3>
 <div class="outline-text-3" id="text-yas-good-grace">
 <p>
-If non-nil, don't raise errors in inline elisp evaluation.
+If non-nil, don't raise errors in elisp evaluation.
 </p>
 
 <p>
-An error string "[yas] error" is returned instead.
+This affects both the inline elisp in snippets and the hook
+variables such as <a href="#yas-after-exit-snippet-hook"><code>yas-after-exit-snippet-hook</code></a>.
+</p>
+
+<p>
+If this variable's value is <code>inline</code>, an error string "[yas]
+error" is returned instead of raising the error.  If this
+variable's value is <code>hooks</code>, a message is output to according to
+<code>yas-verbosity-level</code>.  If this variable's value is t, both are
+active.
 </p>
 </div>
 </div>
@@ -1005,8 +1110,19 @@ Just put this function in <code>hippie-expand-try-functions-list</code>.
 </div>
 </div>
 
+<div id="outline-container-yas-snippet-mode-buffer-p" class="outline-3">
+<h3 id="yas-snippet-mode-buffer-p"><a id="sec-3-5" name="sec-3-5"></a><code>yas-snippet-mode-buffer-p</code> ()</h3>
+<div class="outline-text-3" id="text-yas-snippet-mode-buffer-p">
+<p>
+Return non-nil if current buffer should be in <code>snippet-mode</code>.
+Meaning it's visiting a file under one of the mode directories in
+<a href="#yas-snippet-dirs"><code>yas-snippet-dirs</code></a>.
+</p>
+</div>
+</div>
+
 <div id="outline-container-yas-global-mode-cmhh" class="outline-3">
-<h3 id="yas-global-mode-cmhh"><a id="sec-3-5" name="sec-3-5"></a><code>yas-global-mode-cmhh</code> ()</h3>
+<h3 id="yas-global-mode-cmhh"><a id="sec-3-6" name="sec-3-6"></a><code>yas-global-mode-cmhh</code> ()</h3>
 <div class="outline-text-3" id="text-yas-global-mode-cmhh">
 <p>
 <b><i>warning</i></b>: no doc for symbol <code>yas-global-mode-cmhh</code>
@@ -1015,7 +1131,7 @@ Just put this function in <code>hippie-expand-try-functions-list</code>.
 </div>
 
 <div id="outline-container-yas-lookup-snippet" class="outline-3">
-<h3 id="yas-lookup-snippet"><a id="sec-3-6" name="sec-3-6"></a><code>yas-lookup-snippet</code> (<code>name</code> <i>&amp;optional</i> <code>mode</code> <code>noerror</code>)</h3>
+<h3 id="yas-lookup-snippet"><a id="sec-3-7" name="sec-3-7"></a><code>yas-lookup-snippet</code> (<code>name</code> <i>&amp;optional</i> <code>mode</code> <code>noerror</code>)</h3>
 <div class="outline-text-3" id="text-yas-lookup-snippet">
 <p>
 Get the snippet content for the snippet <code>name</code> in <code>mode</code>'s tables.
@@ -1034,16 +1150,16 @@ Honours <a href="#yas-buffer-local-condition"><code>yas-buffer-local-condition</
 </div>
 
 <div id="outline-container-yas-throw" class="outline-3">
-<h3 id="yas-throw"><a id="sec-3-7" name="sec-3-7"></a><code>yas-throw</code> (<code>text</code>)</h3>
+<h3 id="yas-throw"><a id="sec-3-8" name="sec-3-8"></a><code>yas-throw</code> (<code>text</code>)</h3>
 <div class="outline-text-3" id="text-yas-throw">
 <p>
-Throw a yas&#x2013;exception with <code>text</code> as the reason.
+Signal <code>yas-exception</code> with <code>text</code> as the reason.
 </p>
 </div>
 </div>
 
 <div id="outline-container-yas-inside-string" class="outline-3">
-<h3 id="yas-inside-string"><a id="sec-3-8" name="sec-3-8"></a><code>yas-inside-string</code> ()</h3>
+<h3 id="yas-inside-string"><a id="sec-3-9" name="sec-3-9"></a><code>yas-inside-string</code> ()</h3>
 <div class="outline-text-3" id="text-yas-inside-string">
 <p>
 Return non-nil if the point is inside a string according to font-lock.
@@ -1052,7 +1168,7 @@ Return non-nil if the point is inside a string according to font-lock.
 </div>
 
 <div id="outline-container-yas-next-field-will-exit-p" class="outline-3">
-<h3 id="yas-next-field-will-exit-p"><a id="sec-3-9" name="sec-3-9"></a><code>yas-next-field-will-exit-p</code> (<i>&amp;optional</i> <code>arg</code>)</h3>
+<h3 id="yas-next-field-will-exit-p"><a id="sec-3-10" name="sec-3-10"></a><code>yas-next-field-will-exit-p</code> (<i>&amp;optional</i> <code>arg</code>)</h3>
 <div class="outline-text-3" id="text-yas-next-field-will-exit-p">
 <p>
 Return non-nil if (yas-next-field <code>arg</code>) would exit the current snippet.
@@ -1061,7 +1177,7 @@ Return non-nil if (yas-next-field <code>arg</code>) would exit the current snipp
 </div>
 
 <div id="outline-container-yas-x-prompt" class="outline-3">
-<h3 id="yas-x-prompt"><a id="sec-3-10" name="sec-3-10"></a><code>yas-x-prompt</code> (<code>prompt</code> <code>choices</code> <i>&amp;optional</i> <code>display-fn</code>)</h3>
+<h3 id="yas-x-prompt"><a id="sec-3-11" name="sec-3-11"></a><code>yas-x-prompt</code> (<code>prompt</code> <code>choices</code> <i>&amp;optional</i> <code>display-fn</code>)</h3>
 <div class="outline-text-3" id="text-yas-x-prompt">
 <p>
 Display choices in a x-window prompt.
@@ -1070,7 +1186,7 @@ Display choices in a x-window prompt.
 </div>
 
 <div id="outline-container-yas-shortest-key-until-whitespace" class="outline-3">
-<h3 id="yas-shortest-key-until-whitespace"><a id="sec-3-11" name="sec-3-11"></a><code>yas-shortest-key-until-whitespace</code> (<code>_start-point</code>)</h3>
+<h3 id="yas-shortest-key-until-whitespace"><a id="sec-3-12" name="sec-3-12"></a><code>yas-shortest-key-until-whitespace</code> (<code>_start-point</code>)</h3>
 <div class="outline-text-3" id="text-yas-shortest-key-until-whitespace">
 <p>
 Like <a href="#yas-longest-key-from-whitespace"><code>yas-longest-key-from-whitespace</code></a> but take the shortest key.
@@ -1078,8 +1194,17 @@ Like <a href="#yas-longest-key-from-whitespace"><code>yas-longest-key-from-white
 </div>
 </div>
 
+<div id="outline-container-yas-maybe-load-snippet-buffer" class="outline-3">
+<h3 id="yas-maybe-load-snippet-buffer"><a id="sec-3-13" name="sec-3-13"></a><code>yas-maybe-load-snippet-buffer</code> ()</h3>
+<div class="outline-text-3" id="text-yas-maybe-load-snippet-buffer">
+<p>
+Added to <code>after-save-hook</code> in <code>snippet-mode</code>.
+</p>
+</div>
+</div>
+
 <div id="outline-container-yas-longest-key-from-whitespace" class="outline-3">
-<h3 id="yas-longest-key-from-whitespace"><a id="sec-3-12" name="sec-3-12"></a><code>yas-longest-key-from-whitespace</code> (<code>start-point</code>)</h3>
+<h3 id="yas-longest-key-from-whitespace"><a id="sec-3-14" name="sec-3-14"></a><code>yas-longest-key-from-whitespace</code> (<code>start-point</code>)</h3>
 <div class="outline-text-3" id="text-yas-longest-key-from-whitespace">
 <p>
 As <a href="#yas-key-syntaxes"><code>yas-key-syntaxes</code></a> element, look for longest key between point and whitespace.
@@ -1093,7 +1218,7 @@ marks it as something else (typically comment ender).
 </div>
 
 <div id="outline-container-yas-text" class="outline-3">
-<h3 id="yas-text"><a id="sec-3-13" name="sec-3-13"></a><code>yas-text</code> ()</h3>
+<h3 id="yas-text"><a id="sec-3-15" name="sec-3-15"></a><code>yas-text</code> ()</h3>
 <div class="outline-text-3" id="text-yas-text">
 <p>
 Return <a href="#yas-text"><code>yas-text</code></a> if that exists and is non-empty, else nil.
@@ -1102,7 +1227,7 @@ Return <a href="#yas-text"><code>yas-text</code></a> if that exists and is non-e
 </div>
 
 <div id="outline-container-yas-ido-prompt" class="outline-3">
-<h3 id="yas-ido-prompt"><a id="sec-3-14" name="sec-3-14"></a><code>yas-ido-prompt</code> (<code>prompt</code> <code>choices</code> <i>&amp;optional</i> <code>display-fn</code>)</h3>
+<h3 id="yas-ido-prompt"><a id="sec-3-16" name="sec-3-16"></a><code>yas-ido-prompt</code> (<code>prompt</code> <code>choices</code> <i>&amp;optional</i> <code>display-fn</code>)</h3>
 <div class="outline-text-3" id="text-yas-ido-prompt">
 <p>
 <b><i>warning</i></b>: no doc for symbol <code>yas-ido-prompt</code>
@@ -1111,7 +1236,7 @@ Return <a href="#yas-text"><code>yas-text</code></a> if that exists and is non-e
 </div>
 
 <div id="outline-container-yas-try-key-from-whitespace" class="outline-3">
-<h3 id="yas-try-key-from-whitespace"><a id="sec-3-15" name="sec-3-15"></a><code>yas-try-key-from-whitespace</code> (<code>_start-point</code>)</h3>
+<h3 id="yas-try-key-from-whitespace"><a id="sec-3-17" name="sec-3-17"></a><code>yas-try-key-from-whitespace</code> (<code>_start-point</code>)</h3>
 <div class="outline-text-3" id="text-yas-try-key-from-whitespace">
 <p>
 As <a href="#yas-key-syntaxes"><code>yas-key-syntaxes</code></a> element, look for whitespace delimited key.
@@ -1125,7 +1250,7 @@ marks it as something else (typically comment ender).
 </div>
 
 <div id="outline-container-yas-maybe-ido-prompt" class="outline-3">
-<h3 id="yas-maybe-ido-prompt"><a id="sec-3-16" name="sec-3-16"></a><code>yas-maybe-ido-prompt</code> (<code>prompt</code> <code>choices</code> <i>&amp;optional</i> <code>display-fn</code>)</h3>
+<h3 id="yas-maybe-ido-prompt"><a id="sec-3-18" name="sec-3-18"></a><code>yas-maybe-ido-prompt</code> (<code>prompt</code> <code>choices</code> <i>&amp;optional</i> <code>display-fn</code>)</h3>
 <div class="outline-text-3" id="text-yas-maybe-ido-prompt">
 <p>
 <b><i>warning</i></b>: no doc for symbol <code>yas-maybe-ido-prompt</code>
@@ -1134,7 +1259,7 @@ marks it as something else (typically comment ender).
 </div>
 
 <div id="outline-container-yas-dropdown-prompt" class="outline-3">
-<h3 id="yas-dropdown-prompt"><a id="sec-3-17" name="sec-3-17"></a><code>yas-dropdown-prompt</code> (<code>_prompt</code> <code>choices</code> <i>&amp;optional</i> <code>display-fn</code>)</h3>
+<h3 id="yas-dropdown-prompt"><a id="sec-3-19" name="sec-3-19"></a><code>yas-dropdown-prompt</code> (<code>_prompt</code> <code>choices</code> <i>&amp;optional</i> <code>display-fn</code>)</h3>
 <div class="outline-text-3" id="text-yas-dropdown-prompt">
 <p>
 <b><i>warning</i></b>: no doc for symbol <code>yas-dropdown-prompt</code>
@@ -1143,7 +1268,7 @@ marks it as something else (typically comment ender).
 </div>
 
 <div id="outline-container-yas-define-snippets" class="outline-3">
-<h3 id="yas-define-snippets"><a id="sec-3-18" name="sec-3-18"></a><code>yas-define-snippets</code> (<code>mode</code> <code>snippets</code>)</h3>
+<h3 id="yas-define-snippets"><a id="sec-3-20" name="sec-3-20"></a><code>yas-define-snippets</code> (<code>mode</code> <code>snippets</code>)</h3>
 <div class="outline-text-3" id="text-yas-define-snippets">
 <p>
 Define <code>snippets</code> for <code>mode</code>.
@@ -1170,7 +1295,7 @@ this is a snippet or a snippet-command.
 <p>
 <i>condition</i>, <i>expand-env</i> and <i>keybinding</i> are Lisp forms, they have
 been <code>yas--read-lisp</code>-ed and will eventually be
-<code>yas--eval-lisp</code>-ed.
+<code>yas--eval-for-string</code>-ed.
 </p>
 
 <p>
@@ -1195,7 +1320,7 @@ the current buffers contents.
 </div>
 
 <div id="outline-container-yas-global-mode-enable-in-buffers" class="outline-3">
-<h3 id="yas-global-mode-enable-in-buffers"><a id="sec-3-19" name="sec-3-19"></a><code>yas-global-mode-enable-in-buffers</code> ()</h3>
+<h3 id="yas-global-mode-enable-in-buffers"><a id="sec-3-21" name="sec-3-21"></a><code>yas-global-mode-enable-in-buffers</code> ()</h3>
 <div class="outline-text-3" id="text-yas-global-mode-enable-in-buffers">
 <p>
 <b><i>warning</i></b>: no doc for symbol <code>yas-global-mode-enable-in-buffers</code>
@@ -1204,7 +1329,7 @@ the current buffers contents.
 </div>
 
 <div id="outline-container-yas-no-prompt" class="outline-3">
-<h3 id="yas-no-prompt"><a id="sec-3-20" name="sec-3-20"></a><code>yas-no-prompt</code> (<code>_prompt</code> <code>choices</code> <i>&amp;optional</i> <code>_display-fn</code>)</h3>
+<h3 id="yas-no-prompt"><a id="sec-3-22" name="sec-3-22"></a><code>yas-no-prompt</code> (<code>_prompt</code> <code>choices</code> <i>&amp;optional</i> <code>_display-fn</code>)</h3>
 <div class="outline-text-3" id="text-yas-no-prompt">
 <p>
 <b><i>warning</i></b>: no doc for symbol <code>yas-no-prompt</code>
@@ -1213,7 +1338,7 @@ the current buffers contents.
 </div>
 
 <div id="outline-container-yas-active-keys" class="outline-3">
-<h3 id="yas-active-keys"><a id="sec-3-21" name="sec-3-21"></a><code>yas-active-keys</code> ()</h3>
+<h3 id="yas-active-keys"><a id="sec-3-23" name="sec-3-23"></a><code>yas-active-keys</code> ()</h3>
 <div class="outline-text-3" id="text-yas-active-keys">
 <p>
 Return all active trigger keys for current buffer and point.
@@ -1222,7 +1347,7 @@ Return all active trigger keys for current buffer and point.
 </div>
 
 <div id="outline-container-yas-define-condition-cache" class="outline-3">
-<h3 id="yas-define-condition-cache"><a id="sec-3-22" name="sec-3-22"></a><code>yas-define-condition-cache</code> (<code>func</code> <code>doc</code> <i>&amp;rest</i> <code>body</code>)</h3>
+<h3 id="yas-define-condition-cache"><a id="sec-3-24" name="sec-3-24"></a><code>yas-define-condition-cache</code> (<code>func</code> <code>doc</code> <i>&amp;rest</i> <code>body</code>)</h3>
 <div class="outline-text-3" id="text-yas-define-condition-cache">
 <p>
 Define a function <code>func</code> with doc <code>doc</code> and body <code>body</code>.
@@ -1237,7 +1362,7 @@ It doesn't make any sense to call <code>func</code> programatically.
 </div>
 
 <div id="outline-container-yas-global-mode-check-buffers" class="outline-3">
-<h3 id="yas-global-mode-check-buffers"><a id="sec-3-23" name="sec-3-23"></a><code>yas-global-mode-check-buffers</code> ()</h3>
+<h3 id="yas-global-mode-check-buffers"><a id="sec-3-25" name="sec-3-25"></a><code>yas-global-mode-check-buffers</code> ()</h3>
 <div class="outline-text-3" id="text-yas-global-mode-check-buffers">
 <p>
 <b><i>warning</i></b>: no doc for symbol <code>yas-global-mode-check-buffers</code>
@@ -1246,7 +1371,7 @@ It doesn't make any sense to call <code>func</code> programatically.
 </div>
 
 <div id="outline-container-yas-define-menu" class="outline-3">
-<h3 id="yas-define-menu"><a id="sec-3-24" name="sec-3-24"></a><code>yas-define-menu</code> (<code>mode</code> <code>menu</code> <i>&amp;optional</i> <code>omit-items</code>)</h3>
+<h3 id="yas-define-menu"><a id="sec-3-26" name="sec-3-26"></a><code>yas-define-menu</code> (<code>mode</code> <code>menu</code> <i>&amp;optional</i> <code>omit-items</code>)</h3>
 <div class="outline-text-3" id="text-yas-define-menu">
 <p>
 Define a snippet menu for <code>mode</code> according to <code>menu</code>, omitting <code>omit-items</code>.
@@ -1272,14 +1397,14 @@ list of groups of the snippets defined thereafter.
 </ul>
 
 <p>
-<code>omit-items</code> is a list of snippet uuid's that will always be
+<code>omit-items</code> is a list of snippet uuids that will always be
 omitted from <code>mode</code>'s menu, even if they're manually loaded.
 </p>
 </div>
 </div>
 
 <div id="outline-container-yas-field-value" class="outline-3">
-<h3 id="yas-field-value"><a id="sec-3-25" name="sec-3-25"></a><code>yas-field-value</code> (<code>number</code>)</h3>
+<h3 id="yas-field-value"><a id="sec-3-27" name="sec-3-27"></a><code>yas-field-value</code> (<code>number</code>)</h3>
 <div class="outline-text-3" id="text-yas-field-value">
 <p>
 Get the string for field with <code>number</code>.
@@ -1292,20 +1417,17 @@ Use this in primary and mirror transformations to tget.
 </div>
 
 <div id="outline-container-yas-verify-value" class="outline-3">
-<h3 id="yas-verify-value"><a id="sec-3-26" name="sec-3-26"></a><code>yas-verify-value</code> (<code>possibilities</code>)</h3>
+<h3 id="yas-verify-value"><a id="sec-3-28" name="sec-3-28"></a><code>yas-verify-value</code> (<code>possibilities</code>)</h3>
 <div class="outline-text-3" id="text-yas-verify-value">
 <p>
 Verify that the current field value is in <code>possibilities</code>.
-</p>
-
-<p>
-Otherwise throw exception.
+Otherwise signal <code>yas-exception</code>.
 </p>
 </div>
 </div>
 
 <div id="outline-container-yas-key-to-value" class="outline-3">
-<h3 id="yas-key-to-value"><a id="sec-3-27" name="sec-3-27"></a><code>yas-key-to-value</code> (<code>alist</code>)</h3>
+<h3 id="yas-key-to-value"><a id="sec-3-29" name="sec-3-29"></a><code>yas-key-to-value</code> (<code>alist</code>)</h3>
 <div class="outline-text-3" id="text-yas-key-to-value">
 <p>
 <b><i>warning</i></b>: no doc for symbol <code>yas-key-to-value</code>
@@ -1313,8 +1435,17 @@ Otherwise throw exception.
 </div>
 </div>
 
+<div id="outline-container-yas-escape-text" class="outline-3">
+<h3 id="yas-escape-text"><a id="sec-3-30" name="sec-3-30"></a><code>yas-escape-text</code> (<code>text</code>)</h3>
+<div class="outline-text-3" id="text-yas-escape-text">
+<p>
+Escape <code>text</code> for snippet.
+</p>
+</div>
+</div>
+
 <div id="outline-container-yas-choose-value" class="outline-3">
-<h3 id="yas-choose-value"><a id="sec-3-28" name="sec-3-28"></a><code>yas-choose-value</code> (<i>&amp;rest</i> <code>possibilities</code>)</h3>
+<h3 id="yas-choose-value"><a id="sec-3-31" name="sec-3-31"></a><code>yas-choose-value</code> (<i>&amp;rest</i> <code>possibilities</code>)</h3>
 <div class="outline-text-3" id="text-yas-choose-value">
 <p>
 Prompt for a string in <code>possibilities</code> and return it.
@@ -1327,7 +1458,7 @@ The last element of <code>possibilities</code> may be a list of strings.
 </div>
 
 <div id="outline-container-yas-substr" class="outline-3">
-<h3 id="yas-substr"><a id="sec-3-29" name="sec-3-29"></a><code>yas-substr</code> (<code>str</code> <code>pattern</code> <i>&amp;optional</i> <code>subexp</code>)</h3>
+<h3 id="yas-substr"><a id="sec-3-32" name="sec-3-32"></a><code>yas-substr</code> (<code>str</code> <code>pattern</code> <i>&amp;optional</i> <code>subexp</code>)</h3>
 <div class="outline-text-3" id="text-yas-substr">
 <p>
 Search <code>pattern</code> in <code>str</code> and return <code>subexp</code>th match.
@@ -1340,8 +1471,26 @@ If found, the content of subexp group <code>subexp</code> (default 0) is
 </div>
 </div>
 
+<div id="outline-container-yas-active-snippets" class="outline-3">
+<h3 id="yas-active-snippets"><a id="sec-3-33" name="sec-3-33"></a><code>yas-active-snippets</code> (<i>&amp;optional</i> <code>beg</code> <code>end</code>)</h3>
+<div class="outline-text-3" id="text-yas-active-snippets">
+<p>
+Return a sorted list of active snippets.
+The most recently-inserted snippets are returned first.
+</p>
+
+<p>
+Only snippets overlapping the region <code>beg</code> &#x2026; <code>end</code> are returned.
+Overlapping has the same meaning as described in <code>overlays-in</code>.
+If <code>end</code> is omitted, it defaults to (1+ <code>beg</code>).  If <code>beg</code> is omitted,
+it defaults to point.  A non-nil, non-buffer position <code>beg</code> is
+equivalent to a range covering the whole buffer.
+</p>
+</div>
+</div>
+
 <div id="outline-container-yas-unimplemented" class="outline-3">
-<h3 id="yas-unimplemented"><a id="sec-3-30" name="sec-3-30"></a><code>yas-unimplemented</code> (<i>&amp;optional</i> <code>missing-feature</code>)</h3>
+<h3 id="yas-unimplemented"><a id="sec-3-34" name="sec-3-34"></a><code>yas-unimplemented</code> (<i>&amp;optional</i> <code>missing-feature</code>)</h3>
 <div class="outline-text-3" id="text-yas-unimplemented">
 <p>
 <b><i>warning</i></b>: no doc for symbol <code>yas-unimplemented</code>
@@ -1350,7 +1499,7 @@ If found, the content of subexp group <code>subexp</code> (default 0) is
 </div>
 
 <div id="outline-container-yas-expand-snippet" class="outline-3">
-<h3 id="yas-expand-snippet"><a id="sec-3-31" name="sec-3-31"></a><code>yas-expand-snippet</code> (<code>content</code> <i>&amp;optional</i> <code>start</code> <code>end</code> <code>expand-env</code>)</h3>
+<h3 id="yas-expand-snippet"><a id="sec-3-35" name="sec-3-35"></a><code>yas-expand-snippet</code> (<code>content</code> <i>&amp;optional</i> <code>start</code> <code>end</code> <code>expand-env</code>)</h3>
 <div class="outline-text-3" id="text-yas-expand-snippet">
 <p>
 Expand snippet <code>content</code> at current point.
@@ -1365,7 +1514,7 @@ considered when expanding the snippet.
 </div>
 
 <div id="outline-container-yas-minor-mode-set-explicitly" class="outline-3">
-<h3 id="yas-minor-mode-set-explicitly"><a id="sec-3-32" name="sec-3-32"></a><code>yas-minor-mode-set-explicitly</code> ()</h3>
+<h3 id="yas-minor-mode-set-explicitly"><a id="sec-3-36" name="sec-3-36"></a><code>yas-minor-mode-set-explicitly</code> ()</h3>
 <div class="outline-text-3" id="text-yas-minor-mode-set-explicitly">
 <p>
 <b><i>warning</i></b>: no doc for symbol <code>yas-minor-mode-set-explicitly</code>
@@ -1403,8 +1552,20 @@ Beginning position of the last snippet committed.
 </div>
 </div>
 
+<div id="outline-container-yas-maybe-expand" class="outline-3">
+<h3 id="yas-maybe-expand"><a id="sec-4-4" name="sec-4-4"></a><code>yas-maybe-expand</code></h3>
+<div class="outline-text-3" id="text-yas-maybe-expand">
+<p>
+A conditional key definition.
+This can be used as a key definition in keymaps to bind a key to
+<a href="#yas-expand"><code>yas-expand</code></a> only when there is a snippet available to be
+expanded.
+</p>
+</div>
+</div>
+
 <div id="outline-container-yas-after-exit-snippet-hook" class="outline-3">
-<h3 id="yas-after-exit-snippet-hook"><a id="sec-4-4" name="sec-4-4"></a><code>yas-after-exit-snippet-hook</code></h3>
+<h3 id="yas-after-exit-snippet-hook"><a id="sec-4-5" name="sec-4-5"></a><code>yas-after-exit-snippet-hook</code></h3>
 <div class="outline-text-3" id="text-yas-after-exit-snippet-hook">
 <p>
 Hooks to run after a snippet exited.
@@ -1430,7 +1591,7 @@ Attention: These hooks are not run when exiting nested/stacked snippet expansion
 </div>
 
 <div id="outline-container-yas-global-mode-hook" class="outline-3">
-<h3 id="yas-global-mode-hook"><a id="sec-4-5" name="sec-4-5"></a><code>yas-global-mode-hook</code></h3>
+<h3 id="yas-global-mode-hook"><a id="sec-4-6" name="sec-4-6"></a><code>yas-global-mode-hook</code></h3>
 <div class="outline-text-3" id="text-yas-global-mode-hook">
 <p>
 Hook run after entering or leaving <a href="#yas-global-mode"><code>yas-global-mode</code></a>.
@@ -1441,7 +1602,7 @@ No problems result if this variable is not bound.
 </div>
 
 <div id="outline-container-yas-minor-mode-map" class="outline-3">
-<h3 id="yas-minor-mode-map"><a id="sec-4-6" name="sec-4-6"></a><code>yas-minor-mode-map</code></h3>
+<h3 id="yas-minor-mode-map"><a id="sec-4-7" name="sec-4-7"></a><code>yas-minor-mode-map</code></h3>
 <div class="outline-text-3" id="text-yas-minor-mode-map">
 <p>
 The keymap used when <a href="#yas-minor-mode"><code>yas-minor-mode</code></a> is active.
@@ -1450,7 +1611,7 @@ The keymap used when <a href="#yas-minor-mode"><code>yas-minor-mode</code></a> i
 </div>
 
 <div id="outline-container-yas-moving-away-p" class="outline-3">
-<h3 id="yas-moving-away-p"><a id="sec-4-7" name="sec-4-7"></a><code>yas-moving-away-p</code></h3>
+<h3 id="yas-moving-away-p"><a id="sec-4-8" name="sec-4-8"></a><code>yas-moving-away-p</code></h3>
 <div class="outline-text-3" id="text-yas-moving-away-p">
 <p>
 Non-nil if user is about to exit field.
@@ -1458,94 +1619,6 @@ Non-nil if user is about to exit field.
 </div>
 </div>
 
-<div id="outline-container-yas-buffer-local-condition" class="outline-3">
-<h3 id="yas-buffer-local-condition"><a id="sec-4-8" name="sec-4-8"></a><code>yas-buffer-local-condition</code></h3>
-<div class="outline-text-3" id="text-yas-buffer-local-condition">
-<p>
-Snippet expanding condition.
-</p>
-
-<p>
-This variable is a Lisp form which is evaluated every time a
-snippet expansion is attempted:
-</p>
-
-<ul class="org-ul">
-<li>If it evaluates to nil, no snippets can be expanded.
-</li>
-
-<li>If it evaluates to the a cons (require-snippet-condition
-. <i>requirement</i>)
-
-<ul class="org-ul">
-<li>Snippets bearing no "# condition:" directive are not
-considered
-</li>
-
-<li>Snippets bearing conditions that evaluate to nil (or
-produce an error) won't be considered.
-</li>
-
-<li>If the snippet has a condition that evaluates to non-nil
-<i>result</i>:
-
-<ul class="org-ul">
-<li>If <i>requirement</i> is t, the snippet is considered
-</li>
-
-<li>If <i>requirement</i> is <code>eq</code> <i>result</i>, the snippet is
-considered
-</li>
-
-<li>Otherwise, the snippet is not considered.
-</li>
-</ul>
-</li>
-</ul>
-</li>
-
-<li>If it evaluates to the symbol 'always, all snippets are
-considered for expansion, regardless of any conditions.
-</li>
-
-<li>If it evaluates to t or some other non-nil value
-
-<ul class="org-ul">
-<li>Snippet bearing no conditions, or conditions that
-evaluate to non-nil, are considered for expansion.
-</li>
-
-<li>Otherwise, the snippet is not considered.
-</li>
-</ul>
-</li>
-</ul>
-
-<p>
-Here's an example preventing snippets from being expanded from
-inside comments, in <code>python-mode</code> only, with the exception of
-snippets returning the symbol 'force-in-comment in their
-conditions.
-</p>
-
-<p>
-(add-hook 'python-mode-hook
-          (lambda ()
-             (setq yas-buffer-local-condition
-                   '(if (python-in-string/comment)
-                        '(require-snippet-condition . force-in-comment)
-                      t))))
-</p>
-
-<p>
-The default value is similar, it filters out potential snippet
-expansions inside comments and string literals, unless the
-snippet itself contains a condition that returns the symbol
-<code>force-in-comment</code>.
-</p>
-</div>
-</div>
-
 <div id="outline-container-yas-modified-p" class="outline-3">
 <h3 id="yas-modified-p"><a id="sec-4-9" name="sec-4-9"></a><code>yas-modified-p</code></h3>
 <div class="outline-text-3" id="text-yas-modified-p">
@@ -1607,7 +1680,7 @@ may once more reposition point.
 </p>
 
 <p>
-For example, if <a href="#yas-key-syntaxes"><code>yas-key-syntaxes</code></a>' value is '("w" "w_"),
+For example, if <a href="#yas-key-syntaxes"><code>yas-key-syntaxes</code></a> has the value ("w" "w_"),
 trigger keys composed exclusively of "word"-syntax characters
 are looked for first. Failing that, longer keys composed of
 "word" or "symbol" syntax are looked for. Therefore,
@@ -1642,8 +1715,18 @@ End position of the last snippet committed.
 </div>
 </div>
 
+<div id="outline-container-yas-not-string-or-comment-condition" class="outline-3">
+<h3 id="yas-not-string-or-comment-condition"><a id="sec-4-14" name="sec-4-14"></a><code>yas-not-string-or-comment-condition</code></h3>
+<div class="outline-text-3" id="text-yas-not-string-or-comment-condition">
+<p>
+Disables snippet expansion in strings and comments.
+To use, set <a href="#yas-buffer-local-condition"><code>yas-buffer-local-condition</code></a> to this value.
+</p>
+</div>
+</div>
+
 <div id="outline-container-yas-dont-activate-functions" class="outline-3">
-<h3 id="yas-dont-activate-functions"><a id="sec-4-14" name="sec-4-14"></a><code>yas-dont-activate-functions</code></h3>
+<h3 id="yas-dont-activate-functions"><a id="sec-4-15" name="sec-4-15"></a><code>yas-dont-activate-functions</code></h3>
 <div class="outline-text-3" id="text-yas-dont-activate-functions">
 <p>
 Special hook to control which buffers <a href="#yas-global-mode"><code>yas-global-mode</code></a> affects.
@@ -1669,7 +1752,7 @@ mode's hook.
 </div>
 
 <div id="outline-container-yas-minor-mode-hook" class="outline-3">
-<h3 id="yas-minor-mode-hook"><a id="sec-4-15" name="sec-4-15"></a><code>yas-minor-mode-hook</code></h3>
+<h3 id="yas-minor-mode-hook"><a id="sec-4-16" name="sec-4-16"></a><code>yas-minor-mode-hook</code></h3>
 <div class="outline-text-3" id="text-yas-minor-mode-hook">
 <p>
 Hook run after entering or leaving <a href="#yas-minor-mode"><code>yas-minor-mode</code></a>.
@@ -1680,7 +1763,7 @@ No problems result if this variable is not bound.
 </div>
 
 <div id="outline-container-yas-verbosity" class="outline-3">
-<h3 id="yas-verbosity"><a id="sec-4-16" name="sec-4-16"></a><code>yas-verbosity</code></h3>
+<h3 id="yas-verbosity"><a id="sec-4-17" name="sec-4-17"></a><code>yas-verbosity</code></h3>
 <div class="outline-text-3" id="text-yas-verbosity">
 <p>
 Log level for <code>yas--message</code> 4 means trace most anything, 0 means nothing.
@@ -1689,7 +1772,7 @@ Log level for <code>yas--message</code> 4 means trace most anything, 0 means not
 </div>
 
 <div id="outline-container-yas-minor-mode-major-mode" class="outline-3">
-<h3 id="yas-minor-mode-major-mode"><a id="sec-4-17" name="sec-4-17"></a><code>yas-minor-mode-major-mode</code></h3>
+<h3 id="yas-minor-mode-major-mode"><a id="sec-4-18" name="sec-4-18"></a><code>yas-minor-mode-major-mode</code></h3>
 <div class="outline-text-3" id="text-yas-minor-mode-major-mode">
 <p>
 <b><i>warning</i></b>: no doc for symbol <code>yas-minor-mode-major-mode</code>
@@ -1698,18 +1781,26 @@ Log level for <code>yas--message</code> 4 means trace most anything, 0 means not
 </div>
 
 <div id="outline-container-yas-installed-snippets-dir" class="outline-3">
-<h3 id="yas-installed-snippets-dir"><a id="sec-4-18" name="sec-4-18"></a><code>yas-installed-snippets-dir</code></h3>
+<h3 id="yas-installed-snippets-dir"><a id="sec-4-19" name="sec-4-19"></a><code>yas-installed-snippets-dir</code></h3>
 <div class="outline-text-3" id="text-yas-installed-snippets-dir">
 <p>
 <b><i>warning</i></b>: no doc for symbol <code>yas-installed-snippets-dir</code>
 </p>
 </div>
 </div>
+
+<div id="outline-container-yas-maybe-expand-from-keymap" class="outline-3">
+<h3 id="yas-maybe-expand-from-keymap"><a id="sec-4-20" name="sec-4-20"></a><code>yas-maybe-expand-from-keymap</code></h3>
+<div class="outline-text-3" id="text-yas-maybe-expand-from-keymap">
+<p>
+<b><i>warning</i></b>: no doc for symbol <code>yas-maybe-expand-from-keymap</code>
+</p>
+</div>
+</div>
 </div>
 </div>
 <div id="postamble" class="status">
-<hr><p class='creator'>Generated by <a href="http://www.gnu.org/software/emacs/">Emacs</a> 24.5.1 (<a href="http://orgmode.org">Org</a> mode 8.2.10) on  from df229b9ab8db87fe5a1133365fdc299a65f9be86
-</p>
+<hr><p class='creator'>Generated by <a href="http://www.gnu.org/software/emacs/">Emacs</a> 25.2.50.5 (<a href="http://orgmode.org">Org</a> mode 8.2.10) from 0.12.2 (2017-08-29 02:08:58)</p>
 <p class='xhtml-validation'><a href="http://validator.w3.org/check?uri=referer">Validate</a></p>
 </div>
 </body>
