From 7518cb46211692ecd14e774c7c3a8b5dee0c633c Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Fri, 6 Dec 2013 12:56:02 -0500
Subject: [PATCH 01/83] rake doc:upload: check for wrong/incomplete rev

---
 .gitignore            |  1 +
 Rakefile              | 11 ++++++++++-
 doc/yas-doc-helper.el | 12 ++++++------
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index c433a57..3ce1c40 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 authors.txt
 doc/gh-pages
 doc/*.html
+doc/html-revision
 pkg/
 extras/imported/**
 !extras/imported/*/.yas-setup.el
diff --git a/Rakefile b/Rakefile
index 278120d..7300d6b 100644
--- a/Rakefile
+++ b/Rakefile
@@ -67,7 +67,16 @@ namespace :doc do
       Dir.glob("doc/images/*").each do |file|
         FileUtils.cp file, 'doc/gh-pages/images'
       end
-      rev = `git rev-parse --verify HEAD`
+      curRev = `git rev-parse --verify HEAD`.chomp()
+      expRev = IO.read('doc/html-revision').chomp()
+      if curRev != expRev
+        raise ("The HTML rev: #{expRev},\n" +
+               "current  rev: #{curRev}!\n")
+      end
+      if !system "git diff-index --quiet HEAD"
+        system "git status --untracked-files=no"
+        raise "You have uncommitted changes!"
+      end
       Dir.chdir 'doc/gh-pages' do
         sh "git commit -a -m 'Automatic documentation update.\n\n" +
           "From #{rev.chomp()}'"
diff --git a/doc/yas-doc-helper.el b/doc/yas-doc-helper.el
index d504f67..495bf9e 100755
--- a/doc/yas-doc-helper.el
+++ b/doc/yas-doc-helper.el
@@ -114,13 +114,13 @@
 ;; This lets all the org files be exported to HTML with
 ;; `org-publish-current-project' (C-c C-e P).
 
-(let* ((rev (or (with-temp-buffer
-                  (when (eq (call-process "git" nil t nil
-                                          "rev-parse" "--verify" "HEAD") 0)
-                    (buffer-string)))
-                yas--version))
-       (dir (if load-file-name (file-name-directory load-file-name)
+(let* ((dir (if load-file-name (file-name-directory load-file-name)
               default-directory))
+       (rev (with-temp-file (expand-file-name "html-revision" dir)
+              (or (when (eq (call-process "git" nil t nil
+                                          "rev-parse" "--verify" "HEAD") 0)
+                    (buffer-string))
+                  (princ yas--version (current-buffer)))))
        (proj-plist
         (list
          :base-directory dir :publishing-directory dir

From d89e837d68cd8466f5017a816e10c131fc80a992 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Tue, 10 Dec 2013 22:50:49 -0500
Subject: [PATCH 02/83] add top level menu, minimal styling

---
 doc/nav-menu.html.inc      | 15 +++++++++++++++
 doc/org-setup.inc          |  2 +-
 doc/stylesheets/manual.css | 26 ++++++++++++++++++++++++++
 doc/yas-doc-helper.el      |  4 ++++
 4 files changed, 46 insertions(+), 1 deletion(-)
 create mode 100644 doc/nav-menu.html.inc
 create mode 100644 doc/stylesheets/manual.css

diff --git a/doc/nav-menu.html.inc b/doc/nav-menu.html.inc
new file mode 100644
index 0000000..a0d8a3e
--- /dev/null
+++ b/doc/nav-menu.html.inc
@@ -0,0 +1,15 @@
+<nav>
+  <ul class="center">
+    <li> <a href="index.html">Overview</a>
+    <li> <a href="https://github.com/capitaomorte/yasnippet/blob/master/README.mdown">
+        Intro and Tutorial</a>
+    <li class="center">Snippet
+      <ul>
+        <li> <a href="snippet-organization.html">Organization</a>
+        <li> <a href="snippet-expansion.html">Expansion</a>
+        <li> <a href="snippet-development.html">Development</a>
+        <li> <a href="snippet-menu.html">Menu</a>
+      </ul>
+    <li> <a href="faq.html">FAQ</a>
+  </ul>
+</nav>
diff --git a/doc/org-setup.inc b/doc/org-setup.inc
index 96b7028..98f7c04 100644
--- a/doc/org-setup.inc
+++ b/doc/org-setup.inc
@@ -4,6 +4,6 @@
 
 #+LINK: sym file:snippet-reference.org::#%s
 
-#+LINK_HOME: ./index.html
 #+OPTIONS: author:nil num:nil
 #+AUTHOR:
+#+STYLE: <link rel="stylesheet" type="text/css" href="stylesheets/manual.css" />
diff --git a/doc/stylesheets/manual.css b/doc/stylesheets/manual.css
new file mode 100644
index 0000000..f2677c5
--- /dev/null
+++ b/doc/stylesheets/manual.css
@@ -0,0 +1,26 @@
+nav > ul > li.center > ul {
+    padding: 0;
+}
+
+nav li {
+    vertical-align: top;
+
+    display: inline;
+    list-style-type: none;
+    padding: 0.5em;
+}
+
+nav > ul > li {
+    display: inline-block;
+}
+
+/* match org's css for <pre> */
+code {
+    background-color: #F3F5F7;
+    font-family: courier, monospace;
+}
+
+#content {
+    margin-left: 5%;
+    margin-right: 10%;
+}
diff --git a/doc/yas-doc-helper.el b/doc/yas-doc-helper.el
index 495bf9e..a782c1f 100755
--- a/doc/yas-doc-helper.el
+++ b/doc/yas-doc-helper.el
@@ -124,6 +124,10 @@
        (proj-plist
         (list
          :base-directory dir :publishing-directory dir
+         :html-preamble
+         (with-temp-buffer
+           (insert-file-contents (expand-file-name "nav-menu.html.inc" dir))
+           (buffer-string))
          :html-postamble
          (concat "<hr><p class='creator'>Generated by %c on %d from "
                  rev "</p>\n"

From 260ecf9c3a4a8960d48cedf8c9bc80fbdf925528 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Tue, 10 Dec 2013 22:52:34 -0500
Subject: [PATCH 03/83] fix a faq title

---
 doc/faq.org | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/doc/faq.org b/doc/faq.org
index cc889e1..79249e8 100644
--- a/doc/faq.org
+++ b/doc/faq.org
@@ -134,8 +134,7 @@ This is also the default value starting for that version. It skips the
 minor mode in buffers where it is not applicable (no snippet tables),
 but only once you have setup your yas-root-directory.
 
-* How do I define an abbrev key containing characters not supported by
-the filesystem?
+* How do I define an abbrev key containing characters not supported by the filesystem?
 
 -  *Note*: This question applies if you're still defining snippets
    whose key /is/ the filename. This is behavior still provided by

From b944cc9b12ff88ebbe36a4de6fa73116d1fc2fb5 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Tue, 10 Dec 2013 23:02:53 -0500
Subject: [PATCH 04/83] fix rake doc:upload

---
 Rakefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index 7300d6b..53fc55e 100644
--- a/Rakefile
+++ b/Rakefile
@@ -79,7 +79,7 @@ namespace :doc do
       end
       Dir.chdir 'doc/gh-pages' do
         sh "git commit -a -m 'Automatic documentation update.\n\n" +
-          "From #{rev.chomp()}'"
+          "From #{curRev.chomp()}'"
         sh "git push"
       end
     end

From 46b4a0267369321bad7601dd2ff08a483d9e0e91 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Tue, 10 Dec 2013 23:10:16 -0500
Subject: [PATCH 05/83] doc:upload stylesheets/*.css to gh-pages

---
 Rakefile | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Rakefile b/Rakefile
index 53fc55e..3f94a9a 100644
--- a/Rakefile
+++ b/Rakefile
@@ -67,6 +67,9 @@ namespace :doc do
       Dir.glob("doc/images/*").each do |file|
         FileUtils.cp file, 'doc/gh-pages/images'
       end
+      Dir.glob("doc/stylesheets/*.css").each do |file|
+        FileUtils.cp file, 'doc/gh-pages/stylesheets'
+      end
       curRev = `git rev-parse --verify HEAD`.chomp()
       expRev = IO.read('doc/html-revision').chomp()
       if curRev != expRev

From 6c752a1572989a7ba1cc4879ed0671f872733485 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Thu, 12 Dec 2013 23:19:21 -0500
Subject: [PATCH 06/83] populate yas--exported-syms based on sym prefix

Rename what was formerly yas--exported-syms to yas--backported-syms,
and remove yas--dont-backport.
---
 yasnippet.el | 30 ++++++++++++++++++++----------
 1 file changed, 20 insertions(+), 10 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index 85715fd..68908d6 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -4442,7 +4442,7 @@ and return the directory.  Return nil if not found."
 
 ;;; Backward compatibility to yasnippet <= 0.7
 
-(defvar yas--exported-syms '(;; `defcustom's
+(defvar yas--backported-syms '(;; `defcustom's
                              ;;
                              yas-snippet-dirs
                              yas-prompt-functions
@@ -4532,7 +4532,6 @@ and return the directory.  Return nil if not found."
                              yas-unimplemented
                              yas-define-condition-cache
                              yas-hippie-try-expand
-                             yas-active-keys
 
                              ;; debug definitions
                              ;; yas-debug-snippet-vars
@@ -4549,16 +4548,11 @@ and return the directory.  Return nil if not found."
                              ;; yas-call-with-snippet-dirs
                              ;; yas-with-snippet-dirs
 )
-  "Exported yasnippet symbols.
+  "Backported yasnippet symbols.
 
-i.e. ones that I will try to keep in future yasnippet versions
-and ones that other elisp libraries can more or less safely rely
-upon.")
+They are mapped to \"yas/*\" variants.")
 
-(defvar yas--dont-backport '(yas-active-keys)
-  "Exported symbols that don't map back to \"yas/*\" variants.")
-
-(dolist (sym (set-difference yas--exported-syms yas--dont-backport))
+(dolist (sym yas--backported-syms)
   (let ((backported (intern (replace-regexp-in-string "^yas-" "yas/" (symbol-name sym)))))
     (when (boundp sym)
       (make-obsolete-variable backported sym "yasnippet 0.8")
@@ -4567,6 +4561,22 @@ upon.")
       (make-obsolete backported sym "yasnippet 0.8")
       (defalias backported sym))))
 
+(defvar yas--exported-syms
+  (let (exported)
+    (mapatoms (lambda (atom)
+                (if (and (or (and (boundp atom)
+                                  (not (get atom 'byte-obsolete-variable)))
+                             (and (fboundp atom)
+                                  (not (get atom 'byte-obsolete-info))))
+                         (string-match-p "^yas-[^-]" (symbol-name atom)))
+                    (push atom exported))))
+    exported)
+  "Exported yasnippet symbols.
+
+i.e. the ones with \"yas-\" single dash prefix. I will try to
+keep them in future yasnippet versions and other elisp libraries
+can more or less safely rely upon them.")
+
 
 (provide 'yasnippet)
 

From 90e7595c745e38c5f473672089147f62be3f42f4 Mon Sep 17 00:00:00 2001
From: dongxiong <chdongxiong@gmail.com>
Date: Fri, 20 Dec 2013 13:06:37 +0800
Subject: [PATCH 07/83] yas-text export twice

Something different between line 4521 and line 4528? I am not sure about this.
---
 yasnippet.el | 1 -
 1 file changed, 1 deletion(-)

diff --git a/yasnippet.el b/yasnippet.el
index 85715fd..49514da 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -4518,7 +4518,6 @@ and return the directory.  Return nil if not found."
                              yas-snippet-end
                              yas-modified-p
                              yas-moving-away-p
-                             yas-text
                              yas-substr
                              yas-choose-value
                              yas-key-to-value

From 49166572c8e55ed0e20388bbfea96a88a09e7cfc Mon Sep 17 00:00:00 2001
From: Renaud AUBIN <root@renaud.io>
Date: Tue, 24 Dec 2013 09:57:30 +0100
Subject: [PATCH 08/83] Use https instead of ssh for submodules access

To enable direct access through a proxy, the submodules url definitions
need to use https instead of ssh.
---
 .gitmodules | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitmodules b/.gitmodules
index 80584ea..607033b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,6 @@
 [submodule "snippets"]
-	path = snippets
-	url = git@github.com:AndreaCrotti/yasnippet-snippets.git
+        path = snippets
+        url = https://github.com/AndreaCrotti/yasnippet-snippets.git
 [submodule "yasmate"]
-	path = yasmate
-	url = git@github.com:capitaomorte/yasmate.git
+        path = yasmate
+        url = https://github.com/capitaomorte/yasmate.git

From c18672a227357a4fd26df99336b0a431d1f69ef5 Mon Sep 17 00:00:00 2001
From: Joao Tavora <joaotavora@gmail.com>
Date: Tue, 24 Dec 2013 09:43:56 +0000
Subject: [PATCH 09/83] Closes #447: only call command beyond yasnippet if it
 exists

---
 yasnippet.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/yasnippet.el b/yasnippet.el
index 9990bc8..9348590 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -2276,7 +2276,8 @@ Common gateway for `yas-expand-from-trigger-key' and
            (yas--message 4 "Falling back to %s"  beyond-yasnippet)
            (assert (or (null beyond-yasnippet) (commandp beyond-yasnippet)))
            (setq this-original-command beyond-yasnippet)
-           (call-interactively beyond-yasnippet)))
+           (when beyond-yasnippet
+             (call-interactively beyond-yasnippet))))
         ((and (listp yas-fallback-behavior)
               (cdr yas-fallback-behavior)
               (eq 'apply (car yas-fallback-behavior)))

From 24d7a6793285d0683ab2ebaed19ed066602f524a Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Tue, 24 Dec 2013 11:14:39 -0500
Subject: [PATCH 10/83] fix typo

---
 doc/snippet-expansion.org | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/snippet-expansion.org b/doc/snippet-expansion.org
index 0618d4a..876b81c 100644
--- a/doc/snippet-expansion.org
+++ b/doc/snippet-expansion.org
@@ -53,7 +53,7 @@ When you use [[sym:yas-global-mode][=yas-global-mode=]] you can also selectively
 YASnippet in some buffers by setting the buffer-local variable
 [[sym:yas-dont-active][=yas-dont-active=]] in the buffer's mode hook.
 
-*** Fallback bahaviour
+*** Fallback behaviour
 
 [[sym:yas-fallback-behaviour][=yas-fallback-behaviour=]] is a customization variable bound to
 '=call-other-command= by default. If [[sym:yas-expand][=yas-expand=]] failed to find any

From 22773c77a0d67c075d682c408dc495521a2be269 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Tue, 24 Dec 2013 11:14:57 -0500
Subject: [PATCH 11/83] add a link to the symbol reference in top menu

---
 doc/nav-menu.html.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/nav-menu.html.inc b/doc/nav-menu.html.inc
index a0d8a3e..b31ec94 100644
--- a/doc/nav-menu.html.inc
+++ b/doc/nav-menu.html.inc
@@ -11,5 +11,6 @@
         <li> <a href="snippet-menu.html">Menu</a>
       </ul>
     <li> <a href="faq.html">FAQ</a>
+    <li> <a href="snippet-reference.html">Reference</a>
   </ul>
 </nav>

From e190b088f019ac57b7f73a2fa199ef1853c3aaac Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Tue, 24 Dec 2013 11:27:57 -0500
Subject: [PATCH 12/83] Rakefile: don't fail with EMACS=t env setting

This lets it work from M-x shell.
---
 Rakefile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Rakefile b/Rakefile
index 3f94a9a..efbea56 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,7 +2,10 @@
 
 require 'fileutils'
 
-$EMACS=ENV["EMACS"] || "emacs"
+$EMACS = ENV["EMACS"]
+if not $EMACS or $EMACS == 't'
+  $EMACS = "emacs"
+end
 
 def find_version
   File.read("yasnippet.el", :encoding => "UTF-8") =~ /;; Package-version: *([0-9.]+?) *$/

From df58222fe669388f5d7586896fefee29db5a8b67 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Tue, 24 Dec 2013 11:36:16 -0500
Subject: [PATCH 13/83] yas--document-symbols: respect level arg, raise to 1

---
 doc/snippet-reference.org | 5 +----
 doc/yas-doc-helper.el     | 5 +++--
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/doc/snippet-reference.org b/doc/snippet-reference.org
index 3dd674f..a38fca5 100644
--- a/doc/snippet-reference.org
+++ b/doc/snippet-reference.org
@@ -2,14 +2,11 @@
 
 #+TITLE: Reference
 
-* Reference
-
 #+BEGIN_SRC emacs-lisp :exports results :results value raw
-(yas--document-symbols 2 `("Interactive functions" . ,#'interactive-form)
+(yas--document-symbols 1 `("Interactive functions" . ,#'interactive-form)
                          `("Customization variables" . ,#'(lambda (sym)
                                                             (and (boundp sym)
                                                                  (get sym 'standard-value))))
                          `("Useful functions" . ,#'fboundp)
                          `("Useful variables" . ,#'boundp))
 #+END_SRC
-  
diff --git a/doc/yas-doc-helper.el b/doc/yas-doc-helper.el
index a782c1f..cec818c 100755
--- a/doc/yas-doc-helper.el
+++ b/doc/yas-doc-helper.el
@@ -91,7 +91,8 @@
                     body))))
 
 (defun yas--document-symbols (level &rest names-and-predicates)
-  (let ((sym-lists (make-vector (length names-and-predicates) nil)))
+  (let ((sym-lists (make-vector (length names-and-predicates) nil))
+        (stars (make-string level ?*)))
     (loop for sym in yas--exported-syms
           do (loop for test in (mapcar #'cdr names-and-predicates)
                    for i from 0
@@ -100,7 +101,7 @@
                         (return))))
     (loop for slist across sym-lists
           for name in (mapcar #'car names-and-predicates)
-          concat (format "\n** %s\n" name)
+          concat (format "\n%s %s\n" stars name)
           concat (mapconcat (lambda (sym)
                               (yas--document-symbol sym (1+ level)))
                             slist "\n\n"))))

From 78c8b5eb8058e8da523542b1b1de7e21a5b60e14 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Tue, 24 Dec 2013 11:49:24 -0500
Subject: [PATCH 14/83] yas--document-symbol: fix no transform case

was causing YASnippetnippet
---
 doc/yas-doc-helper.el | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/doc/yas-doc-helper.el b/doc/yas-doc-helper.el
index cec818c..925e41b 100755
--- a/doc/yas-doc-helper.el
+++ b/doc/yas-doc-helper.el
@@ -67,13 +67,14 @@
       (setq body (replace-regexp-in-string
                   "\\<\\([A-Z][-A-Z0-9]+\\)\\(\\sw+\\)?\\>"
                   #'(lambda (match)
-                      (let* ((match1 (downcase (match-string 1 match)))
+                      (let* ((match1 (match-string 1 match))
+                             (prefix (downcase match1))
                              (suffix (match-string 2 match))
                              (fmt (cond
-                                   ((member match1 args) "@<code>%s@</code>")
+                                   ((member prefix args) "@<code>%s@</code>")
                                    ((null suffix) "/%s/"))))
-                        (if fmt (format fmt match1)
-                          match)))
+                        (if fmt (format fmt prefix)
+                          match1)))
                   body t t 1)
             body (replace-regexp-in-string
                   "`\\([a-z-]+\\)'"

From 12b7f82dd8cdac4dc577b6a0b6a91b71b1e61142 Mon Sep 17 00:00:00 2001
From: Joao Tavora <joaotavora@gmail.com>
Date: Tue, 31 Dec 2013 15:33:20 +0000
Subject: [PATCH 15/83] Add Travis CI and update tests. Start a Changelog.

* .travis.yml: new file

* README.mdown: Add Travis CI badge.

* Rakefile: use ert-run-tests-batch-and-exit.

* yasnippet-tests.el (example-for-issue-404-external-emacs): Use
`yas-with-snippet-dirs' to not depend on bundled snippets.
(yas--call-with-temporary-redefinitions): Use `cl-labels' since no
cl-flet in emacs-24.3's cl-lib.el.
(loading-with-cyclic-parenthood): prog-mode doesn't exist in emacs
24.3.
(yas-batch-run-tests): remove it.

* yasnippet.el (require): require cl-lib during byte-compilation
and load.
---
 .travis.yml        | 23 +++++++++++++++++++++++
 ChangeLog          | 18 ++++++++++++++++++
 README.mdown       |  2 ++
 Rakefile           |  5 ++---
 yasnippet-tests.el | 47 +++++++++++++++++++++++-----------------------
 yasnippet.el       |  2 ++
 6 files changed, 70 insertions(+), 27 deletions(-)
 create mode 100644 .travis.yml
 create mode 100644 ChangeLog

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 0000000..83990f6
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,23 @@
+language: emacs
+before_install:
+  - echo -e "\ndeb http://us.archive.ubuntu.com/ubuntu raring universe multiverse main" | sudo tee -a /etc/apt/sources.list
+  - echo -e "\ndeb http://emacs.naquadah.org/ stable/" | sudo tee -a /etc/apt/sources.list
+  - echo -e "\ndeb-src http://emacs.naquadah.org/ stable/" | sudo tee -a /etc/apt/sources.list
+  - cat /etc/apt/sources.list
+  - wget -q -O - http://emacs.naquadah.org/key.gpg | sudo apt-key add -
+  - sudo apt-get update
+install:
+  - sudo apt-get install emacs
+  - sudo apt-get -t raring install libgnutls26
+  - sudo apt-get install emacs-snapshot-nox
+  - curl -O https://raw.github.com/ohler/ert/c619b56c5bc6a866e33787489545b87d79973205/lisp/emacs-lisp/ert.el
+  - curl -O https://raw.github.com/ohler/ert/c619b56c5bc6a866e33787489545b87d79973205/lisp/emacs-lisp/ert-x.el
+  - curl -o cl-lib.el http://elpa.gnu.org/packages/cl-lib-0.3.el
+before_script:
+script:
+  - export EMACS=emacs; rm *.elc; rake compile; rake tests
+  - rm ert*.el; rm cl-lib.el
+  - export EMACS=emacs-snapshot; rm *.elc; rake compile; rake tests
+notifications:
+  email:
+    - joaotavora@gmail.com
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..483f2ac
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,18 @@
+2013-12-31  João Távora  <joaotavora@gmail.com>
+
+	* yasnippet.el (require): require cl-lib during byte-compilation
+	and load.
+
+	* yasnippet-tests.el (example-for-issue-404-external-emacs): Use
+	`yas-with-snippet-dirs' to not depend on bundled snippets.
+	(yas--call-with-temporary-redefinitions): Use `cl-labels' since no
+	cl-flet in emacs-24.3's cl-lib.el.
+	(loading-with-cyclic-parenthood): prog-mode doesn't exist in emacs
+	24.3.
+	(yas-batch-run-tests): remove it.
+
+	* Rakefile: use ert-run-tests-batch-and-exit.
+
+	* README.mdown: Add Travis CI badge.
+
+	* .travis.yml: new file
diff --git a/README.mdown b/README.mdown
index da61284..4a8d597 100644
--- a/README.mdown
+++ b/README.mdown
@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/capitaomorte/yasnippet.png)](https://travis-ci.org/capitaomorte/yasnippet)
+
 # Intro
 
 **YASnippet** is a template system for Emacs. It allows you to
diff --git a/Rakefile b/Rakefile
index efbea56..2965eb9 100644
--- a/Rakefile
+++ b/Rakefile
@@ -16,9 +16,8 @@ FileUtils.mkdir_p('pkg')
 
 desc "run tests in batch mode"
 task :tests do
-  batch_run_line = "(yas-batch-run-tests t)"
-  sh "#{$EMACS} -Q -L . -l yasnippet-tests.el -nw" +
-    " --batch --eval '#{batch_run_line}'"
+  sh "#{$EMACS} -Q -L . -l yasnippet-tests.el" +
+    " --batch -f ert-run-tests-batch-and-exit"
 end
 
 desc "create a release package"
diff --git a/yasnippet-tests.el b/yasnippet-tests.el
index 4e2f1bc..d2f3c2c 100644
--- a/yasnippet-tests.el
+++ b/yasnippet-tests.el
@@ -229,20 +229,26 @@
       (insert (pp-to-string
                `(condition-case _
                     (progn
-                      (require 'yasnippet)
-                      (yas-global-mode)
-                      (switch-to-buffer "foo.c")
-                      (c-mode)
-                      (insert "#include <iostream>\nmain")
-                      (setq yas-good-grace nil)
-                      (yas-expand)
-                      (kill-emacs 0))
+                      (require 'yasnippet-tests)
+                      (yas-with-snippet-dirs
+                        '((".emacs.d/snippets"
+                           ("c-mode"
+                            ("main" . "int main ()"))))
+                        (yas-global-mode)
+                        (switch-to-buffer "foo.c")
+                        (c-mode)
+                        (insert "#include <iostream>\nmain")
+                        (setq yas-good-grace nil)
+                        (yas-expand)
+                        (should (string= (buffer-string)
+                                         "#include <iostream>\nint main ()"))
+                        (kill-emacs 0)))
                   (error (kill-emacs -1)))))
       (write-file fixture-el-file))
     (should (= 0
                (call-process (concat invocation-directory invocation-name)
                              nil nil nil
-                             "-Q"  ;; "--batch"
+                             "-Q"  "--batch"
                              "-L" "." "-l" fixture-el-file)))))
 
 (ert-deftest middle-of-buffer-snippet-insertion ()
@@ -325,10 +331,10 @@ TODO: correct this bug!"
     ;; saving all definitions before overriding anything ensures FDEFINITION
     ;; errors don't cause accidental permanent redefinitions.
     ;;
-    (cl-flet ((set-fdefinitions (names functions)
-                                (loop for name in names
-                                      for fn in functions
-                                      do (fset name fn))))
+    (cl-labels ((set-fdefinitions (names functions)
+                                  (loop for name in names
+                                        for fn in functions
+                                        do (fset name fn))))
       (set-fdefinitions definition-names overriding-functions)
       (unwind-protect (funcall function)
 	(set-fdefinitions definition-names saved-functions)))))
@@ -409,12 +415,14 @@ TODO: correct this bug!"
      (yas-reload-all)
      (with-temp-buffer
        (let* ((major-mode 'c-mode)
-              (expected '(c-mode
+              (expected `(c-mode
                           cc-mode
                           yet-another-c-mode
                           and-also-this-one
                           and-that-one
-                          prog-mode
+                          ;; prog-mode doesn't exit in emacs 24.3
+                          ,@(if (fboundp 'prog-mode)
+                                '(prog-mode))
                           emacs-lisp-mode
                           lisp-interaction-mode))
               (observed (yas--modes-to-activate)))
@@ -627,15 +635,6 @@ add the snippets associated with the given mode."
 
 ;;; Helpers
 ;;;
-(defun yas-batch-run-tests (&optional also-external)
-  (interactive)
-  (with-temp-buffer
-    (yas--with-temporary-redefinitions
-     ((message (&rest _args) nil))
-     (ert (or (and also-external t)
-              '(not (tag :external))) (buffer-name (current-buffer)))
-    (princ (buffer-string)))))
-
 (defun yas-should-expand (keys-and-expansions)
   (dolist (key-and-expansion keys-and-expansions)
     (yas-exit-all-snippets)
diff --git a/yasnippet.el b/yasnippet.el
index 9348590..98ace6a 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -130,6 +130,8 @@
 ;;; Code:
 
 (require 'cl)
+(eval-and-compile
+  (require 'cl-lib))
 (require 'easymenu)
 (require 'help-mode)
 

From 3002043496b73693a46287e4089108502b1e4e89 Mon Sep 17 00:00:00 2001
From: Xiao Hanyu <xiaohanyu1988@gmail.com>
Date: Tue, 31 Dec 2013 14:52:02 +0800
Subject: [PATCH 16/83] Sync git submodule for yasmate repo

---
 yasmate | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yasmate b/yasmate
index 78ef957..0543618 160000
--- a/yasmate
+++ b/yasmate
@@ -1 +1 @@
-Subproject commit 78ef957e6bbc2891fb644e060f504c68ac1d8c6b
+Subproject commit 0543618bd34a6715918992f01161c118f136bb37

From 0f8c2ab4381449298d8bc8b8ee63524aaa8ba1ac Mon Sep 17 00:00:00 2001
From: Joao Tavora <joaotavora@gmail.com>
Date: Mon, 6 Jan 2014 18:03:11 +0000
Subject: [PATCH 17/83] Add `yas-after-reload-hook' and run it at the end of
 `yas-reload-all'

See https://github.com/pezra/rspec-mode/pull/75 for the discussion leading up to
this change.
---
 ChangeLog    | 10 ++++++++++
 yasnippet.el |  4 ++++
 2 files changed, 14 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 483f2ac..c735533 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2014-01-06  João Távora  <joaotavora@gmail.com>
+
+	* yasnippet.el (yas-reload-all): run `yas-after-reload-hook'.
+	(yas-after-reload-hook): add it.
+
 2013-12-31  João Távora  <joaotavora@gmail.com>
 
 	* yasnippet.el (require): require cl-lib during byte-compilation
@@ -16,3 +21,8 @@
 	* README.mdown: Add Travis CI badge.
 
 	* .travis.yml: new file
+
+
+;; Local Variables:
+;; coding: utf-8
+;; End:
diff --git a/yasnippet.el b/yasnippet.el
index 98ace6a..269d008 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -1931,10 +1931,14 @@ loading."
       ;;
       (yas-direct-keymaps-reload)
 
+      (run-hooks 'yas-after-reload-hook)
       (yas--message 3 "Reloaded everything%s...%s."
                    (if interactive "" " (snippets will load just-in-time)")
                    (if errors " (some errors, check *Messages*)" "")))))
 
+(defvar yas-after-reload-hook nil
+  "Hooks run after `yas-reload-all'.")
+
 (defun yas--load-pending-jits ()
   (dolist (mode (yas--modes-to-activate))
     (let ((funs (reverse (gethash mode yas--scheduled-jit-loads))))

From 987942c513da38c1b174112b9e26f853fd5f1c4d Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Sun, 23 Feb 2014 15:02:37 -0500
Subject: [PATCH 18/83] update snippets submodule

---
 snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets b/snippets
index 7638321..250814e 160000
--- a/snippets
+++ b/snippets
@@ -1 +1 @@
-Subproject commit 7638321285cf78a9d075fa63d5ada105aa44752e
+Subproject commit 250814eef42372c419c8f954f1f6ea5cd04a8b9b

From c128580598b8b548616da28930b9382e18d5394f Mon Sep 17 00:00:00 2001
From: Raimon Grau <raimon@3scale.net>
Date: Thu, 27 Feb 2014 12:34:55 +0100
Subject: [PATCH 19/83] yasnippet templates don't add newlines

---
 yasnippet.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yasnippet.el b/yasnippet.el
index 269d008..608cccf 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -185,7 +185,7 @@ as the default for storing the user's new snippets."
 (defvaralias 'yas/root-directory 'yas-snippet-dirs)
 
 (defcustom yas-new-snippet-default "\
-# -*- mode: snippet -*-
+# -*- mode: snippet; require-final-newline: nil -*-
 # name: $1
 # key: ${2:${1:$(yas--key-from-desc yas-text)}}${3:
 # binding: ${4:direct-keybinding}}${5:

From 3744f92ad21860ca2fa7e008e3e4311851117ace Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Sun, 2 Mar 2014 11:18:54 -0500
Subject: [PATCH 20/83] avoid double choices reversing

Both yas-choose-value the yas-prompt-functions were reversing
values (cancelling each other out), instead just keep the choices in
order the whole time.
---
 yasnippet.el | 98 +++++++++++++++++++++-------------------------------
 1 file changed, 40 insertions(+), 58 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index 608cccf..f585b88 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -1542,25 +1542,24 @@ Optional PROMPT sets the prompt to use."
   ;; up as `yas--all-templates' I think.
   ;;
   (when (and window-system choices)
-    (let ((chosen
-           (let (menu d) ;; d for display
-             (dolist (c choices)
-               (setq d (or (and display-fn (funcall display-fn c))
-                           c))
-               (cond ((stringp d)
-                      (push (cons (concat "   " d) c) menu))
-                     ((listp d)
-                      (push (car d) menu))))
-             (setq menu (list prompt (push "title" menu)))
-             (x-popup-menu (if (fboundp 'posn-at-point)
-                               (let ((x-y (posn-x-y (posn-at-point (point)))))
-                                 (list (list (+ (car x-y) 10)
-                                             (+ (cdr x-y) 20))
-                                       (selected-window)))
-                             t)
-                           menu))))
-      (or chosen
-          (keyboard-quit)))))
+    (or
+     (let* ((display-fn (or display-fn #'identity))
+            (menu
+             (list prompt
+                   (cons "title"
+                         (mapcar (lambda (c)
+                                   (let ((d (funcall display-fn c)))
+                                     (cond ((stringp d) (cons (concat "   " d) c))
+                                           ((listp d) (car d)))))
+                                 choices)))))
+       (x-popup-menu (if (fboundp 'posn-at-point)
+                         (let ((x-y (posn-x-y (posn-at-point (point)))))
+                           (list (list (+ (car x-y) 10)
+                                       (+ (cdr x-y) 20))
+                                 (selected-window)))
+                       t)
+                     menu))
+     (keyboard-quit))))
 
 (defun yas--x-pretty-prompt-templates (prompt templates)
   "Display TEMPLATES, grouping neatly by table name."
@@ -1601,46 +1600,28 @@ Optional PROMPT sets the prompt to use."
 
 (defun yas-dropdown-prompt (_prompt choices &optional display-fn)
   (when (fboundp 'dropdown-list)
-    (let (formatted-choices
-          filtered-choices
-          d
-          n)
-      (dolist (choice choices)
-        (setq d (or (and display-fn (funcall display-fn choice))
-                      choice))
-        (when (stringp d)
-          (push d formatted-choices)
-          (push choice filtered-choices)))
-
-      (setq n (and formatted-choices (dropdown-list formatted-choices)))
+    (let* ((formatted-choices (if display-fn (delete-if-not display-fn choices)
+                                choices))
+           (filtered-choices (if display-fn (mapcar display-fn filtered-choices)
+                               choices))
+           (n (and formatted-choices
+                   (dropdown-list formatted-choices))))
       (if n
           (nth n filtered-choices)
         (keyboard-quit)))))
 
 (defun yas-completing-prompt (prompt choices &optional display-fn completion-fn)
-  (let (formatted-choices
-        filtered-choices
-        chosen
-        d
-        (completion-fn (or completion-fn
-                           #'completing-read)))
-    (dolist (choice choices)
-      (setq d (or (and display-fn (funcall display-fn choice))
-                    choice))
-      (when (stringp d)
-        (push d formatted-choices)
-        (push choice filtered-choices)))
-    (setq chosen (and formatted-choices
-                      (funcall completion-fn prompt
-                               formatted-choices
-                               nil
-                               'require-match
-                               nil
-                               nil)))
-    (let ((position (or (and chosen
-                             (position chosen formatted-choices :test #'string=))
-                        0)))
-      (nth position filtered-choices))))
+  (let* ((formatted-choices (if display-fn (delete-if-not display-fn choices)
+                              choices))
+         (filtered-choices (if display-fn (mapcar display-fn filtered-choices)
+                             choices))
+         (chosen (and formatted-choices
+                      (funcall (or completion-fn #'completing-read)
+                               prompt formatted-choices
+                               nil 'require-match nil nil)))
+         (position (and chosen
+                        (position chosen formatted-choices :test #'string=))))
+    (nth (or position 0) filtered-choices)))
 
 (defun yas-no-prompt (_prompt choices &optional _display-fn)
   (first choices))
@@ -2808,10 +2789,11 @@ If found, the content of subexp group SUBEXP (default 0) is
 The last element of POSSIBILITIES may be a list of strings."
   (unless (or yas-moving-away-p
               yas-modified-p)
-    (setq possibilities (nreverse possibilities))
-    (setq possibilities (if (listp (car possibilities))
-                            (append (reverse (car possibilities)) (rest possibilities))
-                                   possibilities))
+    (let* ((last-link (last possibilities))
+           (last-elem (car last-link)))
+      (when (listp last-elem)
+        (setcar last-link (car last-elem))
+        (setcdr last-link (cdr last-elem))))
     (some #'(lambda (fn)
               (funcall fn "Choose: " possibilities))
           yas-prompt-functions)))

From 1fc858fac635e40572c2e881fca1d8fa1ed95062 Mon Sep 17 00:00:00 2001
From: Joao Tavora <joaotavora@gmail.com>
Date: Mon, 3 Mar 2014 08:53:04 +0000
Subject: [PATCH 21/83] Remove experimental Changelog file

The Changelog format is good but having a file for it is not. The same
format can be had in messages by having using vc-dir and C-x 4 a. A
temporary dummy changelog appears and that content goes to the git log
message, which is just as good in content and much better in form.
---
 ChangeLog | 28 ----------------------------
 1 file changed, 28 deletions(-)
 delete mode 100644 ChangeLog

diff --git a/ChangeLog b/ChangeLog
deleted file mode 100644
index c735533..0000000
--- a/ChangeLog
+++ /dev/null
@@ -1,28 +0,0 @@
-2014-01-06  João Távora  <joaotavora@gmail.com>
-
-	* yasnippet.el (yas-reload-all): run `yas-after-reload-hook'.
-	(yas-after-reload-hook): add it.
-
-2013-12-31  João Távora  <joaotavora@gmail.com>
-
-	* yasnippet.el (require): require cl-lib during byte-compilation
-	and load.
-
-	* yasnippet-tests.el (example-for-issue-404-external-emacs): Use
-	`yas-with-snippet-dirs' to not depend on bundled snippets.
-	(yas--call-with-temporary-redefinitions): Use `cl-labels' since no
-	cl-flet in emacs-24.3's cl-lib.el.
-	(loading-with-cyclic-parenthood): prog-mode doesn't exist in emacs
-	24.3.
-	(yas-batch-run-tests): remove it.
-
-	* Rakefile: use ert-run-tests-batch-and-exit.
-
-	* README.mdown: Add Travis CI badge.
-
-	* .travis.yml: new file
-
-
-;; Local Variables:
-;; coding: utf-8
-;; End:

From 4d220f726a5c8adf51b3a330ca53a20141c3e0aa Mon Sep 17 00:00:00 2001
From: Joao Tavora <joaotavora@gmail.com>
Date: Mon, 3 Mar 2014 08:53:20 +0000
Subject: [PATCH 22/83] Remove an obsolete hack notice

* yasnippet.el (yas-x-prompt): Remove hack notice.
---
 yasnippet.el | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index 608cccf..b3b5157 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -1534,13 +1534,6 @@ Optional PROMPT sets the prompt to use."
 
 (defun yas-x-prompt (prompt choices &optional display-fn)
   "Display choices in a x-window prompt."
-  ;; FIXME: HACK: if we notice that one of the objects in choices is
-  ;; actually a `yas--template', defer to `yas--x-prompt-pretty-templates'
-  ;;
-  ;; This would be better implemented by passing CHOICES as a
-  ;; structured tree rather than a list. Modifications would go as far
-  ;; up as `yas--all-templates' I think.
-  ;;
   (when (and window-system choices)
     (let ((chosen
            (let (menu d) ;; d for display

From 44701103845fc4ae660e1587748ec661dca3b98d Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Mon, 3 Mar 2014 18:20:47 -0500
Subject: [PATCH 23/83] display-fn isn't actually used for filtering

---
 yasnippet.el | 32 +++++++++++++-------------------
 1 file changed, 13 insertions(+), 19 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index f585b88..d21f3cb 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -1600,28 +1600,22 @@ Optional PROMPT sets the prompt to use."
 
 (defun yas-dropdown-prompt (_prompt choices &optional display-fn)
   (when (fboundp 'dropdown-list)
-    (let* ((formatted-choices (if display-fn (delete-if-not display-fn choices)
-                                choices))
-           (filtered-choices (if display-fn (mapcar display-fn filtered-choices)
-                               choices))
-           (n (and formatted-choices
-                   (dropdown-list formatted-choices))))
-      (if n
-          (nth n filtered-choices)
+    (let* ((formatted-choices
+            (if display-fn (mapcar display-fn choices) choices))
+           (n (dropdown-list formatted-choices)))
+      (if n (nth n choices)
         (keyboard-quit)))))
 
 (defun yas-completing-prompt (prompt choices &optional display-fn completion-fn)
-  (let* ((formatted-choices (if display-fn (delete-if-not display-fn choices)
-                              choices))
-         (filtered-choices (if display-fn (mapcar display-fn filtered-choices)
-                             choices))
-         (chosen (and formatted-choices
-                      (funcall (or completion-fn #'completing-read)
-                               prompt formatted-choices
-                               nil 'require-match nil nil)))
-         (position (and chosen
-                        (position chosen formatted-choices :test #'string=))))
-    (nth (or position 0) filtered-choices)))
+  (let* ((formatted-choices
+          (if display-fn (mapcar display-fn choices) choices))
+         (chosen (funcall (or completion-fn #'completing-read)
+                          prompt formatted-choices
+                          nil 'require-match nil nil)))
+    (if (eq choices formatted-choices)
+        chosen
+      (nth (or (position chosen formatted-choices :test #'string=) 0)
+           choices))))
 
 (defun yas-no-prompt (_prompt choices &optional _display-fn)
   (first choices))

From c07db054ecac82fbb8353240648e8454e734d166 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Tue, 4 Mar 2014 21:46:05 -0500
Subject: [PATCH 24/83] yas-x-prompt: remove dead code

---
 yasnippet.el | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index d21f3cb..62a1d8f 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -1543,22 +1543,17 @@ Optional PROMPT sets the prompt to use."
   ;;
   (when (and window-system choices)
     (or
-     (let* ((display-fn (or display-fn #'identity))
-            (menu
-             (list prompt
-                   (cons "title"
-                         (mapcar (lambda (c)
-                                   (let ((d (funcall display-fn c)))
-                                     (cond ((stringp d) (cons (concat "   " d) c))
-                                           ((listp d) (car d)))))
-                                 choices)))))
-       (x-popup-menu (if (fboundp 'posn-at-point)
-                         (let ((x-y (posn-x-y (posn-at-point (point)))))
-                           (list (list (+ (car x-y) 10)
-                                       (+ (cdr x-y) 20))
-                                 (selected-window)))
-                       t)
-                     menu))
+     (x-popup-menu
+      (if (fboundp 'posn-at-point)
+          (let ((x-y (posn-x-y (posn-at-point (point)))))
+            (list (list (+ (car x-y) 10)
+                        (+ (cdr x-y) 20))
+                  (selected-window)))
+        t)
+      `(,prompt ("title"
+                 ,@(mapcar* (lambda (c d) `(,(concat "   " d) . ,c))
+                            choices
+                            (if display-fn (mapcar display-fn choices) choices)))))
      (keyboard-quit))))
 
 (defun yas--x-pretty-prompt-templates (prompt templates)

From 43a501aa567d5507e9797c30ab7dc98a13565d4e Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Wed, 5 Mar 2014 22:38:46 -0500
Subject: [PATCH 25/83] remove yas--x-pretty-prompt-templates

---
 yasnippet.el | 51 +++++++--------------------------------------------
 1 file changed, 7 insertions(+), 44 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index 62a1d8f..1a87e39 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -1489,10 +1489,6 @@ Here's a list of currently recognized directives:
 
 ;;; Popping up for keys and templates
 
-(defvar yas--x-pretty-prompt-templates nil
-  "If non-nil, attempt to prompt for templates like TextMate.")
-
-
 (defun yas--prompt-for-template (templates &optional prompt)
   "Interactively choose a template from the list TEMPLATES.
 
@@ -1504,13 +1500,11 @@ Optional PROMPT sets the prompt to use."
           (sort templates #'(lambda (t1 t2)
                               (< (length (yas--template-name t1))
                                  (length (yas--template-name t2))))))
-    (if yas--x-pretty-prompt-templates
-        (yas--x-pretty-prompt-templates "Choose a snippet" templates)
-      (some #'(lambda (fn)
-                (funcall fn (or prompt "Choose a snippet: ")
-                         templates
-                         #'yas--template-name))
-            yas-prompt-functions))))
+    (some #'(lambda (fn)
+              (funcall fn (or prompt "Choose a snippet: ")
+                       templates
+                       #'yas--template-name))
+          yas-prompt-functions)))
 
 (defun yas--prompt-for-keys (keys &optional prompt)
   "Interactively choose a template key from the list KEYS.
@@ -1556,37 +1550,6 @@ Optional PROMPT sets the prompt to use."
                             (if display-fn (mapcar display-fn choices) choices)))))
      (keyboard-quit))))
 
-(defun yas--x-pretty-prompt-templates (prompt templates)
-  "Display TEMPLATES, grouping neatly by table name."
-  (let ((organized (make-hash-table :test #'equal))
-        menu
-        more-than-one-table
-        prefix)
-    (dolist (tl templates)
-      (puthash (yas--template-table tl)
-               (cons tl
-                     (gethash (yas--template-table tl) organized))
-               organized))
-    (setq more-than-one-table (> (hash-table-count organized) 1))
-    (setq prefix (if more-than-one-table
-                     "   " ""))
-    (if more-than-one-table
-        (maphash #'(lambda (table templates)
-                     (push (yas--table-name table) menu)
-                     (dolist (tl templates)
-                       (push (cons (concat prefix (yas--template-name tl)) tl) menu))) organized)
-      (setq menu (mapcar #'(lambda (tl) (cons (concat prefix (yas--template-name tl)) tl)) templates)))
-
-    (setq menu (nreverse menu))
-    (or (x-popup-menu (if (fboundp 'posn-at-point)
-                          (let ((x-y (posn-x-y (posn-at-point (point)))))
-                            (list (list (+ (car x-y) 10)
-                                        (+ (cdr x-y) 20))
-                                  (selected-window)))
-                        t)
-                      (list prompt (push "title" menu)))
-        (keyboard-quit))))
-
 (defun yas-ido-prompt (prompt choices &optional display-fn)
   (when (and (fboundp 'ido-completing-read)
 	     (or (>= emacs-major-version 24)
@@ -2224,8 +2187,8 @@ Prompt the user if TEMPLATES has more than one element, else
 expand immediately.  Common gateway for
 `yas-expand-from-trigger-key' and `yas-expand-from-keymap'."
   (let ((yas--current-template (or (and (rest templates) ;; more than one
-                                       (yas--prompt-for-template (mapcar #'cdr templates)))
-                                  (cdar templates))))
+                                        (yas--prompt-for-template (mapcar #'cdr templates)))
+                                   (cdar templates))))
     (when yas--current-template
       (yas-expand-snippet (yas--template-content yas--current-template)
                           start

From 498cbe4138d74f39f7447acc9de456291c639724 Mon Sep 17 00:00:00 2001
From: Joao Tavora <joaotavora@gmail.com>
Date: Thu, 13 Mar 2014 19:04:05 +0000
Subject: [PATCH 26/83] Closes #469: Don't use `yas--init-minor-keymap'

* yasnippet.el (yas-use-menu): Don't allow `nil' value, it's
useless.
(yas--minor-mode-menu): Use top-level `easy-menu-define' form.
(yas--init-minor-keymap): Remove definition.
---
 yasnippet.el | 223 ++++++++++++++++++++++++---------------------------
 1 file changed, 107 insertions(+), 116 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index f4b4751..50a6e4b 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -313,9 +313,6 @@ menu and the modes set in `yas--extra-modes' are listed.
 
 - If set to `full', every submenu is listed
 
-- It set to nil, don't display a menu at all (this requires a
-  `yas-reload-all' call if the menu is already visible).
-
 Any other non-nil value, every submenu is listed."
   :type '(choice (const :tag "Full"  full)
                  (const :tag "Abbreviate" abbreviate)
@@ -536,127 +533,121 @@ snippet itself contains a condition that returns the symbol
 (defvar yas--minor-mode-menu nil
   "Holds the YASnippet menu.")
 
-(defun yas--init-minor-keymap ()
-  "Set up the `yas-minor-mode' keymap."
+(defvar yas-minor-mode-map
   (let ((map (make-sparse-keymap)))
-    (when yas-use-menu
-      (easy-menu-define yas--minor-mode-menu
-      map
-      "Menu used when `yas-minor-mode' is active."
-      '("YASnippet"
-        "----"
-        ["Expand trigger" yas-expand
-         :help "Possibly expand tab trigger before point"]
-        ["Insert at point..." yas-insert-snippet
-         :help "Prompt for an expandable snippet and expand it at point"]
-        ["New snippet..." yas-new-snippet
-         :help "Create a new snippet in an appropriate directory"]
-        ["Visit snippet file..." yas-visit-snippet-file
-         :help "Prompt for an expandable snippet and find its file"]
-        "----"
-        ("Snippet menu behaviour"
-         ["Visit snippets" (setq yas-visit-from-menu t)
-          :help "Visit snippets from the menu"
-          :active t :style radio   :selected yas-visit-from-menu]
-         ["Expand snippets" (setq yas-visit-from-menu nil)
-          :help "Expand snippets from the menu"
-          :active t :style radio :selected (not yas-visit-from-menu)]
-         "----"
-         ["Show all known modes" (setq yas-use-menu 'full)
-          :help "Show one snippet submenu for each loaded table"
-          :active t :style radio   :selected (eq yas-use-menu 'full)]
-         ["Abbreviate according to current mode" (setq yas-use-menu 'abbreviate)
-          :help "Show only snippet submenus for the current active modes"
-          :active t :style radio   :selected (eq yas-use-menu 'abbreviate)])
-        ("Indenting"
-         ["Auto" (setq yas-indent-line 'auto)
-          :help "Indent each line of the snippet with `indent-according-to-mode'"
-          :active t :style radio   :selected (eq yas-indent-line 'auto)]
-         ["Fixed" (setq yas-indent-line 'fixed)
-          :help "Indent the snippet to the current column"
-          :active t :style radio   :selected (eq yas-indent-line 'fixed)]
-         ["None" (setq yas-indent-line 'none)
-          :help "Don't apply any particular snippet indentation after expansion"
-          :active t :style radio   :selected (not (member yas-indent-line '(fixed auto)))]
-         "----"
-         ["Also auto indent first line" (setq yas-also-auto-indent-first-line
-                                              (not yas-also-auto-indent-first-line))
-          :help "When auto-indenting also, auto indent the first line menu"
-          :active (eq yas-indent-line 'auto)
-          :style toggle :selected yas-also-auto-indent-first-line]
-         )
-        ("Prompting method"
-         ["System X-widget" (setq yas-prompt-functions
-                                  (cons 'yas-x-prompt
-                                        (remove 'yas-x-prompt
-                                                yas-prompt-functions)))
-          :help "Use your windowing system's (gtk, mac, windows, etc...) default menu"
-          :active t :style radio   :selected (eq (car yas-prompt-functions)
-                                                 'yas-x-prompt)]
-         ["Dropdown-list" (setq yas-prompt-functions
-                                (cons 'yas-dropdown-prompt
-                                      (remove 'yas-dropdown-prompt
-                                              yas-prompt-functions)))
-          :help "Use a special dropdown list"
-          :active t :style radio   :selected (eq (car yas-prompt-functions)
-                                                 'yas-dropdown-prompt)]
-         ["Ido" (setq yas-prompt-functions
-                      (cons 'yas-ido-prompt
-                            (remove 'yas-ido-prompt
-                                    yas-prompt-functions)))
-          :help "Use an ido-style minibuffer prompt"
-          :active t :style radio   :selected (eq (car yas-prompt-functions)
-                                                 'yas-ido-prompt)]
-         ["Completing read" (setq yas-prompt-functions
-                                  (cons 'yas-completing-prompt
-                                        (remove 'yas-completing-prompt
-                                                yas-prompt-functions)))
-          :help "Use a normal minibuffer prompt"
-          :active t :style radio   :selected (eq (car yas-prompt-functions)
-                                                 'yas-completing-prompt)]
-         )
-        ("Misc"
-         ["Wrap region in exit marker"
-          (setq yas-wrap-around-region
-                (not yas-wrap-around-region))
-          :help "If non-nil automatically wrap the selected text in the $0 snippet exit"
-          :style toggle :selected yas-wrap-around-region]
-         ["Allow stacked expansions "
-          (setq yas-triggers-in-field
-                (not yas-triggers-in-field))
-          :help "If non-nil allow snippets to be triggered inside other snippet fields"
-          :style toggle :selected yas-triggers-in-field]
-         ["Revive snippets on undo "
-          (setq yas-snippet-revival
-                (not yas-snippet-revival))
-          :help "If non-nil allow snippets to become active again after undo"
-          :style toggle :selected yas-snippet-revival]
-         ["Good grace "
-          (setq yas-good-grace
-                (not yas-good-grace))
-          :help "If non-nil don't raise errors in bad embedded elisp in snippets"
-          :style toggle :selected yas-good-grace]
-         )
-        "----"
-        ["Load snippets..."  yas-load-directory
-         :help "Load snippets from a specific directory"]
-        ["Reload everything" yas-reload-all
-         :help "Cleanup stuff, reload snippets, rebuild menus"]
-        ["About"            yas-about
-         :help "Display some information about YASnippet"])))
-
-    ;; Now for the stuff that has direct keybindings
-    ;;
     (define-key map [(tab)]     'yas-expand)
     (define-key map (kbd "TAB") 'yas-expand)
     (define-key map "\C-c&\C-s" 'yas-insert-snippet)
     (define-key map "\C-c&\C-n" 'yas-new-snippet)
     (define-key map "\C-c&\C-v" 'yas-visit-snippet-file)
-    map))
-
-(defvar yas-minor-mode-map (yas--init-minor-keymap)
+    map)
   "The keymap used when `yas-minor-mode' is active.")
 
+(easy-menu-define yas--minor-mode-menu
+      yas-minor-mode-map
+      "Menu used when `yas-minor-mode' is active."
+  '("YASnippet"
+    "----"
+    ["Expand trigger" yas-expand
+     :help "Possibly expand tab trigger before point"]
+    ["Insert at point..." yas-insert-snippet
+     :help "Prompt for an expandable snippet and expand it at point"]
+    ["New snippet..." yas-new-snippet
+     :help "Create a new snippet in an appropriate directory"]
+    ["Visit snippet file..." yas-visit-snippet-file
+     :help "Prompt for an expandable snippet and find its file"]
+    "----"
+    ("Snippet menu behaviour"
+     ["Visit snippets" (setq yas-visit-from-menu t)
+      :help "Visit snippets from the menu"
+      :active t :style radio   :selected yas-visit-from-menu]
+     ["Expand snippets" (setq yas-visit-from-menu nil)
+      :help "Expand snippets from the menu"
+      :active t :style radio :selected (not yas-visit-from-menu)]
+     "----"
+     ["Show all known modes" (setq yas-use-menu 'full)
+      :help "Show one snippet submenu for each loaded table"
+      :active t :style radio   :selected (eq yas-use-menu 'full)]
+     ["Abbreviate according to current mode" (setq yas-use-menu 'abbreviate)
+      :help "Show only snippet submenus for the current active modes"
+      :active t :style radio   :selected (eq yas-use-menu 'abbreviate)])
+    ("Indenting"
+     ["Auto" (setq yas-indent-line 'auto)
+      :help "Indent each line of the snippet with `indent-according-to-mode'"
+      :active t :style radio   :selected (eq yas-indent-line 'auto)]
+     ["Fixed" (setq yas-indent-line 'fixed)
+      :help "Indent the snippet to the current column"
+      :active t :style radio   :selected (eq yas-indent-line 'fixed)]
+     ["None" (setq yas-indent-line 'none)
+      :help "Don't apply any particular snippet indentation after expansion"
+      :active t :style radio   :selected (not (member yas-indent-line '(fixed auto)))]
+     "----"
+     ["Also auto indent first line" (setq yas-also-auto-indent-first-line
+                                          (not yas-also-auto-indent-first-line))
+      :help "When auto-indenting also, auto indent the first line menu"
+      :active (eq yas-indent-line 'auto)
+      :style toggle :selected yas-also-auto-indent-first-line]
+     )
+    ("Prompting method"
+     ["System X-widget" (setq yas-prompt-functions
+                              (cons 'yas-x-prompt
+                                    (remove 'yas-x-prompt
+                                            yas-prompt-functions)))
+      :help "Use your windowing system's (gtk, mac, windows, etc...) default menu"
+      :active t :style radio   :selected (eq (car yas-prompt-functions)
+                                             'yas-x-prompt)]
+     ["Dropdown-list" (setq yas-prompt-functions
+                            (cons 'yas-dropdown-prompt
+                                  (remove 'yas-dropdown-prompt
+                                          yas-prompt-functions)))
+      :help "Use a special dropdown list"
+      :active t :style radio   :selected (eq (car yas-prompt-functions)
+                                             'yas-dropdown-prompt)]
+     ["Ido" (setq yas-prompt-functions
+                  (cons 'yas-ido-prompt
+                        (remove 'yas-ido-prompt
+                                yas-prompt-functions)))
+      :help "Use an ido-style minibuffer prompt"
+      :active t :style radio   :selected (eq (car yas-prompt-functions)
+                                             'yas-ido-prompt)]
+     ["Completing read" (setq yas-prompt-functions
+                              (cons 'yas-completing-prompt
+                                    (remove 'yas-completing-prompt
+                                            yas-prompt-functions)))
+      :help "Use a normal minibuffer prompt"
+      :active t :style radio   :selected (eq (car yas-prompt-functions)
+                                             'yas-completing-prompt)]
+     )
+    ("Misc"
+     ["Wrap region in exit marker"
+      (setq yas-wrap-around-region
+            (not yas-wrap-around-region))
+      :help "If non-nil automatically wrap the selected text in the $0 snippet exit"
+      :style toggle :selected yas-wrap-around-region]
+     ["Allow stacked expansions "
+      (setq yas-triggers-in-field
+            (not yas-triggers-in-field))
+      :help "If non-nil allow snippets to be triggered inside other snippet fields"
+      :style toggle :selected yas-triggers-in-field]
+     ["Revive snippets on undo "
+      (setq yas-snippet-revival
+            (not yas-snippet-revival))
+      :help "If non-nil allow snippets to become active again after undo"
+      :style toggle :selected yas-snippet-revival]
+     ["Good grace "
+      (setq yas-good-grace
+            (not yas-good-grace))
+      :help "If non-nil don't raise errors in bad embedded elisp in snippets"
+      :style toggle :selected yas-good-grace]
+     )
+    "----"
+    ["Load snippets..."  yas-load-directory
+     :help "Load snippets from a specific directory"]
+    ["Reload everything" yas-reload-all
+     :help "Cleanup stuff, reload snippets, rebuild menus"]
+    ["About"            yas-about
+     :help "Display some information about YASnippet"]))
+
 (defvar yas--extra-modes nil
   "An internal list of modes for which to also lookup snippets.
 

From d809e886e0034f6130f077c80356a143aff3752c Mon Sep 17 00:00:00 2001
From: Joao Tavora <joaotavora@gmail.com>
Date: Thu, 13 Mar 2014 20:23:05 +0100
Subject: [PATCH 27/83] Revert "Closes #469: Don't use
 `yas--init-minor-keymap'"

This reverts commit 498cbe4138d74f39f7447acc9de456291c639724.
---
 yasnippet.el | 223 +++++++++++++++++++++++++++------------------------
 1 file changed, 116 insertions(+), 107 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index 50a6e4b..f4b4751 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -313,6 +313,9 @@ menu and the modes set in `yas--extra-modes' are listed.
 
 - If set to `full', every submenu is listed
 
+- It set to nil, don't display a menu at all (this requires a
+  `yas-reload-all' call if the menu is already visible).
+
 Any other non-nil value, every submenu is listed."
   :type '(choice (const :tag "Full"  full)
                  (const :tag "Abbreviate" abbreviate)
@@ -533,120 +536,126 @@ snippet itself contains a condition that returns the symbol
 (defvar yas--minor-mode-menu nil
   "Holds the YASnippet menu.")
 
-(defvar yas-minor-mode-map
+(defun yas--init-minor-keymap ()
+  "Set up the `yas-minor-mode' keymap."
   (let ((map (make-sparse-keymap)))
+    (when yas-use-menu
+      (easy-menu-define yas--minor-mode-menu
+      map
+      "Menu used when `yas-minor-mode' is active."
+      '("YASnippet"
+        "----"
+        ["Expand trigger" yas-expand
+         :help "Possibly expand tab trigger before point"]
+        ["Insert at point..." yas-insert-snippet
+         :help "Prompt for an expandable snippet and expand it at point"]
+        ["New snippet..." yas-new-snippet
+         :help "Create a new snippet in an appropriate directory"]
+        ["Visit snippet file..." yas-visit-snippet-file
+         :help "Prompt for an expandable snippet and find its file"]
+        "----"
+        ("Snippet menu behaviour"
+         ["Visit snippets" (setq yas-visit-from-menu t)
+          :help "Visit snippets from the menu"
+          :active t :style radio   :selected yas-visit-from-menu]
+         ["Expand snippets" (setq yas-visit-from-menu nil)
+          :help "Expand snippets from the menu"
+          :active t :style radio :selected (not yas-visit-from-menu)]
+         "----"
+         ["Show all known modes" (setq yas-use-menu 'full)
+          :help "Show one snippet submenu for each loaded table"
+          :active t :style radio   :selected (eq yas-use-menu 'full)]
+         ["Abbreviate according to current mode" (setq yas-use-menu 'abbreviate)
+          :help "Show only snippet submenus for the current active modes"
+          :active t :style radio   :selected (eq yas-use-menu 'abbreviate)])
+        ("Indenting"
+         ["Auto" (setq yas-indent-line 'auto)
+          :help "Indent each line of the snippet with `indent-according-to-mode'"
+          :active t :style radio   :selected (eq yas-indent-line 'auto)]
+         ["Fixed" (setq yas-indent-line 'fixed)
+          :help "Indent the snippet to the current column"
+          :active t :style radio   :selected (eq yas-indent-line 'fixed)]
+         ["None" (setq yas-indent-line 'none)
+          :help "Don't apply any particular snippet indentation after expansion"
+          :active t :style radio   :selected (not (member yas-indent-line '(fixed auto)))]
+         "----"
+         ["Also auto indent first line" (setq yas-also-auto-indent-first-line
+                                              (not yas-also-auto-indent-first-line))
+          :help "When auto-indenting also, auto indent the first line menu"
+          :active (eq yas-indent-line 'auto)
+          :style toggle :selected yas-also-auto-indent-first-line]
+         )
+        ("Prompting method"
+         ["System X-widget" (setq yas-prompt-functions
+                                  (cons 'yas-x-prompt
+                                        (remove 'yas-x-prompt
+                                                yas-prompt-functions)))
+          :help "Use your windowing system's (gtk, mac, windows, etc...) default menu"
+          :active t :style radio   :selected (eq (car yas-prompt-functions)
+                                                 'yas-x-prompt)]
+         ["Dropdown-list" (setq yas-prompt-functions
+                                (cons 'yas-dropdown-prompt
+                                      (remove 'yas-dropdown-prompt
+                                              yas-prompt-functions)))
+          :help "Use a special dropdown list"
+          :active t :style radio   :selected (eq (car yas-prompt-functions)
+                                                 'yas-dropdown-prompt)]
+         ["Ido" (setq yas-prompt-functions
+                      (cons 'yas-ido-prompt
+                            (remove 'yas-ido-prompt
+                                    yas-prompt-functions)))
+          :help "Use an ido-style minibuffer prompt"
+          :active t :style radio   :selected (eq (car yas-prompt-functions)
+                                                 'yas-ido-prompt)]
+         ["Completing read" (setq yas-prompt-functions
+                                  (cons 'yas-completing-prompt
+                                        (remove 'yas-completing-prompt
+                                                yas-prompt-functions)))
+          :help "Use a normal minibuffer prompt"
+          :active t :style radio   :selected (eq (car yas-prompt-functions)
+                                                 'yas-completing-prompt)]
+         )
+        ("Misc"
+         ["Wrap region in exit marker"
+          (setq yas-wrap-around-region
+                (not yas-wrap-around-region))
+          :help "If non-nil automatically wrap the selected text in the $0 snippet exit"
+          :style toggle :selected yas-wrap-around-region]
+         ["Allow stacked expansions "
+          (setq yas-triggers-in-field
+                (not yas-triggers-in-field))
+          :help "If non-nil allow snippets to be triggered inside other snippet fields"
+          :style toggle :selected yas-triggers-in-field]
+         ["Revive snippets on undo "
+          (setq yas-snippet-revival
+                (not yas-snippet-revival))
+          :help "If non-nil allow snippets to become active again after undo"
+          :style toggle :selected yas-snippet-revival]
+         ["Good grace "
+          (setq yas-good-grace
+                (not yas-good-grace))
+          :help "If non-nil don't raise errors in bad embedded elisp in snippets"
+          :style toggle :selected yas-good-grace]
+         )
+        "----"
+        ["Load snippets..."  yas-load-directory
+         :help "Load snippets from a specific directory"]
+        ["Reload everything" yas-reload-all
+         :help "Cleanup stuff, reload snippets, rebuild menus"]
+        ["About"            yas-about
+         :help "Display some information about YASnippet"])))
+
+    ;; Now for the stuff that has direct keybindings
+    ;;
     (define-key map [(tab)]     'yas-expand)
     (define-key map (kbd "TAB") 'yas-expand)
     (define-key map "\C-c&\C-s" 'yas-insert-snippet)
     (define-key map "\C-c&\C-n" 'yas-new-snippet)
     (define-key map "\C-c&\C-v" 'yas-visit-snippet-file)
-    map)
-  "The keymap used when `yas-minor-mode' is active.")
+    map))
 
-(easy-menu-define yas--minor-mode-menu
-      yas-minor-mode-map
-      "Menu used when `yas-minor-mode' is active."
-  '("YASnippet"
-    "----"
-    ["Expand trigger" yas-expand
-     :help "Possibly expand tab trigger before point"]
-    ["Insert at point..." yas-insert-snippet
-     :help "Prompt for an expandable snippet and expand it at point"]
-    ["New snippet..." yas-new-snippet
-     :help "Create a new snippet in an appropriate directory"]
-    ["Visit snippet file..." yas-visit-snippet-file
-     :help "Prompt for an expandable snippet and find its file"]
-    "----"
-    ("Snippet menu behaviour"
-     ["Visit snippets" (setq yas-visit-from-menu t)
-      :help "Visit snippets from the menu"
-      :active t :style radio   :selected yas-visit-from-menu]
-     ["Expand snippets" (setq yas-visit-from-menu nil)
-      :help "Expand snippets from the menu"
-      :active t :style radio :selected (not yas-visit-from-menu)]
-     "----"
-     ["Show all known modes" (setq yas-use-menu 'full)
-      :help "Show one snippet submenu for each loaded table"
-      :active t :style radio   :selected (eq yas-use-menu 'full)]
-     ["Abbreviate according to current mode" (setq yas-use-menu 'abbreviate)
-      :help "Show only snippet submenus for the current active modes"
-      :active t :style radio   :selected (eq yas-use-menu 'abbreviate)])
-    ("Indenting"
-     ["Auto" (setq yas-indent-line 'auto)
-      :help "Indent each line of the snippet with `indent-according-to-mode'"
-      :active t :style radio   :selected (eq yas-indent-line 'auto)]
-     ["Fixed" (setq yas-indent-line 'fixed)
-      :help "Indent the snippet to the current column"
-      :active t :style radio   :selected (eq yas-indent-line 'fixed)]
-     ["None" (setq yas-indent-line 'none)
-      :help "Don't apply any particular snippet indentation after expansion"
-      :active t :style radio   :selected (not (member yas-indent-line '(fixed auto)))]
-     "----"
-     ["Also auto indent first line" (setq yas-also-auto-indent-first-line
-                                          (not yas-also-auto-indent-first-line))
-      :help "When auto-indenting also, auto indent the first line menu"
-      :active (eq yas-indent-line 'auto)
-      :style toggle :selected yas-also-auto-indent-first-line]
-     )
-    ("Prompting method"
-     ["System X-widget" (setq yas-prompt-functions
-                              (cons 'yas-x-prompt
-                                    (remove 'yas-x-prompt
-                                            yas-prompt-functions)))
-      :help "Use your windowing system's (gtk, mac, windows, etc...) default menu"
-      :active t :style radio   :selected (eq (car yas-prompt-functions)
-                                             'yas-x-prompt)]
-     ["Dropdown-list" (setq yas-prompt-functions
-                            (cons 'yas-dropdown-prompt
-                                  (remove 'yas-dropdown-prompt
-                                          yas-prompt-functions)))
-      :help "Use a special dropdown list"
-      :active t :style radio   :selected (eq (car yas-prompt-functions)
-                                             'yas-dropdown-prompt)]
-     ["Ido" (setq yas-prompt-functions
-                  (cons 'yas-ido-prompt
-                        (remove 'yas-ido-prompt
-                                yas-prompt-functions)))
-      :help "Use an ido-style minibuffer prompt"
-      :active t :style radio   :selected (eq (car yas-prompt-functions)
-                                             'yas-ido-prompt)]
-     ["Completing read" (setq yas-prompt-functions
-                              (cons 'yas-completing-prompt
-                                    (remove 'yas-completing-prompt
-                                            yas-prompt-functions)))
-      :help "Use a normal minibuffer prompt"
-      :active t :style radio   :selected (eq (car yas-prompt-functions)
-                                             'yas-completing-prompt)]
-     )
-    ("Misc"
-     ["Wrap region in exit marker"
-      (setq yas-wrap-around-region
-            (not yas-wrap-around-region))
-      :help "If non-nil automatically wrap the selected text in the $0 snippet exit"
-      :style toggle :selected yas-wrap-around-region]
-     ["Allow stacked expansions "
-      (setq yas-triggers-in-field
-            (not yas-triggers-in-field))
-      :help "If non-nil allow snippets to be triggered inside other snippet fields"
-      :style toggle :selected yas-triggers-in-field]
-     ["Revive snippets on undo "
-      (setq yas-snippet-revival
-            (not yas-snippet-revival))
-      :help "If non-nil allow snippets to become active again after undo"
-      :style toggle :selected yas-snippet-revival]
-     ["Good grace "
-      (setq yas-good-grace
-            (not yas-good-grace))
-      :help "If non-nil don't raise errors in bad embedded elisp in snippets"
-      :style toggle :selected yas-good-grace]
-     )
-    "----"
-    ["Load snippets..."  yas-load-directory
-     :help "Load snippets from a specific directory"]
-    ["Reload everything" yas-reload-all
-     :help "Cleanup stuff, reload snippets, rebuild menus"]
-    ["About"            yas-about
-     :help "Display some information about YASnippet"]))
+(defvar yas-minor-mode-map (yas--init-minor-keymap)
+  "The keymap used when `yas-minor-mode' is active.")
 
 (defvar yas--extra-modes nil
   "An internal list of modes for which to also lookup snippets.

From b36a4f7449f61d22942fc188884f3314bb7fec35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Thu, 13 Mar 2014 20:24:11 +0000
Subject: [PATCH 28/83] Properly closes #469: Don't use
 `yas--init-minor-keymap'

Previous reverted commit 498cbe4 forgot to take into account that one
of the tests used the `yas--init-minor-keymap' function that was
removed.

* yasnippet.el (yas-use-menu): Don't allow `nil' value, it's
useless.
(yas--minor-mode-menu): Use top-level `easy-menu-define' form.
(yas--init-minor-keymap): Remove definition.

* yasnippet-tests.el (test-rebindings): Don't use
`yas--init-minor-keymap'. Restore bindings explicitly. Not ideal,
but should work.
---
 yasnippet-tests.el |   6 +-
 yasnippet.el       | 223 ++++++++++++++++++++++-----------------------
 2 files changed, 112 insertions(+), 117 deletions(-)

diff --git a/yasnippet-tests.el b/yasnippet-tests.el
index d2f3c2c..02bf10c 100644
--- a/yasnippet-tests.el
+++ b/yasnippet-tests.el
@@ -600,7 +600,11 @@ TODO: be meaner"
           (yas-reload-all)
           (should (not (eq (key-binding (yas--read-keybinding "TAB")) 'yas-expand)))
           (should (eq (key-binding (yas--read-keybinding "SPC")) 'yas-expand))))
-    (setcdr yas-minor-mode-map (cdr (yas--init-minor-keymap)))))
+    ;; FIXME: actually should restore to whatever saved values where there.
+    ;; 
+    (define-key yas-minor-mode-map [tab] 'yas-expand)
+    (define-key yas-minor-mode-map (kbd "TAB") 'yas-expand)
+    (define-key yas-minor-mode-map (kbd "SPC") nil)))
 
 (ert-deftest test-yas-in-org ()
   (with-temp-buffer
diff --git a/yasnippet.el b/yasnippet.el
index f4b4751..50a6e4b 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -313,9 +313,6 @@ menu and the modes set in `yas--extra-modes' are listed.
 
 - If set to `full', every submenu is listed
 
-- It set to nil, don't display a menu at all (this requires a
-  `yas-reload-all' call if the menu is already visible).
-
 Any other non-nil value, every submenu is listed."
   :type '(choice (const :tag "Full"  full)
                  (const :tag "Abbreviate" abbreviate)
@@ -536,127 +533,121 @@ snippet itself contains a condition that returns the symbol
 (defvar yas--minor-mode-menu nil
   "Holds the YASnippet menu.")
 
-(defun yas--init-minor-keymap ()
-  "Set up the `yas-minor-mode' keymap."
+(defvar yas-minor-mode-map
   (let ((map (make-sparse-keymap)))
-    (when yas-use-menu
-      (easy-menu-define yas--minor-mode-menu
-      map
-      "Menu used when `yas-minor-mode' is active."
-      '("YASnippet"
-        "----"
-        ["Expand trigger" yas-expand
-         :help "Possibly expand tab trigger before point"]
-        ["Insert at point..." yas-insert-snippet
-         :help "Prompt for an expandable snippet and expand it at point"]
-        ["New snippet..." yas-new-snippet
-         :help "Create a new snippet in an appropriate directory"]
-        ["Visit snippet file..." yas-visit-snippet-file
-         :help "Prompt for an expandable snippet and find its file"]
-        "----"
-        ("Snippet menu behaviour"
-         ["Visit snippets" (setq yas-visit-from-menu t)
-          :help "Visit snippets from the menu"
-          :active t :style radio   :selected yas-visit-from-menu]
-         ["Expand snippets" (setq yas-visit-from-menu nil)
-          :help "Expand snippets from the menu"
-          :active t :style radio :selected (not yas-visit-from-menu)]
-         "----"
-         ["Show all known modes" (setq yas-use-menu 'full)
-          :help "Show one snippet submenu for each loaded table"
-          :active t :style radio   :selected (eq yas-use-menu 'full)]
-         ["Abbreviate according to current mode" (setq yas-use-menu 'abbreviate)
-          :help "Show only snippet submenus for the current active modes"
-          :active t :style radio   :selected (eq yas-use-menu 'abbreviate)])
-        ("Indenting"
-         ["Auto" (setq yas-indent-line 'auto)
-          :help "Indent each line of the snippet with `indent-according-to-mode'"
-          :active t :style radio   :selected (eq yas-indent-line 'auto)]
-         ["Fixed" (setq yas-indent-line 'fixed)
-          :help "Indent the snippet to the current column"
-          :active t :style radio   :selected (eq yas-indent-line 'fixed)]
-         ["None" (setq yas-indent-line 'none)
-          :help "Don't apply any particular snippet indentation after expansion"
-          :active t :style radio   :selected (not (member yas-indent-line '(fixed auto)))]
-         "----"
-         ["Also auto indent first line" (setq yas-also-auto-indent-first-line
-                                              (not yas-also-auto-indent-first-line))
-          :help "When auto-indenting also, auto indent the first line menu"
-          :active (eq yas-indent-line 'auto)
-          :style toggle :selected yas-also-auto-indent-first-line]
-         )
-        ("Prompting method"
-         ["System X-widget" (setq yas-prompt-functions
-                                  (cons 'yas-x-prompt
-                                        (remove 'yas-x-prompt
-                                                yas-prompt-functions)))
-          :help "Use your windowing system's (gtk, mac, windows, etc...) default menu"
-          :active t :style radio   :selected (eq (car yas-prompt-functions)
-                                                 'yas-x-prompt)]
-         ["Dropdown-list" (setq yas-prompt-functions
-                                (cons 'yas-dropdown-prompt
-                                      (remove 'yas-dropdown-prompt
-                                              yas-prompt-functions)))
-          :help "Use a special dropdown list"
-          :active t :style radio   :selected (eq (car yas-prompt-functions)
-                                                 'yas-dropdown-prompt)]
-         ["Ido" (setq yas-prompt-functions
-                      (cons 'yas-ido-prompt
-                            (remove 'yas-ido-prompt
-                                    yas-prompt-functions)))
-          :help "Use an ido-style minibuffer prompt"
-          :active t :style radio   :selected (eq (car yas-prompt-functions)
-                                                 'yas-ido-prompt)]
-         ["Completing read" (setq yas-prompt-functions
-                                  (cons 'yas-completing-prompt
-                                        (remove 'yas-completing-prompt
-                                                yas-prompt-functions)))
-          :help "Use a normal minibuffer prompt"
-          :active t :style radio   :selected (eq (car yas-prompt-functions)
-                                                 'yas-completing-prompt)]
-         )
-        ("Misc"
-         ["Wrap region in exit marker"
-          (setq yas-wrap-around-region
-                (not yas-wrap-around-region))
-          :help "If non-nil automatically wrap the selected text in the $0 snippet exit"
-          :style toggle :selected yas-wrap-around-region]
-         ["Allow stacked expansions "
-          (setq yas-triggers-in-field
-                (not yas-triggers-in-field))
-          :help "If non-nil allow snippets to be triggered inside other snippet fields"
-          :style toggle :selected yas-triggers-in-field]
-         ["Revive snippets on undo "
-          (setq yas-snippet-revival
-                (not yas-snippet-revival))
-          :help "If non-nil allow snippets to become active again after undo"
-          :style toggle :selected yas-snippet-revival]
-         ["Good grace "
-          (setq yas-good-grace
-                (not yas-good-grace))
-          :help "If non-nil don't raise errors in bad embedded elisp in snippets"
-          :style toggle :selected yas-good-grace]
-         )
-        "----"
-        ["Load snippets..."  yas-load-directory
-         :help "Load snippets from a specific directory"]
-        ["Reload everything" yas-reload-all
-         :help "Cleanup stuff, reload snippets, rebuild menus"]
-        ["About"            yas-about
-         :help "Display some information about YASnippet"])))
-
-    ;; Now for the stuff that has direct keybindings
-    ;;
     (define-key map [(tab)]     'yas-expand)
     (define-key map (kbd "TAB") 'yas-expand)
     (define-key map "\C-c&\C-s" 'yas-insert-snippet)
     (define-key map "\C-c&\C-n" 'yas-new-snippet)
     (define-key map "\C-c&\C-v" 'yas-visit-snippet-file)
-    map))
-
-(defvar yas-minor-mode-map (yas--init-minor-keymap)
+    map)
   "The keymap used when `yas-minor-mode' is active.")
 
+(easy-menu-define yas--minor-mode-menu
+      yas-minor-mode-map
+      "Menu used when `yas-minor-mode' is active."
+  '("YASnippet"
+    "----"
+    ["Expand trigger" yas-expand
+     :help "Possibly expand tab trigger before point"]
+    ["Insert at point..." yas-insert-snippet
+     :help "Prompt for an expandable snippet and expand it at point"]
+    ["New snippet..." yas-new-snippet
+     :help "Create a new snippet in an appropriate directory"]
+    ["Visit snippet file..." yas-visit-snippet-file
+     :help "Prompt for an expandable snippet and find its file"]
+    "----"
+    ("Snippet menu behaviour"
+     ["Visit snippets" (setq yas-visit-from-menu t)
+      :help "Visit snippets from the menu"
+      :active t :style radio   :selected yas-visit-from-menu]
+     ["Expand snippets" (setq yas-visit-from-menu nil)
+      :help "Expand snippets from the menu"
+      :active t :style radio :selected (not yas-visit-from-menu)]
+     "----"
+     ["Show all known modes" (setq yas-use-menu 'full)
+      :help "Show one snippet submenu for each loaded table"
+      :active t :style radio   :selected (eq yas-use-menu 'full)]
+     ["Abbreviate according to current mode" (setq yas-use-menu 'abbreviate)
+      :help "Show only snippet submenus for the current active modes"
+      :active t :style radio   :selected (eq yas-use-menu 'abbreviate)])
+    ("Indenting"
+     ["Auto" (setq yas-indent-line 'auto)
+      :help "Indent each line of the snippet with `indent-according-to-mode'"
+      :active t :style radio   :selected (eq yas-indent-line 'auto)]
+     ["Fixed" (setq yas-indent-line 'fixed)
+      :help "Indent the snippet to the current column"
+      :active t :style radio   :selected (eq yas-indent-line 'fixed)]
+     ["None" (setq yas-indent-line 'none)
+      :help "Don't apply any particular snippet indentation after expansion"
+      :active t :style radio   :selected (not (member yas-indent-line '(fixed auto)))]
+     "----"
+     ["Also auto indent first line" (setq yas-also-auto-indent-first-line
+                                          (not yas-also-auto-indent-first-line))
+      :help "When auto-indenting also, auto indent the first line menu"
+      :active (eq yas-indent-line 'auto)
+      :style toggle :selected yas-also-auto-indent-first-line]
+     )
+    ("Prompting method"
+     ["System X-widget" (setq yas-prompt-functions
+                              (cons 'yas-x-prompt
+                                    (remove 'yas-x-prompt
+                                            yas-prompt-functions)))
+      :help "Use your windowing system's (gtk, mac, windows, etc...) default menu"
+      :active t :style radio   :selected (eq (car yas-prompt-functions)
+                                             'yas-x-prompt)]
+     ["Dropdown-list" (setq yas-prompt-functions
+                            (cons 'yas-dropdown-prompt
+                                  (remove 'yas-dropdown-prompt
+                                          yas-prompt-functions)))
+      :help "Use a special dropdown list"
+      :active t :style radio   :selected (eq (car yas-prompt-functions)
+                                             'yas-dropdown-prompt)]
+     ["Ido" (setq yas-prompt-functions
+                  (cons 'yas-ido-prompt
+                        (remove 'yas-ido-prompt
+                                yas-prompt-functions)))
+      :help "Use an ido-style minibuffer prompt"
+      :active t :style radio   :selected (eq (car yas-prompt-functions)
+                                             'yas-ido-prompt)]
+     ["Completing read" (setq yas-prompt-functions
+                              (cons 'yas-completing-prompt
+                                    (remove 'yas-completing-prompt
+                                            yas-prompt-functions)))
+      :help "Use a normal minibuffer prompt"
+      :active t :style radio   :selected (eq (car yas-prompt-functions)
+                                             'yas-completing-prompt)]
+     )
+    ("Misc"
+     ["Wrap region in exit marker"
+      (setq yas-wrap-around-region
+            (not yas-wrap-around-region))
+      :help "If non-nil automatically wrap the selected text in the $0 snippet exit"
+      :style toggle :selected yas-wrap-around-region]
+     ["Allow stacked expansions "
+      (setq yas-triggers-in-field
+            (not yas-triggers-in-field))
+      :help "If non-nil allow snippets to be triggered inside other snippet fields"
+      :style toggle :selected yas-triggers-in-field]
+     ["Revive snippets on undo "
+      (setq yas-snippet-revival
+            (not yas-snippet-revival))
+      :help "If non-nil allow snippets to become active again after undo"
+      :style toggle :selected yas-snippet-revival]
+     ["Good grace "
+      (setq yas-good-grace
+            (not yas-good-grace))
+      :help "If non-nil don't raise errors in bad embedded elisp in snippets"
+      :style toggle :selected yas-good-grace]
+     )
+    "----"
+    ["Load snippets..."  yas-load-directory
+     :help "Load snippets from a specific directory"]
+    ["Reload everything" yas-reload-all
+     :help "Cleanup stuff, reload snippets, rebuild menus"]
+    ["About"            yas-about
+     :help "Display some information about YASnippet"]))
+
 (defvar yas--extra-modes nil
   "An internal list of modes for which to also lookup snippets.
 

From 8e7295b93460b7d389ecb65969fcedbee6495de8 Mon Sep 17 00:00:00 2001
From: Joao Tavora <joaotavora@gmail.com>
Date: Fri, 14 Mar 2014 09:55:22 +0000
Subject: [PATCH 29/83] Closes #403: more uniform behaviour for `yas-use-menu'

Suggested by Noam Postavsky, this uses the :visible arg to
`easy-menu-define' to hide the whole "YASnippet" menu according to the
run-time value of `yas-use-menu'. Previously, only the load-time value
was considered and some functions we're noops when `yas-use-menu' was
nil.

The per-mode snippet submenus are now always updated even if
`yas-use-menu' is nil, although they won't be shown until it becomes
non-nil.

* yasnippet.el (yas--minor-mode-menu): Use :visible arg and eval `yas-use-menu'
(yas--update-template): Always update the menu.
(yas--show-menu-p): Always return t if `yas-use-menu' is non-nil and not `abbreviate'
(yas-define-menu): Always define a menu.
(yas-use-menu): Update docstring.
---
 yasnippet.el | 45 ++++++++++++++++++++-------------------------
 1 file changed, 20 insertions(+), 25 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index 50a6e4b..252083a 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -313,6 +313,8 @@ menu and the modes set in `yas--extra-modes' are listed.
 
 - If set to `full', every submenu is listed
 
+- If set to `nil', hide the menu.
+
 Any other non-nil value, every submenu is listed."
   :type '(choice (const :tag "Full"  full)
                  (const :tag "Abbreviate" abbreviate)
@@ -546,7 +548,7 @@ snippet itself contains a condition that returns the symbol
 (easy-menu-define yas--minor-mode-menu
       yas-minor-mode-map
       "Menu used when `yas-minor-mode' is active."
-  '("YASnippet"
+  '("YASnippet" :visible yas-use-menu
     "----"
     ["Expand trigger" yas-expand
      :help "Possibly expand tab trigger before point"]
@@ -1063,8 +1065,7 @@ Also takes care of adding and updating to the associated menu."
   (yas--add-template table template)
   ;; Take care of the menu
   ;;
-  (when yas-use-menu
-    (yas--update-template-menu table template)))
+  (yas--update-template-menu table template))
 
 (defun yas--update-template-menu (table template)
   "Update every menu-related for TEMPLATE."
@@ -1976,10 +1977,7 @@ static in the menu."
                (mapcar #'(lambda (table)
                            (yas--table-mode table))
                        (yas--get-snippet-tables))))
-        ((eq yas-use-menu 'full)
-         t)
-        ((eq yas-use-menu t)
-         t)))
+        (yas-use-menu t)))
 
 (defun yas--delete-from-keymap (keymap uuid)
   "Recursively delete items with UUID from KEYMAP and its submenus."
@@ -2022,24 +2020,21 @@ MENU is a list, its elements can be:
   list of groups of the snippets defined thereafter.
 
 OMIT-ITEMS is a list of snippet uuid's that will always be
-omitted from MODE's menu, even if they're manually loaded.
-
-This function does nothing if `yas-use-menu' is nil."
-  (when yas-use-menu
-    (let* ((table (yas--table-get-create mode))
-           (hash (yas--table-uuidhash table)))
-      (yas--define-menu-1 table
-                          (yas--menu-keymap-get-create mode)
-                          menu
-                          hash)
-      (dolist (uuid omit-items)
-        (let ((template (or (gethash uuid hash)
-                            (yas--populate-template (puthash uuid
-                                                             (yas--make-blank-template)
-                                                             hash)
-                                                    :table table
-                                                    :uuid uuid))))
-          (setf (yas--template-menu-binding-pair template) (cons nil :none)))))))
+omitted from MODE's menu, even if they're manually loaded."
+  (let* ((table (yas--table-get-create mode))
+         (hash (yas--table-uuidhash table)))
+    (yas--define-menu-1 table
+                        (yas--menu-keymap-get-create mode)
+                        menu
+                        hash)
+    (dolist (uuid omit-items)
+      (let ((template (or (gethash uuid hash)
+                          (yas--populate-template (puthash uuid
+                                                           (yas--make-blank-template)
+                                                           hash)
+                                                  :table table
+                                                  :uuid uuid))))
+        (setf (yas--template-menu-binding-pair template) (cons nil :none))))))
 
 (defun yas--define-menu-1 (table menu-keymap menu uuidhash &optional group-list)
   "Helper for `yas-define-menu'."

From a4e04f954b8c3f76002bbd4f36784b4e1d7d5fef Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Sun, 23 Mar 2014 19:44:35 -0400
Subject: [PATCH 30/83] update doc for org 8.x

Keeping compabitily with 7.9 for now
---
 doc/org-setup.inc     |  2 ++
 doc/yas-doc-helper.el | 15 +++++++++++++--
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/doc/org-setup.inc b/doc/org-setup.inc
index 98f7c04..6ad09c9 100644
--- a/doc/org-setup.inc
+++ b/doc/org-setup.inc
@@ -6,4 +6,6 @@
 
 #+OPTIONS: author:nil num:nil
 #+AUTHOR:
+# org < 8.0 use +STYLE, after use +HTML_HEAD
 #+STYLE: <link rel="stylesheet" type="text/css" href="stylesheets/manual.css" />
+#+HTML_HEAD: <link rel="stylesheet" type="text/css" href="stylesheets/manual.css" />
diff --git a/doc/yas-doc-helper.el b/doc/yas-doc-helper.el
index 925e41b..f6e101c 100755
--- a/doc/yas-doc-helper.el
+++ b/doc/yas-doc-helper.el
@@ -27,9 +27,18 @@
 (eval-when-compile
   (require 'cl))
 (require 'org)
-(require 'org-publish)
+(or (require 'org-publish nil t)
+    (require 'ox-publish))
 (require 'yasnippet) ; docstrings must be loaded
 
+(defun yas--org-raw-html (tag content)
+  ;; in version 8.0 org-mode changed the export syntax, see
+  ;; http://orgmode.org/worg/org-8.0.html#sec-8-1
+  (format (if (version< org-version "8.0.0")
+              "@<%s>%s@</%s>"                ; old: @<tag>
+            "@@html:<%s>@@%s@@html:</%s>@@") ; new: @@html:<tag>@@
+          tag content tag))
+
 (defun yas--document-symbol (symbol level)
   (flet ((concat-lines (&rest lines)
                        (mapconcat #'identity lines "\n")))
@@ -71,7 +80,8 @@
                              (prefix (downcase match1))
                              (suffix (match-string 2 match))
                              (fmt (cond
-                                   ((member prefix args) "@<code>%s@</code>")
+                                   ((member prefix args)
+                                    (yas--org-raw-html "code" "%s"))
                                    ((null suffix) "/%s/"))))
                         (if fmt (format fmt prefix)
                           match1)))
@@ -125,6 +135,7 @@
                   (princ yas--version (current-buffer)))))
        (proj-plist
         (list
+         :publishing-function 'org-html-publish-to-html
          :base-directory dir :publishing-directory dir
          :html-preamble
          (with-temp-buffer

From 4d9eee93ba855d1ae5700620a93ea8a1998f0bf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Sun, 27 Apr 2014 01:49:12 +0100
Subject: [PATCH 31/83] Simpler, more effective .travis file

* .travis.yml (env): New section.
(install): Simpler install recipes.
(script): Just rake compile and rake tests.
---
 .travis.yml | 41 +++++++++++++++++++++--------------------
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 83990f6..4bd7940 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,23 +1,24 @@
 language: emacs
-before_install:
-  - echo -e "\ndeb http://us.archive.ubuntu.com/ubuntu raring universe multiverse main" | sudo tee -a /etc/apt/sources.list
-  - echo -e "\ndeb http://emacs.naquadah.org/ stable/" | sudo tee -a /etc/apt/sources.list
-  - echo -e "\ndeb-src http://emacs.naquadah.org/ stable/" | sudo tee -a /etc/apt/sources.list
-  - cat /etc/apt/sources.list
-  - wget -q -O - http://emacs.naquadah.org/key.gpg | sudo apt-key add -
-  - sudo apt-get update
+
+env:
+  - "EMACS=emacs23"
+  - "EMACS=emacs24"
+
 install:
-  - sudo apt-get install emacs
-  - sudo apt-get -t raring install libgnutls26
-  - sudo apt-get install emacs-snapshot-nox
-  - curl -O https://raw.github.com/ohler/ert/c619b56c5bc6a866e33787489545b87d79973205/lisp/emacs-lisp/ert.el
-  - curl -O https://raw.github.com/ohler/ert/c619b56c5bc6a866e33787489545b87d79973205/lisp/emacs-lisp/ert-x.el
-  - curl -o cl-lib.el http://elpa.gnu.org/packages/cl-lib-0.3.el
-before_script:
+  - if [ "$EMACS" = "emacs23" ]; then
+        sudo apt-get -qq update &&
+        sudo apt-get -qq -f install &&
+        sudo apt-get -qq install emacs23-nox &&
+        curl -LO https://raw.githubusercontent.com/ohler/ert/c619b56c5bc6a866e33787489545b87d79973205/lisp/emacs-lisp/ert.el &&
+        curl -LO https://raw.githubusercontent.com/ohler/ert/c619b56c5bc6a866e33787489545b87d79973205/lisp/emacs-lisp/ert-x.el &&
+        curl -Lo cl-lib.el http://elpa.gnu.org/packages/cl-lib-0.5.el;
+    fi
+  - if [ "$EMACS" = "emacs24" ]; then
+        sudo add-apt-repository -y ppa:cassou/emacs &&
+        sudo apt-get -qq update &&
+        sudo apt-get -qq -f install &&
+        sudo apt-get -qq install emacs24-nox;
+    fi
+
 script:
-  - export EMACS=emacs; rm *.elc; rake compile; rake tests
-  - rm ert*.el; rm cl-lib.el
-  - export EMACS=emacs-snapshot; rm *.elc; rake compile; rake tests
-notifications:
-  email:
-    - joaotavora@gmail.com
+  - rake compile; rake tests

From 4473b4ede5b9fb4736ef78482511349d2fe171eb Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Sat, 26 Apr 2014 19:09:57 -0400
Subject: [PATCH 32/83] New test for cc-mode's fontification functions

This issue requires font locking to trigger. This can be be done by
let-binding noninteractive to nil and using a buffer name that doesn't
start with a space, instead of the external emacs hack which is now
redundant.

* yasnippet-tests.el (yas--with-font-locked-temp-buffer): new macro
similar to with-temp-buffer but enables font-lock-mode even in -batch
mode.
(example-for-issue-474): new test
(example-for-issue-404, example-for-issue-404-c-mode): use new macro
(example-for-issue-404-external-emacs): removed
---
 yasnippet-tests.el | 82 ++++++++++++++++++++++------------------------
 1 file changed, 39 insertions(+), 43 deletions(-)

diff --git a/yasnippet-tests.el b/yasnippet-tests.el
index 02bf10c..f87b3d4 100644
--- a/yasnippet-tests.el
+++ b/yasnippet-tests.el
@@ -204,60 +204,56 @@
       (ert-simulate-command `(yas-mock-insert "bbb"))
       (should (string= (yas--buffer-contents) "if condition\naaa\nelse\nbbb\nend")))))
 
-(ert-deftest example-for-issue-404 ()
-  (with-temp-buffer
-    (c++-mode)
-    (yas-minor-mode 1)
-    (insert "#include <foo>\n")
-    (let ((snippet "main"))
-      (let ((yas-good-grace nil)) (yas-expand-snippet snippet))
-      (should (string= (yas--buffer-contents) "#include <foo>\nmain")))))
+(defmacro yas--with-font-locked-temp-buffer (&rest body)
+  "Like `with-temp-buffer', but ensure `font-lock-mode'."
+  (declare (indent 0) (debug t))
+  (let ((temp-buffer (make-symbol "temp-buffer")))
+    ;; NOTE: buffer name must not start with a space, otherwise
+    ;; `font-lock-mode' doesn't turn on.
+    `(let ((,temp-buffer (generate-new-buffer "*yas-temp*")))
+       (with-current-buffer ,temp-buffer
+         ;; pretend we're interactive so `font-lock-mode' turns on
+         (let ((noninteractive nil)
+               ;; turn on font locking after major mode change
+               (change-major-mode-after-body-hook #'font-lock-mode))
+           (unwind-protect
+               (progn (require 'font-lock)
+                      ;; turn on font locking before major mode change
+                      (font-lock-mode +1)
+                      ,@body)
+             (and (buffer-name ,temp-buffer)
+                  (kill-buffer ,temp-buffer))))))))
 
-(ert-deftest example-for-issue-404-c-mode ()
-  (with-temp-buffer
+(ert-deftest example-for-issue-474 ()
+  (yas--with-font-locked-temp-buffer
     (c-mode)
     (yas-minor-mode 1)
     (insert "#include <foo>\n")
-    (let ((snippet "main"))
-      (let ((yas-good-grace nil)) (yas-expand-snippet snippet))
-      (should (string= (yas--buffer-contents) "#include <foo>\nmain")))))
+    (let ((yas-good-grace nil)) (yas-expand-snippet "`(insert \"TODO: \")`"))
+    (should (string= (yas--buffer-contents) "#include <foo>\nTODO: "))))
 
-(ert-deftest example-for-issue-404-external-emacs ()
-  :tags '(:external)
-  (let ((fixture-el-file (make-temp-file "yas-404-fixture" nil ".el")))
-    (with-temp-buffer
-      (insert (pp-to-string
-               `(condition-case _
-                    (progn
-                      (require 'yasnippet-tests)
-                      (yas-with-snippet-dirs
-                        '((".emacs.d/snippets"
-                           ("c-mode"
-                            ("main" . "int main ()"))))
-                        (yas-global-mode)
-                        (switch-to-buffer "foo.c")
-                        (c-mode)
-                        (insert "#include <iostream>\nmain")
-                        (setq yas-good-grace nil)
-                        (yas-expand)
-                        (should (string= (buffer-string)
-                                         "#include <iostream>\nint main ()"))
-                        (kill-emacs 0)))
-                  (error (kill-emacs -1)))))
-      (write-file fixture-el-file))
-    (should (= 0
-               (call-process (concat invocation-directory invocation-name)
-                             nil nil nil
-                             "-Q"  "--batch"
-                             "-L" "." "-l" fixture-el-file)))))
+(ert-deftest example-for-issue-404 ()
+  (yas--with-font-locked-temp-buffer
+    (c++-mode)
+    (yas-minor-mode 1)
+    (insert "#include <foo>\n")
+    (let ((yas-good-grace nil)) (yas-expand-snippet "main"))
+    (should (string= (yas--buffer-contents) "#include <foo>\nmain"))))
+
+(ert-deftest example-for-issue-404-c-mode ()
+  (yas--with-font-locked-temp-buffer
+    (c-mode)
+    (yas-minor-mode 1)
+    (insert "#include <foo>\n")
+    (let ((yas-good-grace nil)) (yas-expand-snippet "main"))
+    (should (string= (yas--buffer-contents) "#include <foo>\nmain"))))
 
 (ert-deftest middle-of-buffer-snippet-insertion ()
   (with-temp-buffer
     (yas-minor-mode 1)
     (insert "beginning")
     (save-excursion (insert "end"))
-    (let ((snippet "-middle-"))
-      (yas-expand-snippet snippet))
+    (yas-expand-snippet "-middle-")
     (should (string= (yas--buffer-contents) "beginning-middle-end"))))
 
 (ert-deftest another-example-for-issue-271 ()

From 599a2622c6a988829d181ec3aa951848b07d7819 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Sat, 26 Apr 2014 19:26:54 -0400
Subject: [PATCH 33/83] Closes #474: fix cc-mode fontification conflict

* yasnippet.el (yas--save-backquotes): don't change buffer while
narrowed.
---
 yasnippet.el | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/yasnippet.el b/yasnippet.el
index 252083a..e2dbca0 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -3907,7 +3907,8 @@ With optional string TEXT do it in string instead of the buffer."
 with their evaluated value into `yas--backquote-markers-and-strings'."
   (while (re-search-forward yas--backquote-lisp-expression-regexp nil t)
     (let ((current-string (match-string-no-properties 1)) transformed)
-      (delete-region (match-beginning 0) (match-end 0))
+      (save-restriction (widen)
+                        (delete-region (match-beginning 0) (match-end 0)))
       (setq transformed (yas--eval-lisp (yas--read-lisp (yas--restore-escapes current-string '(?`)))))
       (goto-char (match-beginning 0))
       (when transformed

From a80033d1426aee501d5b704318180cf96fbc115f Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Sat, 10 May 2014 15:56:36 -0400
Subject: [PATCH 34/83] Refactor yas-good-grace error handling

* yasnippet.el
(yas--handle-error): New function.
(yas--eval-lisp-no-saves, yas--eval-lisp): Use it.
---
 yasnippet.el | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index e2dbca0..c1527dd 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -1246,6 +1246,12 @@ yasnippet keeps a list of modes like this to help the judgment."
   (or (fboundp mode)
       (find mode yas--known-modes)))
 
+(defun yas--handle-error (err)
+  "Handle error depending on value of `yas-good-grace'."
+  (let ((msg (yas--format "elisp error: %s" (error-message-string err))))
+    (if yas-good-grace msg
+      (error msg))))
+
 (defun yas--eval-lisp (form)
   "Evaluate FORM and convert the result to string."
   (let ((retval (catch 'yas--exception
@@ -1257,10 +1263,7 @@ yasnippet keeps a list of modes like this to help the judgment."
                             (let ((result (eval form)))
                               (when result
                                 (format "%s" result))))))
-                    (error (if yas-good-grace
-                               (yas--format "elisp error! %s" (error-message-string err))
-                             (error (yas--format "elisp error: %s"
-                                            (error-message-string err)))))))))
+                    (error (yas--handle-error err))))))
     (when (and (consp retval)
                (eq 'yas--exception (car retval)))
       (error (cdr retval)))
@@ -1269,10 +1272,7 @@ yasnippet keeps a list of modes like this to help the judgment."
 (defun yas--eval-lisp-no-saves (form)
   (condition-case err
       (eval form)
-    (error (if yas-good-grace
-               (yas--format "elisp error! %s" (error-message-string err))
-             (error (yas--format "elisp error: %s"
-                            (error-message-string err)))))))
+    (error (yas--handle-error err))))
 
 (defun yas--read-lisp (string &optional nil-on-error)
   "Read STRING as a elisp expression and return it.

From 580e5c64f62153f0a3c6093770d4ffabcf695ce5 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Sat, 10 May 2014 19:01:32 -0400
Subject: [PATCH 35/83] Don't lose error message when yas-good-grace is t

* yasnippet.el
  (yas--eval-lisp-no-saves): Pass error message to message function.
  (yas--handle-error): Pass "%s" to error to avoid accidentally
  interpreting % in the error message as format codes.
---
 yasnippet.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index c1527dd..9d4764d 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -1250,7 +1250,7 @@ yasnippet keeps a list of modes like this to help the judgment."
   "Handle error depending on value of `yas-good-grace'."
   (let ((msg (yas--format "elisp error: %s" (error-message-string err))))
     (if yas-good-grace msg
-      (error msg))))
+      (error "%s" msg))))
 
 (defun yas--eval-lisp (form)
   "Evaluate FORM and convert the result to string."
@@ -1272,7 +1272,7 @@ yasnippet keeps a list of modes like this to help the judgment."
 (defun yas--eval-lisp-no-saves (form)
   (condition-case err
       (eval form)
-    (error (yas--handle-error err))))
+    (error (message "%s" (yas--handle-error err)))))
 
 (defun yas--read-lisp (string &optional nil-on-error)
   "Read STRING as a elisp expression and return it.

From 8ced5c7f1d3d9128f4581accf3450710b6404b99 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Sat, 10 May 2014 18:48:37 -0400
Subject: [PATCH 36/83] Remove type, expand-env from new snippet value

They are seldom used, and can cause errors if left in.

* yasnippet.el (yas-new-snippet-default): Remove type and expand-env
  directives.
---
 yasnippet.el | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index 9d4764d..eeea636 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -188,9 +188,7 @@ as the default for storing the user's new snippets."
 # -*- mode: snippet; require-final-newline: nil -*-
 # name: $1
 # key: ${2:${1:$(yas--key-from-desc yas-text)}}${3:
-# binding: ${4:direct-keybinding}}${5:
-# expand-env: ((${6:some-var} ${7:some-value}))}${8:
-# type: command}
+# binding: ${4:direct-keybinding}}
 # --
 $0"
   "Default snippet to use when creating a new snippet.

From f1760272e0f287d9b0a13ed2c7dbe1bfd5df01bc Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Sat, 10 May 2014 14:07:58 -0400
Subject: [PATCH 37/83] Restore backquotes lost in rst -> org translation

* doc/snippet-development.org: Re-add lost `s.
---
 doc/snippet-development.org | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/doc/snippet-development.org b/doc/snippet-development.org
index a7d653a..e48e397 100644
--- a/doc/snippet-development.org
+++ b/doc/snippet-development.org
@@ -182,14 +182,14 @@ to TextMate's.
 ** Plain Text
 
 Arbitrary text can be included as the content of a template. They are
-usually interpreted as plain text, except =$= and ==. You need to
-use \` to escape them: =\$= and =\=. The \` itself may also needed to be
+usually interpreted as plain text, except =$= and =`=. You need to
+use =\= to escape them: =\$= and =\`=. The =\= itself may also needed to be
 escaped as =\\= sometimes.
 
 ** Embedded Emacs-lisp code
 
 Emacs-Lisp code can be embedded inside the template, written inside
-back-quotes (==). The lisp forms are evaluated when the snippet is
+back-quotes (=`=). The lisp forms are evaluated when the snippet is
 being expanded. The evaluation is done in the same buffer as the
 snippet being expanded.
 

From 4c16eaee0e5142da2a2780259254a017a0feb7bf Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Sat, 10 May 2014 16:28:09 -0400
Subject: [PATCH 38/83] Document uuid directive

* doc/snippet-development.org: Mention uuid in directive list.
* yasnippet.el (yas-define-snippets): Fix docstring grammar.
---
 doc/snippet-development.org | 6 ++++++
 yasnippet.el                | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/doc/snippet-development.org b/doc/snippet-development.org
index e48e397..fb9b94a 100644
--- a/doc/snippet-development.org
+++ b/doc/snippet-development.org
@@ -169,6 +169,12 @@ This binding will be recorded in the keymap =html-mode-map=. To expand a
 paragraph tag newlines, just press =C-u C-c C-c C-m=. Omitting the =C-u=
 will expand the paragraph tag without newlines.
 
+** =# uuid:= unique identifier
+
+This provides to a way to identify a snippet, independent of its name.
+Loading a second snippet file with the same uuid would replace the
+previous snippet.
+
 ** =# contributor:= snippet author
 
 This is optional and has no effect whatsoever on snippet functionality,
diff --git a/yasnippet.el b/yasnippet.el
index eeea636..43564ff 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -1631,8 +1631,8 @@ The remaining elements are strings.
 FILE is probably of very little use if you're programatically
 defining snippets.
 
-UUID is the snippets \"unique-id\". Loading a second snippet file
-with the same uuid replaced the previous snippet.
+UUID is the snippet's \"unique-id\". Loading a second snippet
+file with the same uuid would replace the previous snippet.
 
 You can use `yas--parse-template' to return such lists based on
 the current buffers contents."

From 6b04dada67dcc9476a08d3ba59efcb831a66ac73 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Sat, 10 May 2014 18:51:45 -0400
Subject: [PATCH 39/83] Document type directive

* doc/snippet-development.org: Add type to directive list.
---
 doc/snippet-development.org | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/doc/snippet-development.org b/doc/snippet-development.org
index fb9b94a..4e54bb1 100644
--- a/doc/snippet-development.org
+++ b/doc/snippet-development.org
@@ -169,6 +169,16 @@ This binding will be recorded in the keymap =html-mode-map=. To expand a
 paragraph tag newlines, just press =C-u C-c C-c C-m=. Omitting the =C-u=
 will expand the paragraph tag without newlines.
 
+** =# type:= =snippet= or =command=
+
+If the =type= directive is set to =command=, the body of the snippet
+is interpreted as lisp code to be evaluated when the snippet is
+triggered.
+
+If it's =snippet= (the default when there is no =type= directive), the
+snippet body will be parsed according to the [[Template Syntax]],
+described below.
+
 ** =# uuid:= unique identifier
 
 This provides to a way to identify a snippet, independent of its name.
@@ -180,7 +190,7 @@ previous snippet.
 This is optional and has no effect whatsoever on snippet functionality,
 but it looks nice.
 
-* Template syntax
+* <<Template syntax>>
 
 The syntax of the snippet template is simple but powerful, very similar
 to TextMate's.

From fe288a156c063666d9c6613b6eea0ed5a515a86b Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Sun, 11 May 2014 16:58:01 -0400
Subject: [PATCH 40/83] Fix publishing with org 7.9

* doc/yas-doc-helper.el: Only use org-html-publish-to-html when it's
  fbound.
---
 doc/yas-doc-helper.el | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/doc/yas-doc-helper.el b/doc/yas-doc-helper.el
index f6e101c..76a00b1 100755
--- a/doc/yas-doc-helper.el
+++ b/doc/yas-doc-helper.el
@@ -134,17 +134,17 @@
                     (buffer-string))
                   (princ yas--version (current-buffer)))))
        (proj-plist
-        (list
-         :publishing-function 'org-html-publish-to-html
-         :base-directory dir :publishing-directory dir
-         :html-preamble
-         (with-temp-buffer
-           (insert-file-contents (expand-file-name "nav-menu.html.inc" dir))
-           (buffer-string))
-         :html-postamble
-         (concat "<hr><p class='creator'>Generated by %c on %d from "
-                 rev "</p>\n"
-                 "<p class='xhtml-validation'>%v</p>\n")))
+        `(,@(when (fboundp 'org-html-publish-to-html)
+              '(:publishing-function 'org-html-publish-to-html))
+          :base-directory ,dir :publishing-directory ,dir
+          :html-preamble
+          ,(with-temp-buffer
+             (insert-file-contents (expand-file-name "nav-menu.html.inc" dir))
+             (buffer-string))
+          :html-postamble
+          ,(concat "<hr><p class='creator'>Generated by %c on %d from "
+                   rev "</p>\n"
+                   "<p class='xhtml-validation'>%v</p>\n")))
        (project (assoc "yasnippet" org-publish-project-alist)))
   (if project
       (setcdr project proj-plist)

From 763f5faa14614b207d65e03594b80ba662f47efc Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Wed, 14 May 2014 19:49:11 -0400
Subject: [PATCH 41/83] Closes #474: fix more cc-mode font-lock conflicts

* yasnippet-tests.el (example-for-issue-474): Don't call insert from
  within backquotes, it's redundant and prevents proper testing of
  backquote expansion.

* yasnippet.el (yas--restore-backquotes, yas--save-backquotes): Ensure
  the buffer isn't narrowed while modifying it to avoid conflicting with
  cc-mode fontification.
---
 yasnippet-tests.el |  2 +-
 yasnippet.el       | 16 ++++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/yasnippet-tests.el b/yasnippet-tests.el
index f87b3d4..c6b878d 100644
--- a/yasnippet-tests.el
+++ b/yasnippet-tests.el
@@ -229,7 +229,7 @@
     (c-mode)
     (yas-minor-mode 1)
     (insert "#include <foo>\n")
-    (let ((yas-good-grace nil)) (yas-expand-snippet "`(insert \"TODO: \")`"))
+    (let ((yas-good-grace nil)) (yas-expand-snippet "`\"TODO: \"`"))
     (should (string= (yas--buffer-contents) "#include <foo>\nTODO: "))))
 
 (ert-deftest example-for-issue-404 ()
diff --git a/yasnippet.el b/yasnippet.el
index 43564ff..b4432b8 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -3911,9 +3911,11 @@ with their evaluated value into `yas--backquote-markers-and-strings'."
       (goto-char (match-beginning 0))
       (when transformed
         (let ((marker (make-marker)))
-          (insert "Y") ;; quite horrendous, I love it :)
-          (set-marker marker (point))
-          (insert "Y")
+          (save-restriction
+            (widen)
+            (insert "Y") ;; quite horrendous, I love it :)
+            (set-marker marker (point))
+            (insert "Y"))
           (push (cons marker transformed) yas--backquote-markers-and-strings))))))
 
 (defun yas--restore-backquotes ()
@@ -3924,9 +3926,11 @@ with their evaluated value into `yas--backquote-markers-and-strings'."
            (string (cdr marker-and-string)))
       (save-excursion
         (goto-char marker)
-        (delete-char -1)
-        (insert string)
-        (delete-char 1)
+        (save-restriction
+          (widen)
+          (delete-char -1)
+          (insert string)
+          (delete-char 1))
         (set-marker marker nil)))))
 
 (defun yas--scan-sexps (from count)

From f98c527a38b08d1f8b786660a627887475dc7323 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Tue, 17 Jun 2014 19:21:22 -0400
Subject: [PATCH 42/83] Replace text -> yas-text in documentation

* doc/snippet-development.org: replace text -> yas-text
---
 doc/snippet-development.org | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/doc/snippet-development.org b/doc/snippet-development.org
index 4e54bb1..c4de864 100644
--- a/doc/snippet-development.org
+++ b/doc/snippet-development.org
@@ -283,12 +283,13 @@ the field and others mirrors.
 
 ** Mirrors with <<transformations>>
 
-If the value of an =${n:=-construct starts with and contains =$(=, then
-it is interpreted as a mirror for field =n= with a transformation. The
-mirror's text content is calculated according to this transformation,
-which is Emacs-lisp code that gets evaluated in an environment where the
-variable =text= (or [[sym:yas-text][=yas-text=]]) is bound to the text content (string)
-contained in the field =n=.Here's an example for Objective-C:
+If the value of an =${n:=-construct starts with and contains =$(=,
+then it is interpreted as a mirror for field =n= with a
+transformation. The mirror's text content is calculated according to
+this transformation, which is Emacs-lisp code that gets evaluated in
+an environment where the variable [[sym:yas-text][=yas-text=]] is bound to the text
+content (string) contained in the field =n=. Here's an example for
+Objective-C:
 
 #+BEGIN_SRC snippet
   - (${1:id})${2:foo}
@@ -296,7 +297,7 @@ contained in the field =n=.Here's an example for Objective-C:
       return $2;
   }
 
-  - (void)set${2:$(capitalize text)}:($1)aValue
+  - (void)set${2:$(capitalize yas-text)}:($1)aValue
   {
       [$2 autorelease];
       $2 = [aValue retain];
@@ -304,12 +305,13 @@ contained in the field =n=.Here's an example for Objective-C:
   $0
 #+END_SRC
 
-Look at =${2:$(capitalize text)}=, it is a mirror with transformation
-instead of a field. The actual field is at the first line: =${2:foo}=.
-When you type text in =${2:foo}=, the transformation will be evaluated
-and the result will be placed there as the transformed text. So in this
-example, if you type "baz" in the field, the transformed text will be
-"Baz". This example is also available in the screencast.
+Look at =${2:$(capitalize yas-text)}=, it is a mirror with
+transformation instead of a field. The actual field is at the first
+line: =${2:foo}=. When you type text in =${2:foo}=, the transformation
+will be evaluated and the result will be placed there as the
+transformed text. So in this example, if you type "baz" in the field,
+the transformed text will be "Baz". This example is also available in
+the screencast.
 
 Another example is for =rst-mode=. In reStructuredText, the document
 title can be some text surrounded by "===" below and above. The "==="
@@ -332,9 +334,9 @@ is a valid title but
 is not. Here's an snippet for rst title:
 
 #+BEGIN_SRC snippet
-  ${1:$(make-string (string-width text) ?\=)}
+  ${1:$(make-string (string-width yas-text) ?\=)}
   ${1:Title}
-  ${1:$(make-string (string-width text) ?\=)}
+  ${1:$(make-string (string-width yas-text) ?\=)}
 
   $0
 #+END_SRC

From e53ec1e0c3611c3a0f4ac6228aab041a82b9d3bb Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Tue, 17 Jun 2014 19:40:55 -0400
Subject: [PATCH 43/83] Make snippets submodule track master, update it

This should let us update the submodule just by running
    git submodule update --remote
rather than having to cd into it, and then pull.
---
 .gitmodules | 1 +
 snippets    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitmodules b/.gitmodules
index 607033b..e9a0388 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,6 +1,7 @@
 [submodule "snippets"]
         path = snippets
         url = https://github.com/AndreaCrotti/yasnippet-snippets.git
+	branch = master
 [submodule "yasmate"]
         path = yasmate
         url = https://github.com/capitaomorte/yasmate.git
diff --git a/snippets b/snippets
index 250814e..86978f3 160000
--- a/snippets
+++ b/snippets
@@ -1 +1 @@
-Subproject commit 250814eef42372c419c8f954f1f6ea5cd04a8b9b
+Subproject commit 86978f377b8cf1267b8e862f6c3c1c9eccc993ad

From e1ed662b7ca235d3feffe714280433ea25c83e9c Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Sat, 19 Jul 2014 10:47:48 -0400
Subject: [PATCH 44/83] Allow jit loading interactively

* yasnippet.el (yas-reload-all, yas-load-directory): let a prefix
  argument indicate jit loading.
---
 yasnippet.el | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index b4432b8..d0129b9 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -1697,8 +1697,10 @@ the current buffers contents."
 
 Below TOP-LEVEL-DIR each directory should be a mode name.
 
-Optional USE-JIT use jit-loading of snippets."
-  (interactive "DSelect the root directory: ni\np")
+With prefix argument USE-JIT do jit-loading of snippets."
+  (interactive
+   (list (read-directory-name "Select the root directory: " nil nil t)
+         current-prefix-arg t))
   (unless yas-snippet-dirs
     (setq yas-snippet-dirs top-level-dir))
   (dolist (dir (yas--subdirs top-level-dir))
@@ -1791,13 +1793,16 @@ prompt the user to select one."
       (call-interactively 'yas-load-directory))
     errors))
 
-(defun yas-reload-all (&optional interactive)
+(defun yas-reload-all (&optional no-jit interactive)
   "Reload all snippets and rebuild the YASnippet menu.
 
-When called interactively force immediate reload of all known
+When NO-JIT is non-nil force immediate reload of all known
 snippets under `yas-snippet-dirs', otherwise use just-in-time
-loading."
-  (interactive "p")
+loading.
+
+When called interactively, use just-in-time loading when given a
+prefix argument."
+  (interactive (list (not current-prefix-arg) t))
   (catch 'abort
     (let ((errors)
           (snippet-editing-buffers
@@ -1842,14 +1847,14 @@ loading."
       ;; Reload the directories listed in `yas-snippet-dirs' or prompt
       ;; the user to select one.
       ;;
-      (setq errors (yas--load-snippet-dirs interactive))
+      (setq errors (yas--load-snippet-dirs no-jit))
       ;; Reload the direct keybindings
       ;;
       (yas-direct-keymaps-reload)
 
       (run-hooks 'yas-after-reload-hook)
       (yas--message 3 "Reloaded everything%s...%s."
-                   (if interactive "" " (snippets will load just-in-time)")
+                   (if no-jit "" " (snippets will load just-in-time)")
                    (if errors " (some errors, check *Messages*)" "")))))
 
 (defvar yas-after-reload-hook nil

From 0b7b34a333ff5fbb279f57980d6cc983e9a5d8c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Mon, 28 Jul 2014 11:37:46 +0100
Subject: [PATCH 45/83] Closes #492, closes #494: Consider defalias when
 calculating parent modes

* yasnippet-tests.el (issue-492-and-494): New test.

* yasnippet.el (yas--modes-to-activate): Consider each mode's
symbol-function as a neighbour in case it's a symbol as well.
---
 yasnippet-tests.el | 18 ++++++++++++++++++
 yasnippet.el       | 11 ++++++-----
 2 files changed, 24 insertions(+), 5 deletions(-)

diff --git a/yasnippet-tests.el b/yasnippet-tests.el
index c6b878d..38aefc1 100644
--- a/yasnippet-tests.el
+++ b/yasnippet-tests.el
@@ -426,6 +426,24 @@ TODO: correct this bug!"
          (should (= (length expected)
                     (length observed))))))))
 
+(ert-deftest issue-492-and-494 ()
+  (defalias 'yas--phony-c-mode 'c-mode)
+  (define-derived-mode yas--test-mode yas--phony-c-mode "Just a test mode")
+  (yas-with-snippet-dirs '((".emacs.d/snippets"
+                            ("yas--test-mode")))
+                         (yas-reload-all)
+                         (with-temp-buffer
+                           (let* ((major-mode 'yas--test-mode)
+                                  (expected `(c-mode
+                                              ,@(if (fboundp 'prog-mode)
+                                                    '(prog-mode))
+                                              yas--phony-c-mode
+                                              yas--test-mode))
+                                  (observed (yas--modes-to-activate)))
+                             (should (null (cl-set-exclusive-or expected observed)))
+                             (should (= (length expected)
+                                        (length observed)))))))
+
 (defun yas--basic-jit-loading-1 ()
   (with-temp-buffer
     (should (= 4 (hash-table-count yas--scheduled-jit-loads)))
diff --git a/yasnippet.el b/yasnippet.el
index d0129b9..39b4c0e 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -699,11 +699,12 @@ and friends."
                 (push mode explored)
                 (cons mode
                       (loop for neighbour
-                            in (remove nil (cons (get mode
-                                                      'derived-mode-parent)
-                                                 (gethash mode yas--parents)))
-
-                            unless (memq neighbour explored)
+                            in (cl-list* (get mode 'derived-mode-parent)
+                                         (ignore-errors (symbol-function mode))
+                                         (gethash mode yas--parents))
+                            when (and neighbour
+                                      (not (memq neighbour explored))
+                                      (symbolp neighbour))
                             append (funcall dfs neighbour explored)))))
     (remove-duplicates (append yas--extra-modes
                                (funcall dfs major-mode)))))

From 7761deeeb52b779b6c4fb7525aedced929099fbf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Tue, 29 Jul 2014 01:19:58 +0100
Subject: [PATCH 46/83] Closes #497: Allow functions as elements in
 yas-key-syntaxes

* yasnippet.el (yas--templates-for-key-at-point): Renamed from
`yas--current-key'.
(yas-key-syntaxes): Overhaul documentation.
(yas-expand-from-trigger-key): Use
`yas--templates-for-key-at-point'.

* yasnippet-tests.el (complicated-yas-key-syntaxes): New test.
(yas-should-expand, yas-should-not-expand): Friendlier failure
message.
---
 yasnippet-tests.el |  46 ++++++++++++++++--
 yasnippet.el       | 115 ++++++++++++++++++++++++++++-----------------
 2 files changed, 115 insertions(+), 46 deletions(-)

diff --git a/yasnippet-tests.el b/yasnippet-tests.el
index 38aefc1..f40ed25 100644
--- a/yasnippet-tests.el
+++ b/yasnippet-tests.el
@@ -313,6 +313,37 @@ TODO: correct this bug!"
     (should (string= (yas--buffer-contents)
                      "brother from another mother") ;; no newline should be here!
             )))
+
+;; See issue #497. To understand this test, follow the example of the
+;; `yas-key-syntaxes' docstring.
+;; 
+(ert-deftest complicated-yas-key-syntaxes ()
+  (with-temp-buffer
+    (yas-saving-variables
+     (yas-with-snippet-dirs
+       '((".emacs.d/snippets"
+          ("text-mode"
+           ("foo-barbaz" . "# condition: yas--foobarbaz\n# --\nOKfoo-barbazOK")
+           ("barbaz" . "# condition: yas--barbaz\n# --\nOKbarbazOK")
+           ("baz" . "OKbazOK"))))
+       (yas-reload-all)
+       (text-mode)
+       (yas-minor-mode-on)
+       (let ((yas-key-syntaxes '("w" "w_")))
+         (let ((yas--barbaz t))
+           (yas-should-expand '(("foo-barbaz" . "foo-OKbarbazOK")
+                                ("barbaz" . "OKbarbazOK"))))
+         (let ((yas--foobarbaz t))
+           (yas-should-expand '(("foo-barbaz" . "OKfoo-barbazOK"))))
+         (let ((yas-key-syntaxes
+                (cons #'(lambda ()
+                          (unless (looking-back "-")
+                            (backward-char)
+                            'again))
+                      yas-key-syntaxes))
+               (yas--foobarbaz t))
+           (yas-should-expand '(("foo-barbaz" . "foo-barOKbazOK")))))))))
+
 
 ;;; Loading
 ;;;
@@ -656,21 +687,28 @@ add the snippets associated with the given mode."
 (defun yas-should-expand (keys-and-expansions)
   (dolist (key-and-expansion keys-and-expansions)
     (yas-exit-all-snippets)
-    (erase-buffer)
+    (narrow-to-region (point) (point))
     (insert (car key-and-expansion))
     (let ((yas-fallback-behavior nil))
       (ert-simulate-command '(yas-expand)))
-    (should (string= (yas--buffer-contents) (cdr key-and-expansion))))
+    (unless (string= (yas--buffer-contents) (cdr key-and-expansion))
+      (ert-fail (format "\"%s\" should have expanded to \"%s\" but got \"%s\""
+                        (car key-and-expansion)
+                        (cdr key-and-expansion)
+                        (yas--buffer-contents)))))
   (yas-exit-all-snippets))
 
 (defun yas-should-not-expand (keys)
   (dolist (key keys)
     (yas-exit-all-snippets)
-    (erase-buffer)
+    (narrow-to-region (point) (point))
     (insert key)
     (let ((yas-fallback-behavior nil))
       (ert-simulate-command '(yas-expand)))
-    (should (string= (yas--buffer-contents) key))))
+    (unless (string= (yas--buffer-contents) key)
+      (ert-fail (format "\"%s\" should have stayed put, but instead expanded to \"%s\""
+                        key
+                        (yas--buffer-contents))))))
 
 (defun yas-mock-insert (string)
   (interactive)
diff --git a/yasnippet.el b/yasnippet.el
index 39b4c0e..ae55883 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -389,19 +389,43 @@ the trigger key itself."
   "The active keymap while a snippet expansion is in progress.")
 
 (defvar yas-key-syntaxes (list "w" "w_" "w_." "w_.()" "^ ")
-  "List of character syntaxes used to find a trigger key before point.
-The list is tried in the order while scanning characters
-backwards from point.  For example, if the list is '(\"w\" \"w_\")
-first look for trigger keys which are composed exclusively of
-\"word\"-syntax characters, and then, if that fails, look for
-keys which are either of \"word\" or \"symbol\"
-syntax.  Triggering after
+  "Syntaxes and functions to help look for trigger keys before point.
+
+Its elements can be either strings or functions (see below for
+the difference) and are tried in order by the snippet expansion
+mechanism until one or more expandable snippets are found.
+
+Each element is a way to skip buffer positions backwards and look
+for the start of a trigger key. A string element is simply passed
+to `skip-syntax-backward' whereas a function element is called
+with no arguments and should also place point before the original
+position.
+
+If no expandable snippets are found but the function returns the
+symbol `try-again' it will be called again from the previous
+position and may again reposition point until it returns some
+other value.
+
+The buffer's string starting at the resulting position and ending
+at the original point is matched against the active snippet
+tables.
+
+For example, if `yas-key-syntaxes'' value is '(\"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,
+triggering after
 
 foo-bar
 
-will, according to the \"w\" element first try \"bar\".  If that
-isn't a trigger key, \"foo-bar\" is tried, respecting a second
-\"w_\" element.")
+will, according to the \"w\" element first try \"barbaz\". If
+that isn't a trigger key, \"foo-barbaz\" is tried, respecting the
+second \"w_\" element. Notice that even if \"baz\" is a trigger
+key for an active snippet, it won't be expanded, unless a
+function is added to `yas-key-syntaxes' that eventually places
+point between \"bar\" and \"baz\".
+
+See also Info node `(elisp) Syntax Descriptors'.")
 
 (defvar yas-after-exit-snippet-hook
   '()
@@ -1193,32 +1217,40 @@ conditions to filter out potential expansions."
                (yas--table-hash table))
       (yas--filter-templates-by-condition acc))))
 
-(defun yas--current-key ()
-  "Get the key under current position.
-A key is used to find the template of a snippet in the current snippet-table."
-  (let ((start (point))
-        (end (point))
-        (syntaxes yas-key-syntaxes)
-        syntax
-        done
-        templates)
-    (while (and (not done) syntaxes)
-      (setq syntax (car syntaxes))
-      (setq syntaxes (cdr syntaxes))
-      (save-excursion
-        (skip-syntax-backward syntax)
-        (setq start (point)))
-      (setq templates
-            (mapcan #'(lambda (table)
-                        (yas--fetch table (buffer-substring-no-properties start end)))
-                    (yas--get-snippet-tables)))
-      (if templates
-          (setq done t)
-        (setq start end)))
-    (list templates
-          start
-          end)))
-
+(defun yas--templates-for-key-at-point ()
+  "Find `yas--template' objects for any trigger keys preceding point.
+Returns (TEMPLATES START END). This function respects
+`yas-key-syntaxes', which see."
+  (save-excursion
+    (let ((original (point))
+          (methods yas-key-syntaxes)
+          (templates)
+          (method))
+      (while (and methods
+                  (not templates))
+        (unless (eq method (car methods))
+          ;; TRICKY: `eq'-ness test means we can only be here if
+          ;; `method' is a function that returned `again', and hence
+          ;; don't revert back to original position as per
+          ;; `yas-key-syntaxes'.
+          (goto-char original))
+        (setq method (car methods))
+        (cond ((stringp method)
+               (skip-syntax-backward method)
+               (setq methods (cdr methods)))
+              ((functionp method)
+               (unless (eq (funcall method)
+                           'again)
+                 (setq methods (cdr methods))))
+              (t
+               (error "[yas] invalid element in `yas-key-syntaxes'")))
+        (setq templates
+              (mapcan #'(lambda (table)
+                          (yas--fetch table (buffer-substring-no-properties (point)
+                                                                            original)))
+                      (yas--get-snippet-tables))))
+      (when templates
+        (list templates (point) original)))))
 
 (defun yas--table-all-keys (table)
   "Get trigger keys of all active snippets in TABLE."
@@ -2137,13 +2169,12 @@ object satisfying `yas--field-p' to restrict the expansion to."
                                   (save-restriction
                                     (narrow-to-region (yas--field-start field)
                                                       (yas--field-end field))
-                                    (yas--current-key))
-                                (yas--current-key))))
-    (if (and templates-and-pos
-             (first templates-and-pos))
+                                    (yas--templates-for-key-at-point))
+                                (yas--templates-for-key-at-point))))
+    (if templates-and-pos
         (yas--expand-or-prompt-for-template (first templates-and-pos)
-                                           (second templates-and-pos)
-                                           (third templates-and-pos))
+                                            (second templates-and-pos)
+                                            (third templates-and-pos))
       (yas--fallback))))
 
 (defun yas-expand-from-keymap ()

From faed1062a27fd2bfd130db7c730971bcd5636c4f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Tue, 29 Jul 2014 20:40:09 +0100
Subject: [PATCH 47/83] * yasnippet.el (yas-key-syntaxes): Improve
 documentation.

---
 yasnippet.el | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index ae55883..fc5d36b 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -391,24 +391,23 @@ the trigger key itself."
 (defvar yas-key-syntaxes (list "w" "w_" "w_." "w_.()" "^ ")
   "Syntaxes and functions to help look for trigger keys before point.
 
-Its elements can be either strings or functions (see below for
-the difference) and are tried in order by the snippet expansion
-mechanism until one or more expandable snippets are found.
+Each element in this list specifies how to skip buffer positions
+backwards and look for the start of a trigger key.
 
-Each element is a way to skip buffer positions backwards and look
-for the start of a trigger key. A string element is simply passed
-to `skip-syntax-backward' whereas a function element is called
-with no arguments and should also place point before the original
+Each element can be either a string or a functino of no
+arguments. A string element is simply passed to
+`skip-syntax-backward' whereas a function element is called with
+no arguments and should also place point before the original
 position.
 
-If no expandable snippets are found but the function returns the
-symbol `try-again' it will be called again from the previous
-position and may again reposition point until it returns some
-other value.
+The string between the resulting buffer position and the original
+point.in the is matched against the trigger keys in the active
+snippet tables.
 
-The buffer's string starting at the resulting position and ending
-at the original point is matched against the active snippet
-tables.
+If no expandable snippets are found, the next element is the list
+is tried, unless a function element returned the symbol `again',
+in which case it is called again from the previous position and
+may once more reposition point.
 
 For example, if `yas-key-syntaxes'' value is '(\"w\" \"w_\"),
 trigger keys composed exclusively of \"word\"-syntax characters

From de34d91a3c149993526370f98cf36eb6da565976 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Sun, 10 Aug 2014 12:21:47 -0400
Subject: [PATCH 48/83] Closes #470, handle non-whitespace newlines

Many modes put newlines in comment ender class because they have line
comments.

* yasnippet.el (yas-try-key-from-whitespace): new function.
(yas-key-syntaxes): use it in place of "^ ".
* yasnippet-tests.el (complicated-yas-key-syntaxes): test it.
---
 yasnippet-tests.el | 12 ++++++++----
 yasnippet.el       | 14 +++++++++++++-
 2 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/yasnippet-tests.el b/yasnippet-tests.el
index f40ed25..ae7a8d1 100644
--- a/yasnippet-tests.el
+++ b/yasnippet-tests.el
@@ -322,12 +322,13 @@ TODO: correct this bug!"
     (yas-saving-variables
      (yas-with-snippet-dirs
        '((".emacs.d/snippets"
-          ("text-mode"
+          ("emacs-lisp-mode"
            ("foo-barbaz" . "# condition: yas--foobarbaz\n# --\nOKfoo-barbazOK")
            ("barbaz" . "# condition: yas--barbaz\n# --\nOKbarbazOK")
-           ("baz" . "OKbazOK"))))
+           ("baz" . "OKbazOK")
+           ("'quote" . "OKquoteOK"))))
        (yas-reload-all)
-       (text-mode)
+       (emacs-lisp-mode)
        (yas-minor-mode-on)
        (let ((yas-key-syntaxes '("w" "w_")))
          (let ((yas--barbaz t))
@@ -342,7 +343,10 @@ TODO: correct this bug!"
                             'again))
                       yas-key-syntaxes))
                (yas--foobarbaz t))
-           (yas-should-expand '(("foo-barbaz" . "foo-barOKbazOK")))))))))
+           (yas-should-expand '(("foo-barbaz" . "foo-barOKbazOK")))))
+       (let ((yas-key-syntaxes '(yas-try-key-from-whitespace)))
+         (yas-should-expand '(("xxx\n'quote" . "xxx\nOKquoteOK")
+                              ("xxx 'quote" . "xxx OKquoteOK"))))))))
 
 
 ;;; Loading
diff --git a/yasnippet.el b/yasnippet.el
index fc5d36b..741ab61 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -388,7 +388,8 @@ the trigger key itself."
                       map)
   "The active keymap while a snippet expansion is in progress.")
 
-(defvar yas-key-syntaxes (list "w" "w_" "w_." "w_.()" "^ ")
+(defvar yas-key-syntaxes (list "w" "w_" "w_." "w_.()"
+                               #'yas-try-key-from-whitespace)
   "Syntaxes and functions to help look for trigger keys before point.
 
 Each element in this list specifies how to skip buffer positions
@@ -2725,6 +2726,17 @@ and `kill-buffer' instead."
      groups-hash)))
 
 
+
+;;; User convenience functions, for using in `yas-key-syntaxes'
+
+(defun yas-try-key-from-whitespace ()
+  "Go back to nearest whitespace.
+
+A newline will be considered whitespace even if the mode syntax
+marks it as something else (typically comment ender). Use as
+element of `yas-key-syntaxes'."
+  (skip-chars-backward "^[:space:]\n"))
+
 
 ;;; User convenience functions, for using in snippet definitions
 

From 280ece2af4be2b51629557944feb4f6e36b751f3 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Sun, 10 Aug 2014 12:47:22 -0400
Subject: [PATCH 49/83] Add yas-shortest-key-until-whitespace

Example yas-key-syntaxes function.

* yasnippet.el (yas-shortest-key-until-whitespace): new function.
* yasnippet-tests.el (complicated-yas-key-syntaxes): test it.
---
 yasnippet-tests.el | 5 ++++-
 yasnippet.el       | 9 +++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/yasnippet-tests.el b/yasnippet-tests.el
index ae7a8d1..8a845dc 100644
--- a/yasnippet-tests.el
+++ b/yasnippet-tests.el
@@ -346,7 +346,10 @@ TODO: correct this bug!"
            (yas-should-expand '(("foo-barbaz" . "foo-barOKbazOK")))))
        (let ((yas-key-syntaxes '(yas-try-key-from-whitespace)))
          (yas-should-expand '(("xxx\n'quote" . "xxx\nOKquoteOK")
-                              ("xxx 'quote" . "xxx OKquoteOK"))))))))
+                              ("xxx 'quote" . "xxx OKquoteOK"))))
+       (let ((yas-key-syntaxes '(yas-shortest-key-until-whitespace))
+             (yas--foobarbaz t) (yas--barbaz t))
+         (yas-should-expand '(("foo-barbaz" . "foo-barOKbazOK"))))))))
 
 
 ;;; Loading
diff --git a/yasnippet.el b/yasnippet.el
index 741ab61..e006d52 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -2737,6 +2737,15 @@ marks it as something else (typically comment ender). Use as
 element of `yas-key-syntaxes'."
   (skip-chars-backward "^[:space:]\n"))
 
+(defun yas-shortest-key-until-whitespace ()
+  "Return `again' until at whitespace.
+
+A newline will be considered whitespace even if the mode syntax
+marks it as something else (typically comment ender). Use as
+element of `yas-key-syntaxes'."
+  (when (/= (skip-chars-backward "^[:space:]\n" (1- (point))) 0)
+    'again))
+
 
 ;;; User convenience functions, for using in snippet definitions
 

From 10ecde158e5efae11186aa4c261aaec6261e8e51 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Sun, 10 Aug 2014 12:52:52 -0400
Subject: [PATCH 50/83] Pass start point to yas-key-syntaxes functions

* yasnippet-tests.el (complicated-yas-key-syntaxes): accept argument.
* yasnippet.el (yas-try-key-from-whitespace): accept argument.
  (yas-shortest-key-until-whitespace): accept argument.
  (yas--templates-for-key-at-point): pass start point the methods.
  (yas-key-syntaxes): update docstring.
---
 yasnippet-tests.el |  2 +-
 yasnippet.el       | 18 +++++++++---------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/yasnippet-tests.el b/yasnippet-tests.el
index 8a845dc..12ca615 100644
--- a/yasnippet-tests.el
+++ b/yasnippet-tests.el
@@ -337,7 +337,7 @@ TODO: correct this bug!"
          (let ((yas--foobarbaz t))
            (yas-should-expand '(("foo-barbaz" . "OKfoo-barbazOK"))))
          (let ((yas-key-syntaxes
-                (cons #'(lambda ()
+                (cons #'(lambda (_start-point)
                           (unless (looking-back "-")
                             (backward-char)
                             'again))
diff --git a/yasnippet.el b/yasnippet.el
index e006d52..93eceb2 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -395,15 +395,15 @@ the trigger key itself."
 Each element in this list specifies how to skip buffer positions
 backwards and look for the start of a trigger key.
 
-Each element can be either a string or a functino of no
-arguments. A string element is simply passed to
-`skip-syntax-backward' whereas a function element is called with
-no arguments and should also place point before the original
+Each element can be either a string or a function receiving the
+original point as an argument. A string element is simply passed
+to `skip-syntax-backward' whereas a function element is called
+with no arguments and should also place point before the original
 position.
 
 The string between the resulting buffer position and the original
-point.in the is matched against the trigger keys in the active
-snippet tables.
+point is matched against the trigger keys in the active snippet
+tables.
 
 If no expandable snippets are found, the next element is the list
 is tried, unless a function element returned the symbol `again',
@@ -1239,7 +1239,7 @@ Returns (TEMPLATES START END). This function respects
                (skip-syntax-backward method)
                (setq methods (cdr methods)))
               ((functionp method)
-               (unless (eq (funcall method)
+               (unless (eq (funcall method original)
                            'again)
                  (setq methods (cdr methods))))
               (t
@@ -2729,7 +2729,7 @@ and `kill-buffer' instead."
 
 ;;; User convenience functions, for using in `yas-key-syntaxes'
 
-(defun yas-try-key-from-whitespace ()
+(defun yas-try-key-from-whitespace (_start-point)
   "Go back to nearest whitespace.
 
 A newline will be considered whitespace even if the mode syntax
@@ -2737,7 +2737,7 @@ marks it as something else (typically comment ender). Use as
 element of `yas-key-syntaxes'."
   (skip-chars-backward "^[:space:]\n"))
 
-(defun yas-shortest-key-until-whitespace ()
+(defun yas-shortest-key-until-whitespace (_start-point)
   "Return `again' until at whitespace.
 
 A newline will be considered whitespace even if the mode syntax

From 5d10b5dfee3ee3d1c5c199e8c9acfb9c9b26172c Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Sun, 10 Aug 2014 13:07:43 -0400
Subject: [PATCH 51/83] Add yas-longest-key-from-whitespace

Example yas-key-syntaxes function.

* yasnippet.el (yas-longest-key-from-whitespace): new function.
* yasnippet-tests.el (complicated-yas-key-syntaxes): test it.
---
 yasnippet-tests.el |  4 +++-
 yasnippet.el       | 13 +++++++++++++
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/yasnippet-tests.el b/yasnippet-tests.el
index 12ca615..d090c51 100644
--- a/yasnippet-tests.el
+++ b/yasnippet-tests.el
@@ -349,7 +349,9 @@ TODO: correct this bug!"
                               ("xxx 'quote" . "xxx OKquoteOK"))))
        (let ((yas-key-syntaxes '(yas-shortest-key-until-whitespace))
              (yas--foobarbaz t) (yas--barbaz t))
-         (yas-should-expand '(("foo-barbaz" . "foo-barOKbazOK"))))))))
+         (yas-should-expand '(("foo-barbaz" . "foo-barOKbazOK")))
+         (setq yas-key-syntaxes '(yas-longest-key-from-whitespace))
+         (yas-should-expand '(("foo-barbaz" . "OKfoo-barbazOK"))))))))
 
 
 ;;; Loading
diff --git a/yasnippet.el b/yasnippet.el
index 93eceb2..dcf6bf0 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -2746,6 +2746,19 @@ element of `yas-key-syntaxes'."
   (when (/= (skip-chars-backward "^[:space:]\n" (1- (point))) 0)
     'again))
 
+(defun yas-longest-key-from-whitespace (start-point)
+  "Go back to nearest whitespace, then go forward and return `again' until at START-POINT.
+
+A newline will be considered whitespace even if the mode syntax
+marks it as something else (typically comment ender). Use as
+element of `yas-key-syntaxes'."
+  (if (= (point) start-point)
+      (yas-try-key-from-whitespace start-point)
+    (forward-char))
+  (unless (= original (1+ (point)))
+    'again))
+
+
 
 ;;; User convenience functions, for using in snippet definitions
 

From 47a3d5f1cb13713062592a9fa27dbe2c444f3da2 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Sun, 10 Aug 2014 13:13:45 -0400
Subject: [PATCH 52/83] Fix yas-key-syntaxes example functions docstrings.

* yasnippet.el (yas-try-key-from-whitespace),
  (yas-shortest-key-until-whitespace),
  (yas-longest-key-from-whitespace): docstring describes the effect, not
  implementation.
---
 yasnippet.el | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index dcf6bf0..900d326 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -2730,28 +2730,22 @@ and `kill-buffer' instead."
 ;;; User convenience functions, for using in `yas-key-syntaxes'
 
 (defun yas-try-key-from-whitespace (_start-point)
-  "Go back to nearest whitespace.
+  "As `yas-key-syntaxes' element, look for whitespace delimited key.
 
 A newline will be considered whitespace even if the mode syntax
-marks it as something else (typically comment ender). Use as
-element of `yas-key-syntaxes'."
+marks it as something else (typically comment ender)."
   (skip-chars-backward "^[:space:]\n"))
 
 (defun yas-shortest-key-until-whitespace (_start-point)
-  "Return `again' until at whitespace.
-
-A newline will be considered whitespace even if the mode syntax
-marks it as something else (typically comment ender). Use as
-element of `yas-key-syntaxes'."
+  "Like `yas-longest-key-from-whitespace' but take the shortest key."
   (when (/= (skip-chars-backward "^[:space:]\n" (1- (point))) 0)
     'again))
 
 (defun yas-longest-key-from-whitespace (start-point)
-  "Go back to nearest whitespace, then go forward and return `again' until at START-POINT.
+  "As `yas-key-syntaxes' element, look for longest key between point and whitespace.
 
 A newline will be considered whitespace even if the mode syntax
-marks it as something else (typically comment ender). Use as
-element of `yas-key-syntaxes'."
+marks it as something else (typically comment ender)."
   (if (= (point) start-point)
       (yas-try-key-from-whitespace start-point)
     (forward-char))

From d982b701fc4dc2e37e1a02b0aed2f0f713d9bf68 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Sun, 10 Aug 2014 13:29:25 -0400
Subject: [PATCH 53/83] Fix edge case in yas-longest-key-from-whitespace

* yasnippet.el (yas-longest-key-from-whitespace): don't try again if
  start-point is on whitespace.
* yasnippet-tests.el (complicated-yas-key-syntaxes): check edge case.
---
 yasnippet-tests.el | 3 ++-
 yasnippet.el       | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/yasnippet-tests.el b/yasnippet-tests.el
index d090c51..4b3a440 100644
--- a/yasnippet-tests.el
+++ b/yasnippet-tests.el
@@ -351,7 +351,8 @@ TODO: correct this bug!"
              (yas--foobarbaz t) (yas--barbaz t))
          (yas-should-expand '(("foo-barbaz" . "foo-barOKbazOK")))
          (setq yas-key-syntaxes '(yas-longest-key-from-whitespace))
-         (yas-should-expand '(("foo-barbaz" . "OKfoo-barbazOK"))))))))
+         (yas-should-expand '(("foo-barbaz" . "OKfoo-barbazOK")
+                              ("foo " . "foo "))))))))
 
 
 ;;; Loading
diff --git a/yasnippet.el b/yasnippet.el
index 900d326..ea5fe33 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -2749,7 +2749,7 @@ marks it as something else (typically comment ender)."
   (if (= (point) start-point)
       (yas-try-key-from-whitespace start-point)
     (forward-char))
-  (unless (= original (1+ (point)))
+  (unless (<= start-point (1+ (point)))
     'again))
 
 

From f7ef023ebb746ee1597b20d6770fffd106c802f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Wed, 20 Aug 2014 20:23:00 +0100
Subject: [PATCH 54/83] Prevent disabling errors from recent
 `yas-current-syntaxes` logic

* yasnippet.el (yas--templates-for-key-at-point): Don't error
since this function is called very frequently on TAB. Use new
`yas--warning'.
(yas--warning): New function.
---
 yasnippet.el | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/yasnippet.el b/yasnippet.el
index ea5fe33..821e748 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -1243,7 +1243,7 @@ Returns (TEMPLATES START END). This function respects
                            'again)
                  (setq methods (cdr methods))))
               (t
-               (error "[yas] invalid element in `yas-key-syntaxes'")))
+               (yas--warning "Warning invalid element %s in `yas-key-syntaxes'" method)))
         (setq templates
               (mapcan #'(lambda (table)
                           (yas--fetch table (buffer-substring-no-properties (point)
@@ -4366,6 +4366,11 @@ object satisfying `yas--field-p' to restrict the expansion to.")))
   (when (> yas-verbosity level)
     (message "%s" (apply #'yas--format message args))))
 
+(defun yas--warning (format-control &rest format-args)
+  (let ((msg (apply #'format format-control format-args)))
+    (display-warning 'yasnippet msg :warning)
+    (yas--message 1 msg)))
+
 (defun yas--format (format-control &rest format-args)
   (apply #'format (concat "[yas] " format-control) format-args))
 

From 1d4618b022bb1cea6781f50f5009e68b7689a1cd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Wed, 20 Aug 2014 21:29:32 +0100
Subject: [PATCH 55/83] Closes #504: Correctly discover  buffers needing
 snippets immediately

* yasnippet-tests.el (issue-504-tricky-jit): New test.

* yasnippet.el (yas-load-directory): Use a new `impatient-buffers'
local and call `yas--load-pending-juts' in all those at the end.

* yasnippet.el (cl-lib): Don't need `eval-and-compile'.
---
 yasnippet-tests.el | 17 +++++++++++
 yasnippet.el       | 71 +++++++++++++++++++++++++---------------------
 2 files changed, 56 insertions(+), 32 deletions(-)

diff --git a/yasnippet-tests.el b/yasnippet-tests.el
index 4b3a440..7653d31 100644
--- a/yasnippet-tests.el
+++ b/yasnippet-tests.el
@@ -485,6 +485,23 @@ TODO: correct this bug!"
                              (should (= (length expected)
                                         (length observed)))))))
 
+(ert-deftest issue-504-tricky-jit ()
+  (define-derived-mode yas--test-mode c-mode "Just a test mode")
+  (define-derived-mode yas--another-test-mode c-mode "Another test mode")
+  (yas-with-snippet-dirs
+   '((".emacs.d/snippets"
+      ("yas--another-test-mode"
+       (".yas-parents" . "yas--test-mode"))
+      ("yas--test-mode")))
+   (let ((b (with-current-buffer (generate-new-buffer "*yas-test*")
+              (yas--another-test-mode)
+              (current-buffer))))
+     (unwind-protect
+         (progn
+           (yas-reload-all)
+           (should (= 0 (hash-table-count yas--scheduled-jit-loads))))
+       (kill-buffer b)))))
+
 (defun yas--basic-jit-loading-1 ()
   (with-temp-buffer
     (should (= 4 (hash-table-count yas--scheduled-jit-loads)))
diff --git a/yasnippet.el b/yasnippet.el
index 821e748..adcd44d 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -130,8 +130,7 @@
 ;;; Code:
 
 (require 'cl)
-(eval-and-compile
-  (require 'cl-lib))
+(require 'cl-lib)
 (require 'easymenu)
 (require 'help-mode)
 
@@ -1736,36 +1735,44 @@ With prefix argument USE-JIT do jit-loading of snippets."
          current-prefix-arg t))
   (unless yas-snippet-dirs
     (setq yas-snippet-dirs top-level-dir))
-  (dolist (dir (yas--subdirs top-level-dir))
-    (let* ((major-mode-and-parents (yas--compute-major-mode-and-parents
-                                    (concat dir "/dummy")))
-           (mode-sym (car major-mode-and-parents))
-           (parents (cdr major-mode-and-parents)))
-      ;; Attention: The parents and the menus are already defined
-      ;; here, even if the snippets are later jit-loaded.
-      ;;
-      ;; * We need to know the parents at this point since entering a
-      ;;   given mode should jit load for its parents
-      ;;   immediately. This could be reviewed, the parents could be
-      ;;   discovered just-in-time-as well
-      ;;
-      ;; * We need to create the menus here to support the `full'
-      ;;   option to `yas-use-menu' (all known snippet menus are shown to the user)
-      ;;
-      (yas--define-parents mode-sym parents)
-      (yas--menu-keymap-get-create mode-sym)
-      (let ((fun `(lambda () ;; FIXME: Simulating lexical-binding.
-                    (yas--load-directory-1 ',dir ',mode-sym))))
-        (if (and use-jit
-                 (not (some #'(lambda (buffer)
-                                (with-current-buffer buffer
-                                  ;; FIXME: Shouldn't this use derived-mode-p?
-                                  (when (eq major-mode mode-sym)
-                                    (yas--message 3 "Discovered there was already %s in %s" buffer mode-sym)
-                                    t)))
-                            (buffer-list))))
-            (yas--schedule-jit mode-sym fun)
-            (funcall fun)))))
+  (let ((impatient-buffers))
+    (dolist (dir (yas--subdirs top-level-dir))
+      (let* ((major-mode-and-parents (yas--compute-major-mode-and-parents
+                                      (concat dir "/dummy")))
+             (mode-sym (car major-mode-and-parents))
+             (parents (cdr major-mode-and-parents)))
+        ;; Attention: The parents and the menus are already defined
+        ;; here, even if the snippets are later jit-loaded.
+        ;;
+        ;; * We need to know the parents at this point since entering a
+        ;;   given mode should jit load for its parents
+        ;;   immediately. This could be reviewed, the parents could be
+        ;;   discovered just-in-time-as well
+        ;;
+        ;; * We need to create the menus here to support the `full'
+        ;;   option to `yas-use-menu' (all known snippet menus are shown to the user)
+        ;;
+        (yas--define-parents mode-sym parents)
+        (yas--menu-keymap-get-create mode-sym)
+        (let ((fun `(lambda () ;; FIXME: Simulating lexical-binding.
+                      (yas--load-directory-1 ',dir ',mode-sym))))
+          (if use-jit
+              (yas--schedule-jit mode-sym fun)
+            (funcall fun)))
+        ;; Look for buffers that are already in `mode-sym', and so
+        ;; need the new snippets immediately...
+        ;; 
+        (when use-jit 
+          (cl-loop for buffer in (buffer-list)
+                   do (with-current-buffer buffer
+                        (when (eq major-mode mode-sym)
+                          (yas--message 3 "Discovered there was already %s in %s" buffer mode-sym)
+                          (push buffer impatient-buffers)))))))
+    ;; ...after TOP-LEVEL-DIR has been completely loaded, call
+    ;; `yas--load-pending-jits' in these impatient buffers.
+    ;; 
+    (cl-loop for buffer in impatient-buffers
+             do (with-current-buffer buffer (yas--load-pending-jits))))
   (when interactive
     (yas--message 3 "Loaded snippets from %s." top-level-dir)))
 

From 5b59b802ac4550394a810637de3af42f4d673abb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Wed, 20 Aug 2014 21:48:41 +0100
Subject: [PATCH 56/83] Closes #495: Allow symbols as aliases in
 `yas-snippet-dirs'

* yasnippet.el (yas-installed-snippets-dir): New parameter. Set at
load time from `load-file-name'.
(yas--load-file-name): Removed.
(yas-snippet-dirs): Update docstring. Default value has symbol
`yas-installed-snippets-dir' as an alias to any bundled snippets.
(yas-snippet-dirs): Redesign for new `yas-snippet-dirs' semantics.
---
 yasnippet.el | 40 +++++++++++++++++++++++++++-------------
 1 file changed, 27 insertions(+), 13 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index adcd44d..c25d78d 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -150,21 +150,25 @@
   "Yet Another Snippet extension"
   :group 'editing)
 
-(defvar yas--load-file-name load-file-name
-  "Store the filename that yasnippet.el was originally loaded from.")
+(defvar yas-installed-snippets-dir nil)
+(setq yas-installed-snippets-dir
+      (when load-file-name
+        (concat (file-name-directory load-file-name) "snippets")))
 
 (defcustom yas-snippet-dirs (remove nil
                                     (list "~/.emacs.d/snippets"
-                                          (when yas--load-file-name
-                                            (concat (file-name-directory yas--load-file-name) "snippets"))))
-  "Directory or list of snippet dirs for each major mode.
+                                          'yas-installed-snippets-dir))
+  "List of top-level snippet directories.
 
-The directory where user-created snippets are to be stored.  Can
-also be a list of directories.  In that case, when used for
-bulk (re)loading of snippets (at startup or via
-`yas-reload-all'), directories appearing earlier in the list
-shadow other dir's snippets.  Also, the first directory is taken
-as the default for storing the user's new snippets."
+Each element, a string or a symbol whose value is a string,
+designates a top-level directory where per-mode snippet
+directories can be found.
+
+Elements appearing earlier in the list shadow later elements'
+snippets.
+
+The first directory is taken as the default for storing snippet's
+created with `yas-new-snippet'. "
   :type '(choice (string :tag "Single directory (string)")
                  (repeat :args (string) :tag "List of directories (strings)"))
   :group 'yasnippet
@@ -178,8 +182,18 @@ as the default for storing the user's new snippets."
                (yas-reload-all)))))
 
 (defun yas-snippet-dirs ()
-  "Return `yas-snippet-dirs' (which see) as a list."
-  (if (listp yas-snippet-dirs) yas-snippet-dirs (list yas-snippet-dirs)))
+  "Return variable `yas-snippet-dirs' as list of strings."
+  (cl-loop for e in (if (listp yas-snippet-dirs)
+                        yas-snippet-dirs
+                      (list yas-snippet-dirs))
+           collect
+           (cond ((stringp e) e)
+                 ((and (symbolp e)
+                       (boundp e)
+                       (stringp (symbol-value e)))
+                  (symbol-value e))
+                 (t
+                  (error "[yas] invalid element %s in `yas-snippet-dirs'" e)))))
 
 (defvaralias 'yas/root-directory 'yas-snippet-dirs)
 

From be2f815c43deb74e0f809ed47debc4aa2e67ea1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Thu, 21 Aug 2014 08:38:46 +0100
Subject: [PATCH 57/83] Closes #508: Ensure original point when evaluating
 conditions

* yasnippet.el (yas--templates-for-key-at-point): Call
`yas--fetch', and hence condition system, with point in the
original position.
---
 yasnippet.el | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index c25d78d..f26cc3f 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -1257,11 +1257,13 @@ Returns (TEMPLATES START END). This function respects
                  (setq methods (cdr methods))))
               (t
                (yas--warning "Warning invalid element %s in `yas-key-syntaxes'" method)))
-        (setq templates
-              (mapcan #'(lambda (table)
-                          (yas--fetch table (buffer-substring-no-properties (point)
-                                                                            original)))
-                      (yas--get-snippet-tables))))
+        (let ((possible-key (buffer-substring-no-properties (point) original)))
+          (save-excursion
+            (goto-char original)
+            (setq templates
+                  (mapcan #'(lambda (table)
+                              (yas--fetch table possible-key))
+                          (yas--get-snippet-tables))))))
       (when templates
         (list templates (point) original)))))
 

From 241465cea27ae53209414b5f8e8ce36d2576ffcd Mon Sep 17 00:00:00 2001
From: Jonas Bernoulli <jonas@bernoul.li>
Date: Sun, 7 Sep 2014 01:41:16 +0200
Subject: [PATCH 58/83] move eof footer to the actual eof

---
 doc/yas-doc-helper.el | 2 +-
 yasnippet-tests.el    | 2 +-
 yasnippet.el          | 3 +--
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/doc/yas-doc-helper.el b/doc/yas-doc-helper.el
index 76a00b1..36cd510 100755
--- a/doc/yas-doc-helper.el
+++ b/doc/yas-doc-helper.el
@@ -161,7 +161,7 @@
 
 
 (provide 'yas-doc-helper)
-;;; yas-doc-helper.el ends here
 ;; Local Variables:
 ;; coding: utf-8
 ;; End:
+;;; yas-doc-helper.el ends here
diff --git a/yasnippet-tests.el b/yasnippet-tests.el
index 7653d31..ac95258 100644
--- a/yasnippet-tests.el
+++ b/yasnippet-tests.el
@@ -821,8 +821,8 @@ add the snippets associated with the given mode."
 
 
 (provide 'yasnippet-tests)
-;;; yasnippet-tests.el ends here
 ;; Local Variables:
 ;; lexical-binding: t
 ;; byte-compile-warnings: (not cl-functions)
 ;; End:
+;;; yasnippet-tests.el ends here
diff --git a/yasnippet.el b/yasnippet.el
index f26cc3f..06ad751 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -4593,9 +4593,8 @@ can more or less safely rely upon them.")
 
 
 (provide 'yasnippet)
-
-;;; yasnippet.el ends here
 ;; Local Variables:
 ;; coding: utf-8
 ;; byte-compile-warnings: (not cl-functions)
 ;; End:
+;;; yasnippet.el ends here

From 37df653a6710779f56668bfa55508f972e1f3f33 Mon Sep 17 00:00:00 2001
From: Jonas Bernoulli <jonas@bernoul.li>
Date: Sun, 7 Sep 2014 01:42:27 +0200
Subject: [PATCH 59/83] yasnippet-debug.el: quiet byte-compiler

---
 yasnippet-debug.el | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/yasnippet-debug.el b/yasnippet-debug.el
index 7e3be0e..f18793c 100644
--- a/yasnippet-debug.el
+++ b/yasnippet-debug.el
@@ -124,4 +124,7 @@
     (add-hook 'post-command-hook 'yas-debug-snippet-vars 't 'local)))
 
 (provide 'yasnippet-debug)
+;; Local Variables:
+;; byte-compile-warnings: (not cl-functions)
+;; End:
 ;;; yasnippet-debug.el ends here

From 70de82164c094bed2204d23421dbe391a086a50f Mon Sep 17 00:00:00 2001
From: Jonas Bernoulli <jonas@bernoul.li>
Date: Sun, 7 Sep 2014 14:08:30 +0200
Subject: [PATCH 60/83] enforce use of spaces for indentation

---
 doc/yas-doc-helper.el | 1 +
 yasnippet-debug.el    | 1 +
 yasnippet-tests.el    | 1 +
 yasnippet.el          | 1 +
 4 files changed, 4 insertions(+)

diff --git a/doc/yas-doc-helper.el b/doc/yas-doc-helper.el
index 36cd510..d27f777 100755
--- a/doc/yas-doc-helper.el
+++ b/doc/yas-doc-helper.el
@@ -162,6 +162,7 @@
 
 (provide 'yas-doc-helper)
 ;; Local Variables:
+;; indent-tabs-mode: nil
 ;; coding: utf-8
 ;; End:
 ;;; yas-doc-helper.el ends here
diff --git a/yasnippet-debug.el b/yasnippet-debug.el
index f18793c..fe8816c 100644
--- a/yasnippet-debug.el
+++ b/yasnippet-debug.el
@@ -125,6 +125,7 @@
 
 (provide 'yasnippet-debug)
 ;; Local Variables:
+;; indent-tabs-mode: nil
 ;; byte-compile-warnings: (not cl-functions)
 ;; End:
 ;;; yasnippet-debug.el ends here
diff --git a/yasnippet-tests.el b/yasnippet-tests.el
index ac95258..7499640 100644
--- a/yasnippet-tests.el
+++ b/yasnippet-tests.el
@@ -822,6 +822,7 @@ add the snippets associated with the given mode."
 
 (provide 'yasnippet-tests)
 ;; Local Variables:
+;; indent-tabs-mode: nil
 ;; lexical-binding: t
 ;; byte-compile-warnings: (not cl-functions)
 ;; End:
diff --git a/yasnippet.el b/yasnippet.el
index 06ad751..63669fa 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -4595,6 +4595,7 @@ can more or less safely rely upon them.")
 (provide 'yasnippet)
 ;; Local Variables:
 ;; coding: utf-8
+;; indent-tabs-mode: nil
 ;; byte-compile-warnings: (not cl-functions)
 ;; End:
 ;;; yasnippet.el ends here

From 41cb5f565f60c6b2b7bf020f2afeeb6b53c74844 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Thu, 11 Sep 2014 11:12:19 +0100
Subject: [PATCH 61/83] Update snippets submodule

---
 snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets b/snippets
index 86978f3..16154e1 160000
--- a/snippets
+++ b/snippets
@@ -1 +1 @@
-Subproject commit 86978f377b8cf1267b8e862f6c3c1c9eccc993ad
+Subproject commit 16154e1462a8bbb2c5cf48e1101bd3f2c090e0fc

From 6f7c91558abbe134e83c5d131ec02afc322bcb23 Mon Sep 17 00:00:00 2001
From: Paul Rankin <paul@tilk.co>
Date: Sun, 21 Sep 2014 00:53:29 +1000
Subject: [PATCH 62/83] Compatibility with custom-unlispify-remove-prefixes

---
 yasnippet.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yasnippet.el b/yasnippet.el
index 63669fa..bddfa3a 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -148,6 +148,7 @@
 
 (defgroup yasnippet nil
   "Yet Another Snippet extension"
+  :prefix "yas-"
   :group 'editing)
 
 (defvar yas-installed-snippets-dir nil)

From 783cc3394f7e73ceb5b3a62662210c7cb953f232 Mon Sep 17 00:00:00 2001
From: Syohei YOSHIDA <syohex@gmail.com>
Date: Mon, 29 Sep 2014 12:25:01 +0900
Subject: [PATCH 63/83] Use cl-incf instead of cl

* yasnippet.el (yas--snippet-next-id, yas--real-line-beginning):
Use `cl-incf'.
---
 yasnippet.el | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index bddfa3a..65d8e7c 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -559,7 +559,7 @@ snippet itself contains a condition that returns the symbol
 
 (defun yas--snippet-next-id ()
   (let ((id yas--snippet-id-seed))
-    (incf yas--snippet-id-seed)
+    (cl-incf yas--snippet-id-seed)
     id))
 
 
@@ -3953,7 +3953,7 @@ Meant to be called in a narrowed buffer, does various passes"
         (n (line-beginning-position)))
     (while (or (eql c ?\ )
                (eql c ?\t))
-      (incf n)
+      (cl-incf n)
       (setq c (char-after n)))
     n))
 

From e7314516e372811d50ae11fcce66b2a28863cc2b Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Sat, 4 Oct 2014 20:52:58 -0400
Subject: [PATCH 64/83] Signal an error on recursive yas--fallback calls

* yasnippet.el (yas--fallback): let-bind yas-fallback-behavior to
  'yas--fallback before actually doing the fallback. Signal an error if
  it's 'yas--fallback (indicating we're in an infinte loop).
---
 yasnippet.el | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index 65d8e7c..75f0ad4 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -2248,8 +2248,13 @@ Common gateway for `yas-expand-from-trigger-key' and
   (cond ((eq yas-fallback-behavior 'return-nil)
          ;; return nil
          nil)
+        ((eq yas-fallback-behavior 'yas--fallback)
+         (error (concat "yasnippet fallback loop!\n"
+                        "This can happen when you bind `yas-expand' "
+                        "outside of the `yas-minor-mode-map'.")))
         ((eq yas-fallback-behavior 'call-other-command)
-         (let* ((beyond-yasnippet (yas--keybinding-beyond-yasnippet)))
+         (let* ((yas-fallback-behavior 'yas--fallback)
+                (beyond-yasnippet (yas--keybinding-beyond-yasnippet)))
            (yas--message 4 "Falling back to %s"  beyond-yasnippet)
            (assert (or (null beyond-yasnippet) (commandp beyond-yasnippet)))
            (setq this-original-command beyond-yasnippet)
@@ -2258,12 +2263,13 @@ Common gateway for `yas-expand-from-trigger-key' and
         ((and (listp yas-fallback-behavior)
               (cdr yas-fallback-behavior)
               (eq 'apply (car yas-fallback-behavior)))
-         (if (cddr yas-fallback-behavior)
-             (apply (cadr yas-fallback-behavior)
-                    (cddr yas-fallback-behavior))
-           (when (commandp (cadr yas-fallback-behavior))
-             (setq this-command (cadr yas-fallback-behavior))
-             (call-interactively (cadr yas-fallback-behavior)))))
+         (let ((yas-fallback-behavior 'yas--fallback))
+           (if (cddr yas-fallback-behavior)
+               (apply (cadr yas-fallback-behavior)
+                      (cddr yas-fallback-behavior))
+             (when (commandp (cadr yas-fallback-behavior))
+               (setq this-command (cadr yas-fallback-behavior))
+               (call-interactively (cadr yas-fallback-behavior))))))
         (t
          ;; also return nil if all the other fallbacks have failed
          nil)))

From 70151f4f1e56fdf18d9e2b9dff9dec7a769e0a05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Tue, 7 Oct 2014 14:57:23 +0100
Subject: [PATCH 65/83] Closes #525, closes #526: Prevent some keybinding
 fallback loops

* yasnippet.el (yas--keybinding-beyond-yasnippet): Add docstring.
(yas--fallback): Also let-bind `yas-minor-mode' to nil when
falling back.
---
 yasnippet.el | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index 75f0ad4..a64230b 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -2254,6 +2254,12 @@ Common gateway for `yas-expand-from-trigger-key' and
                         "outside of the `yas-minor-mode-map'.")))
         ((eq yas-fallback-behavior 'call-other-command)
          (let* ((yas-fallback-behavior 'yas--fallback)
+                ;; Also bind `yas-minor-mode' to prevent fallback
+                ;; loops when other extensions use mechanisms similar
+                ;; to `yas--keybinding-beyond-yasnippet'. (github #525
+                ;; and #526)
+                ;; 
+                (yas-minor-mode nil)
                 (beyond-yasnippet (yas--keybinding-beyond-yasnippet)))
            (yas--message 4 "Falling back to %s"  beyond-yasnippet)
            (assert (or (null beyond-yasnippet) (commandp beyond-yasnippet)))
@@ -2263,7 +2269,8 @@ Common gateway for `yas-expand-from-trigger-key' and
         ((and (listp yas-fallback-behavior)
               (cdr yas-fallback-behavior)
               (eq 'apply (car yas-fallback-behavior)))
-         (let ((yas-fallback-behavior 'yas--fallback))
+         (let ((yas-fallback-behavior 'yas--fallback)
+               (yas-minor-mode nil))
            (if (cddr yas-fallback-behavior)
                (apply (cadr yas-fallback-behavior)
                       (cddr yas-fallback-behavior))
@@ -2275,7 +2282,7 @@ Common gateway for `yas-expand-from-trigger-key' and
          nil)))
 
 (defun yas--keybinding-beyond-yasnippet ()
-  "Return the ??"
+  "Get current keys's binding as if YASsnippet didn't exist."
   (let* ((yas-minor-mode nil)
          (yas--direct-keymaps nil)
          (keys (this-single-command-keys)))

From 6053db05caca4a5255fd4329b23b00dd5f6ecbd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Thu, 9 Oct 2014 07:16:36 +0100
Subject: [PATCH 66/83] Closes #527: Unbreak case where yas-fallback-behaviour
 is a list

* yasnippet.el (yas--fallback): Extract interesting values from
`yas-fallback-behaviour' before rebinding.
---
 yasnippet.el | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index a64230b..1644a85 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -289,7 +289,7 @@ next field"
   `yas-expand' returns nil)
 
 - A Lisp form (apply COMMAND . ARGS) means interactively call
-  COMMAND, if ARGS is non-nil, call COMMAND non-interactively
+  COMMAND. If ARGS is non-nil, call COMMAND non-interactively
   with ARGS as arguments."
   :type '(choice (const :tag "Call previous command"  call-other-command)
                  (const :tag "Do nothing"             return-nil))
@@ -2269,14 +2269,15 @@ Common gateway for `yas-expand-from-trigger-key' and
         ((and (listp yas-fallback-behavior)
               (cdr yas-fallback-behavior)
               (eq 'apply (car yas-fallback-behavior)))
-         (let ((yas-fallback-behavior 'yas--fallback)
+         (let ((command-or-fn (cadr yas-fallback-behavior))
+               (args (cddr yas-fallback-behavior))
+               (yas-fallback-behavior 'yas--fallback)
                (yas-minor-mode nil))
-           (if (cddr yas-fallback-behavior)
-               (apply (cadr yas-fallback-behavior)
-                      (cddr yas-fallback-behavior))
-             (when (commandp (cadr yas-fallback-behavior))
-               (setq this-command (cadr yas-fallback-behavior))
-               (call-interactively (cadr yas-fallback-behavior))))))
+           (if args
+               (apply command-or-fn args)
+             (when (commandp command-or-fn)
+               (setq this-command command-or-fn)
+               (call-interactively command-or-fn)))))
         (t
          ;; also return nil if all the other fallbacks have failed
          nil)))

From e2b876baef8e2e6b64df8d192a6ed2e1454b3474 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Sat, 11 Oct 2014 14:57:49 +0100
Subject: [PATCH 67/83] Tweak README.mdown to simplify bug reporting paragraph

---
 README.mdown | 66 +++++++++++++++++++++++++++++++++-------------------
 1 file changed, 42 insertions(+), 24 deletions(-)

diff --git a/README.mdown b/README.mdown
index 4a8d597..14e193f 100644
--- a/README.mdown
+++ b/README.mdown
@@ -109,44 +109,62 @@ should be added like this to `yas-snippet-dirs`:
 
     (yas-global-mode 1) ;; or M-x yas-reload-all if you've started YASnippet already.
 
-# Documentation, issues, etc
+# Manual, issues etc
 
-Please refer to the comprehensive (albeit slightly outdated)
-[documentation][docs] for full customization
-and support.  If you find a bug, please report it on
-[the GitHub issue tracker][issues].  (please **do not** submit new issues to the old
-[googlecode tracker][googlecode tracker])
+Please refer to the comprehensive [documentation][docs] for full
+customization and support.  If you find a bug in the code or in the
+documentation, please report it on [the GitHub issue tracker][issues].
 
 ## Important note regarding bug reporting
-If you think have found a bug, please report it clearly.  Yasnippet
-does have (lots of) bugs and your reports are very valuable. Here's
-a  [great example](https://github.com/capitaomorte/yasnippet/issues/318)
-of a bug report. It has everything needed for a sucessfull analysis and
-speedy resolution:
 
-*Before* reporting try to reproduce the bug **without** your usual
-`.emacs` (or whatever startup file you use). Do so either by starting
-emacs from the command line with the `-Q` switch, or by temporarily
-moving away your `.emacs` and creating a new smaller one just for
-reproducing the bug. Paste that file in your bug report. Paste any sequence
-of relevant shell commands before you launch Emacs.
+Your bug reports are very valuable.
 
-*Then*, describe steps taken to reproduce from an
-end-user perspective. Try to be as unambiguous as possible.
+The most important thing when reporting bugs is making sure that the
+developer has a way to reproduce the problem exactly like it happened
+to you.
+
+To do this, he needs to rule out interference from external factors
+like other Emacs extensions or other Lisp-side code.
+
+Here's an example that "sandboxes" an emacs just for reproducing the
+bug.
+
+```
+$ emacs --version
+Emacs 24.3
+$ cd /tmp/
+$ git clone https://github.com/capitaomorte/yasnippet.git yasnippet-bug
+$ cd yasnippet-bug
+$ git log -1 --oneline
+6053db0 Closes #527: Unbreak case where yas-fallback-behaviour is a list
+$ HOME=$PWD emacs -L  # This "sandboxes" your emacs, melpa configuration, etc
+
+(require 'yasnippet)
+(yas-global-mode 1)
+
+When I open a foo-mode file I can't expand foo-mode snippets! 
+OR
+I can't get yasnippet to load because frankinbogen!
+```
+
+Here's a
+[another example](https://github.com/capitaomorte/yasnippet/issues/318)
+of a bug report. It has everything needed for a sucessfull analysis
+and speedy resolution.
 
 Also, don't forget to state the Emacs version (use `M-x emacs-version`) and
 the yasnippet version you are using (if using the latest from github,
 do `git log -1` in the dir).
 
 Any more info is welcome, but don't just paste a backtrace or an error
-message string you got. I'm not saying your analysis might not be
-useful but following the instructions above immediately gives me a
-clear picture of what is happening.
+message string you got, unless we ask for it.
+
 
 There is also a [YASnippet google group][forum]. I will keep the group
 open for reference and for discussion among users, unfortunately I
-can't guarantee a timely response, so maybe creating a github issue
-clearly marking your intent (user support/bug/feature request).
+can't guarantee a timely response, so maybe it's better to create a
+github issue clearly marking your intent (user support/bug/feature
+request).
 
 Finally, thank you very much for using YASnippet!
 

From b22961a4a64749794bc7d17186169730bc51be50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Sat, 11 Oct 2014 22:27:48 +0100
Subject: [PATCH 68/83] Update README.mdown

---
 README.mdown | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/README.mdown b/README.mdown
index 14e193f..afe4277 100644
--- a/README.mdown
+++ b/README.mdown
@@ -119,15 +119,14 @@ documentation, please report it on [the GitHub issue tracker][issues].
 
 Your bug reports are very valuable.
 
-The most important thing when reporting bugs is making sure that the
-developer has a way to reproduce the problem exactly like it happened
-to you.
+The most important thing when reporting bugs is making sure that we have
+a way to reproduce the problem exactly like it happened to you.
 
-To do this, he needs to rule out interference from external factors
-like other Emacs extensions or other Lisp-side code.
+To do this, we need to rule out interference from external factors
+like other Emacs extensions or your own customizations.
 
-Here's an example that "sandboxes" an emacs just for reproducing the
-bug.
+Here's an example report that "sandboxes" an Emacs session just for 
+reproducing a bug.
 
 ```
 $ emacs --version
@@ -147,6 +146,9 @@ OR
 I can't get yasnippet to load because frankinbogen!
 ```
 
+Using `emacs -Q` or temporarily moving your `.emacs` init file to the side 
+is another way to achieve good reproductability.
+
 Here's a
 [another example](https://github.com/capitaomorte/yasnippet/issues/318)
 of a bug report. It has everything needed for a sucessfull analysis
@@ -159,9 +161,8 @@ do `git log -1` in the dir).
 Any more info is welcome, but don't just paste a backtrace or an error
 message string you got, unless we ask for it.
 
-
 There is also a [YASnippet google group][forum]. I will keep the group
-open for reference and for discussion among users, unfortunately I
+open for reference and for discussion among users. Unfortunately I
 can't guarantee a timely response, so maybe it's better to create a
 github issue clearly marking your intent (user support/bug/feature
 request).

From 51d4ed14df47f9b010dda984543a025a2728af3b Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Fri, 17 Oct 2014 10:36:08 -0400
Subject: [PATCH 69/83] Update snippets submodule

---
 snippets | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/snippets b/snippets
index 16154e1..32bbd36 160000
--- a/snippets
+++ b/snippets
@@ -1 +1 @@
-Subproject commit 16154e1462a8bbb2c5cf48e1101bd3f2c090e0fc
+Subproject commit 32bbd36d9a774b9cab6207523ffb5b24179b6505

From 1c97671c6e47463f9ef3d4cf6d5fefc721d9c726 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Sun, 2 Nov 2014 23:53:11 +0000
Subject: [PATCH 70/83] Closes #536: Fix navigation to zero-length fields at
 snippet end

* yasnippet.el (yas--field-probably-deleted-p): A deleted field
was probably modified before, so enforce that condition.
---
 yasnippet.el | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index 1644a85..cb1d041 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -3032,12 +3032,14 @@ through the field's start point"
    ;; field must be zero length
    ;;
    (zerop (- (yas--field-start field) (yas--field-end field)))
-   ;; skip if:
+   ;; field must have been modified
+   ;;
+   (yas--field-modified-p field)
+   ;; either:
    (or
-    ;;  1) is a nested field and it's been modified
+    ;;  1) it's a nested field
     ;;
-    (and (yas--field-parent-field field)
-         (yas--field-modified-p field))
+    (yas--field-parent-field field)
     ;;  2) ends just before the snippet end
     ;;
     (and (eq field (car (last (yas--snippet-fields snippet))))

From 596e6b2640ab80c8823a749c4da71af5dd2e6fe0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Tue, 4 Nov 2014 08:27:34 +0000
Subject: [PATCH 71/83] Closes #537: Be lenient to extensions operating on
 snippet fields

* yasnippet.el (yas--on-protection-overlay-modification): Commit the
snippets being destroyed instead of signalling a protection violation.
---
 yasnippet.el | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index cb1d041..c93d886 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -3496,8 +3496,14 @@ The error should be ignored in `debug-ignored-errors'"
   (unless yas--inhibit-overlay-hooks
     (cond ((not (or after?
                     (yas--undo-in-progress)))
-           (setq yas--protection-violation (point))
-           (error "Exit the snippet first!")))))
+           (cond (t
+                  (let ((snippets (yas--snippets-at-point)))
+                    (yas--message 3 "Comitting snippets. Action would destroy a protection overlay.")
+                    (cl-loop for snippet in snippets
+                             do (yas--commit-snippet snippet))))
+                 (nil
+                  (setq yas--protection-violation (point))
+                  (error "Exit the snippet first!")))))))
 
 (add-to-list 'debug-ignored-errors "^Exit the snippet first!$")
 

From 175e0a3a102c22c0c99d8d00ecf8bc8539a4e593 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Mon, 17 Nov 2014 11:27:30 +0000
Subject: [PATCH 72/83] Clean up previous change

* yasnippet.el: Update comment.
(yas--protection-violation): Removed.
(yas--on-protection-overlay-modification): Simplified.
(yas--post-command-handler): No longer reference
`yas--protection-violation'
---
 yasnippet.el | 46 ++++++++++++----------------------------------
 1 file changed, 12 insertions(+), 34 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index c93d886..15b9def 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -3438,17 +3438,10 @@ progress."
 ;; snippet outside the active field. Actual protection happens in
 ;; `yas--on-protection-overlay-modification'.
 ;;
-;; Currently this signals an error which inhibits the command. For
-;; commands that move point (like `kill-line'), point is restored in
-;; the `yas--post-command-handler' using a global
-;; `yas--protection-violation' variable.
-;;
-;; Alternatively, I've experimented with an implementation that
-;; commits the snippet before actually calling `this-command'
-;; interactively, and then signals an error, which is ignored. but
-;; blocks all other million modification hooks. This presented some
-;; problems with stacked expansion.
-;;
+;; As of github #537 this no longer inhibits the command by issuing an
+;; error: all the snippets at point, including nested snippets, are
+;; automatically commited and the current command can proceed.
+;; 
 (defun yas--make-move-field-protection-overlays (snippet field)
   "Place protection overlays surrounding SNIPPET's FIELD.
 
@@ -3481,29 +3474,17 @@ Move the overlays, or create them if they do not exit."
              ;; (overlay-put ov 'evaporate t)
              (overlay-put ov 'modification-hooks '(yas--on-protection-overlay-modification)))))))
 
-(defvar yas--protection-violation nil
-  "When non-nil, signals attempts to erroneously exit or modify the snippet.
-
-Functions in the `post-command-hook', for example
-`yas--post-command-handler' can check it and reset its value to
-nil.  The variables value is the point where the violation
-originated")
-
 (defun yas--on-protection-overlay-modification (_overlay after? _beg _end &optional _length)
   "Signals a snippet violation, then issues error.
 
 The error should be ignored in `debug-ignored-errors'"
-  (unless yas--inhibit-overlay-hooks
-    (cond ((not (or after?
-                    (yas--undo-in-progress)))
-           (cond (t
-                  (let ((snippets (yas--snippets-at-point)))
-                    (yas--message 3 "Comitting snippets. Action would destroy a protection overlay.")
-                    (cl-loop for snippet in snippets
-                             do (yas--commit-snippet snippet))))
-                 (nil
-                  (setq yas--protection-violation (point))
-                  (error "Exit the snippet first!")))))))
+  (unless (or yas--inhibit-overlay-hooks
+              after?
+              (yas--undo-in-progress))
+    (let ((snippets (yas--snippets-at-point)))
+      (yas--message 3 "Comitting snippets. Action would destroy a protection overlay.")
+      (cl-loop for snippet in snippets
+               do (yas--commit-snippet snippet)))))
 
 (add-to-list 'debug-ignored-errors "^Exit the snippet first!$")
 
@@ -4302,10 +4283,7 @@ When multiple expressions are found, only the last one counts."
 ;;
 (defun yas--post-command-handler ()
   "Handles various yasnippet conditions after each command."
-  (cond (yas--protection-violation
-         (goto-char yas--protection-violation)
-         (setq yas--protection-violation nil))
-        ((eq 'undo this-command)
+  (cond ((eq 'undo this-command)
          ;;
          ;; After undo revival the correct field is sometimes not
          ;; restored correctly, this condition handles that

From 50ca8d30dee17e8f976b65fd1e89d62046a033a4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Sun, 23 Nov 2014 12:23:15 +0000
Subject: [PATCH 73/83] Update README.mdown

Fix misspellings
---
 README.mdown | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.mdown b/README.mdown
index afe4277..75ca37a 100644
--- a/README.mdown
+++ b/README.mdown
@@ -112,7 +112,7 @@ should be added like this to `yas-snippet-dirs`:
 # Manual, issues etc
 
 Please refer to the comprehensive [documentation][docs] for full
-customization and support.  If you find a bug in the code or in the
+customisation and support.  If you find a bug in the code or in the
 documentation, please report it on [the GitHub issue tracker][issues].
 
 ## Important note regarding bug reporting
@@ -123,7 +123,7 @@ The most important thing when reporting bugs is making sure that we have
 a way to reproduce the problem exactly like it happened to you.
 
 To do this, we need to rule out interference from external factors
-like other Emacs extensions or your own customizations.
+like other Emacs extensions or your own customisations.
 
 Here's an example report that "sandboxes" an Emacs session just for 
 reproducing a bug.
@@ -147,11 +147,11 @@ I can't get yasnippet to load because frankinbogen!
 ```
 
 Using `emacs -Q` or temporarily moving your `.emacs` init file to the side 
-is another way to achieve good reproductability.
+is another way to achieve good reproducibility.
 
 Here's a
 [another example](https://github.com/capitaomorte/yasnippet/issues/318)
-of a bug report. It has everything needed for a sucessfull analysis
+of a bug report. It has everything needed for a successful analysis
 and speedy resolution.
 
 Also, don't forget to state the Emacs version (use `M-x emacs-version`) and

From bb6bbad1f75362e34df1ccbe34358168712bad51 Mon Sep 17 00:00:00 2001
From: Jonas Bernoulli <jonas@bernoul.li>
Date: Mon, 8 Dec 2014 14:47:20 +0100
Subject: [PATCH 74/83] Add file doc/.nosearch

This keeps `normal-top-level-add-subdirs-to-load-path'
from adding the directory to the `load-path'.
---
 doc/.nosearch | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 doc/.nosearch

diff --git a/doc/.nosearch b/doc/.nosearch
new file mode 100644
index 0000000..e69de29

From b62bdf3fcd49dc38efbd55d9ee2e546631c6ae63 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Tue, 23 Dec 2014 11:02:44 +0000
Subject: [PATCH 75/83] Closes #546: backport `yas-initialize' and provide
 `yas/initialize'

* yasnippet.el (yas-initialize): Renamed from `yas--initialize'.
(yas--backported-syms): Add `yas-initialize'
---
 yasnippet.el | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index 15b9def..bbfca9c 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -1941,10 +1941,6 @@ foo\"bar\\! -> \"foo\\\"bar\\\\!\""
 
 ;;; Snippet compilation function
 
-(defun yas--initialize ()
-  "For backward compatibility, enable `yas-minor-mode' globally."
-  (yas-global-mode 1))
-
 (defun yas-compile-directory (top-level-dir)
   "Create .yas-compiled-snippets.el files under subdirs of TOP-LEVEL-DIR.
 
@@ -4458,6 +4454,10 @@ and return the directory.  Return nil if not found."
 
 ;;; Backward compatibility to yasnippet <= 0.7
 
+(defun yas-initialize ()
+  "For backward compatibility, enable `yas-minor-mode' globally."
+  (yas-global-mode 1))
+
 (defvar yas--backported-syms '(;; `defcustom's
                              ;;
                              yas-snippet-dirs
@@ -4523,6 +4523,7 @@ and return the directory.  Return nil if not found."
                              yas-exit-snippet
                              yas-exit-all-snippets
                              yas-skip-and-clear-or-delete-char
+                             yas-initialize
 
                              ;; symbols that I "exported" for use
                              ;; in snippets and hookage

From 07734a17131fc604526307df6e323cbdfdf69624 Mon Sep 17 00:00:00 2001
From: Win Treese <treese@acm.org>
Date: Sat, 10 Jan 2015 10:04:18 -0500
Subject: [PATCH 76/83] Clarify what happens with yas-new-snippet.

Added more detail about how yas-new-snippet behaves, particularly how it guesses a directory to save in.
---
 doc/snippet-development.org | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/doc/snippet-development.org b/doc/snippet-development.org
index c4de864..9e8f901 100644
--- a/doc/snippet-development.org
+++ b/doc/snippet-development.org
@@ -6,14 +6,18 @@
 
 ** Quickly finding snippets
 
-There are some ways you can quickly find a snippet file:
+There are some ways you can quickly find a snippet file or create a new one:
 
 -  =M-x yas-new-snippet=
 
-   Prompts you for a snippet name, then tries to guess a suitable
-   directory to store it, prompting you for creation if it does not
-   exist. Finally, places you in a new buffer set to =snippet-mode= so
-   you can write your snippet.
+   Creates a new buffer with a template for making a new snippet.
+   The buffer is in =snippet-mode= (see below). When you are done
+   editing the new snippet, use =C-c C-c= 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 =yas-snippet-dirs=. (See [[file:snippet-organization.org][Organizing Snippets]]
+   for more detail on how snippets are organized.)
 
 -  =M-x yas-find-snippets=
 

From 3c133487dcd25a6db08fdf5a4d8bf8d53970ed65 Mon Sep 17 00:00:00 2001
From: Wieland Hoffmann <mineo@users.noreply.github.com>
Date: Thu, 12 Feb 2015 02:25:56 +0100
Subject: [PATCH 77/83] yas-expand-snippet: Clarify EXPAND-ENV

---
 yasnippet.el | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/yasnippet.el b/yasnippet.el
index bbfca9c..b13f72b 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -3514,7 +3514,7 @@ The error should be ignored in `debug-ignored-errors'"
   "Expand snippet CONTENT at current point.
 
 Text between START and END will be deleted before inserting
-template.  EXPAND-ENV is are let-style variable to value bindings
+template.  EXPAND-ENV is a list of (SYM VALUE) let-style dynamic bindings
 considered when expanding the snippet."
   (run-hooks 'yas-before-expand-snippet-hook)
 

From 3e7b56ebd7385a4669beed7c059981b3f78425bf Mon Sep 17 00:00:00 2001
From: Vasilij Schneidermann <v.schneidermann@gmail.com>
Date: Wed, 18 Mar 2015 11:48:44 +0100
Subject: [PATCH 78/83] Implements #566: Remove dead major modes code

* yasnippet.el (yas--known-modes, yas--real-mode?): Removed
---
 yasnippet.el | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index b13f72b..0d9506b 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -526,10 +526,6 @@ snippet itself contains a condition that returns the symbol
 (defvar yas--menu-table (make-hash-table)
   "A hash table of MAJOR-MODE symbols to menu keymaps.")
 
-(defvar yas--known-modes
-  '(ruby-mode rst-mode markdown-mode)
-  "A list of mode which is well known but not part of Emacs.")
-
 (defvar yas--escaped-characters
   '(?\\ ?` ?\" ?' ?$ ?} ?{ ?\( ?\))
   "List of characters which *might* need to be escaped.")
@@ -1283,16 +1279,6 @@ Returns (TEMPLATES START END). This function respects
 
 ;;; Internal functions and macros:
 
-(defun yas--real-mode? (mode)
-  "Try to find out if MODE is a real mode.
-
-The MODE bound to a function (like `c-mode') is considered real
-mode.  Other well known mode like `ruby-mode' which is not part of
-Emacs might not bound to a function until it is loaded.  So
-yasnippet keeps a list of modes like this to help the judgment."
-  (or (fboundp mode)
-      (find mode yas--known-modes)))
-
 (defun yas--handle-error (err)
   "Handle error depending on value of `yas-good-grace'."
   (let ((msg (yas--format "elisp error: %s" (error-message-string err))))

From b9989f8c8cc3068f264214a5efb236bbcce65075 Mon Sep 17 00:00:00 2001
From: Noam Postavsky <npostavs@users.sourceforge.net>
Date: Wed, 18 Mar 2015 15:59:28 -0400
Subject: [PATCH 79/83] Add a CONTRIBUTING.md file

Collect some conventions about contributing to Yasnippet (which have
been scattered amongst various issues/pull request) into a single file.

* CONTRIBUTING.md: New File.
---
 CONTRIBUTING.md | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 0000000..83310bc
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,27 @@
+# Submitting Bug Reports
+
+Please read [Important note regarding bug reporting][bugnote].
+
+# Contributing to Yasnippet
+
+## Copyright Assignment
+
+Yasnippet is part of GNU ELPA, so it falls under the same copyright
+assignment policy as the rest of Emacs (see "Copyright Assignment" in
+https://www.gnu.org/software/emacs/CONTRIBUTE). A copyright assignment
+for Emacs also covers Yasnippet.
+
+## Commit message format
+
+The commit message format roughly follows Emacs conventions, although
+there is no separate Changelog file.
+
+    The commit message's first sentence should be capitalized, no period
+
+    It may be followed by a paragraph with a longer explanation. The
+    changelog style entry goes at the end of the message.
+
+    * foo.el (a-function): Terse summary of per-function changes.
+
+
+[bugnote]: https://github.com/capitaomorte/yasnippet#important-note-regarding-bug-reporting

From d19ef74634ca7050c331971a7f9ee29211e08826 Mon Sep 17 00:00:00 2001
From: Stefan Monnier <monnier@IRO.UMontreal.CA>
Date: Fri, 20 Mar 2015 10:34:33 +0000
Subject: [PATCH 80/83] Getting rid of low-level assumptions in yasnippet

The main thrust is to get rid of the use of the `cl-struct-slots'
property which doesn't exist in Emacs-25 any more.

* yasnippet.el: Update copyright
(yas--template): Change constructor name from
`yas--make-blank-template' to `yas--make-template'
(yas--populate-template): Remove.
(yas--define-snippets-1): Use `yas--make-template'
(yas--define-snippets-1): Use `setf's
(yas-define-menu, yas--define-menu-1, yas-tryout-snippet): Use
`yas--make-template'
---
 yasnippet.el | 69 +++++++++++++++++++++-------------------------------
 1 file changed, 28 insertions(+), 41 deletions(-)

diff --git a/yasnippet.el b/yasnippet.el
index 0d9506b..8c9212c 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -1,6 +1,6 @@
 ;;; yasnippet.el --- Yet another snippet extension for Emacs.
 
-;; Copyright (C) 2008-2013 Free Software Foundation, Inc.
+;; Copyright (C) 2008-2013, 2015 Free Software Foundation, Inc.
 ;; Authors: pluskid <pluskid@gmail.com>,  João Távora <joaotavora@gmail.com>
 ;; Maintainer: João Távora <joaotavora@gmail.com>
 ;; Version: 0.8.1
@@ -912,7 +912,7 @@ Honour `yas-dont-activate', which see."
 
 ;;; Internal structs for template management
 
-(defstruct (yas--template (:constructor yas--make-blank-template))
+(defstruct (yas--template (:constructor yas--make-template))
   "A template for a snippet."
   key
   content
@@ -928,16 +928,6 @@ Honour `yas-dont-activate', which see."
   table
   )
 
-(defun yas--populate-template (template &rest args)
-  "Helper function to populate TEMPLATE with properties."
-  (while args
-    (aset template
-          (position (intern (substring (symbol-name (car args)) 1))
-                    (mapcar #'car (get 'yas--template 'cl-struct-slots)))
-          (second args))
-    (setq args (cddr args)))
-  template)
-
 (defstruct (yas--table (:constructor yas--make-snippet-table (name)))
   "A table to store snippets for a particular mode.
 
@@ -1620,20 +1610,19 @@ Optional PROMPT sets the prompt to use."
          (uuid (or (ninth snippet)
                   name))
          (template (or (gethash uuid (yas--table-uuidhash snippet-table))
-                       (yas--make-blank-template))))
+                       (yas--make-template :uuid uuid
+                                           :table snippet-table))))
     ;; X) populate the template object
     ;;
-    (yas--populate-template template
-                           :table       snippet-table
-                           :key         key
-                           :content     (second snippet)
-                           :name        (or name key)
-                           :group       group
-                           :condition   condition
-                           :expand-env  (sixth snippet)
-                           :file        (seventh snippet)
-                           :keybinding  keybinding
-                           :uuid         uuid)
+    (setf (yas--template-key template)        key)
+    (setf (yas--template-content template)    (second snippet))
+    (setf (yas--template-name template)       (or name key))
+    (setf (yas--template-group template)      group)
+    (setf (yas--template-condition template)  condition)
+    (setf (yas--template-expand-env template) (sixth snippet))
+    (setf (yas--template-file template)       (seventh snippet))
+    (setf (yas--template-keybinding template) keybinding)
+
     ;; X) Update this template in the appropriate table. This step
     ;;    also will take care of adding the key indicators in the
     ;;    templates menu entry, if any
@@ -2071,11 +2060,10 @@ omitted from MODE's menu, even if they're manually loaded."
                         hash)
     (dolist (uuid omit-items)
       (let ((template (or (gethash uuid hash)
-                          (yas--populate-template (puthash uuid
-                                                           (yas--make-blank-template)
-                                                           hash)
-                                                  :table table
-                                                  :uuid uuid))))
+                          (puthash uuid
+                                   (yas--make-template :table table
+                                                       :uuid uuid)
+                                   hash))))
         (setf (yas--template-menu-binding-pair template) (cons nil :none))))))
 
 (defun yas--define-menu-1 (table menu-keymap menu uuidhash &optional group-list)
@@ -2083,12 +2071,12 @@ omitted from MODE's menu, even if they're manually loaded."
   (dolist (e (reverse menu))
     (cond ((eq (first e) 'yas-item)
            (let ((template (or (gethash (second e) uuidhash)
-                               (yas--populate-template (puthash (second e)
-                                                               (yas--make-blank-template)
-                                                               uuidhash)
-                                                      :table table
-                                                      :perm-group group-list
-                                                      :uuid (second e)))))
+                               (puthash (second e)
+                                        (yas--make-template
+                                         :table table
+                                         :perm-group group-list
+                                         :uuid (second e))
+                                        uuidhash))))
              (define-key menu-keymap (vector (gensym))
                (car (yas--template-menu-binding-pair-get-create template :stay)))))
           ((eq (first e) 'yas-submenu)
@@ -2607,12 +2595,11 @@ and `kill-buffer' instead."
          (yas--current-template
           (and parsed
                (fboundp test-mode)
-               (yas--populate-template (yas--make-blank-template)
-                                      :table       nil ;; no tables for ephemeral snippets
-                                      :key         (first parsed)
-                                      :content     (second parsed)
-                                      :name        (third parsed)
-                                      :expand-env  (sixth parsed)))))
+               (yas--make-template :table       nil ;; no tables for ephemeral snippets
+                                   :key         (first parsed)
+                                   :content     (second parsed)
+                                   :name        (third parsed)
+                                   :expand-env  (sixth parsed)))))
     (cond (yas--current-template
            (let ((buffer-name (format "*testing snippet: %s*" (yas--template-name yas--current-template))))
              (kill-buffer (get-buffer-create buffer-name))

From 316435e03eb296aec15605390cde04dc5bf8a525 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Mon, 23 Mar 2015 09:50:54 +0000
Subject: [PATCH 81/83] Closes #562: Deleting inner numberless snippet causes
 error

* yasnippet.el (yas--field-probably-deleted-p): Protect against
nil `yas--field-number'.

* yasnippet-tests.el (delete-numberless-inner-snippet-issue-562): New test
---
 yasnippet-tests.el | 11 +++++++++++
 yasnippet.el       |  3 ++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/yasnippet-tests.el b/yasnippet-tests.el
index 7499640..150e1d0 100644
--- a/yasnippet-tests.el
+++ b/yasnippet-tests.el
@@ -112,6 +112,17 @@
     (ert-simulate-command `(yas-mock-insert "abc"))
     (should (string= (yas--buffer-contents) "abcabcabcabc"))))
 
+(ert-deftest delete-numberless-inner-snippet-issue-562 ()
+  (with-temp-buffer
+    (yas-minor-mode 1)
+    (yas-expand-snippet "${3:${test}bla}$0${2:ble}")
+    (ert-simulate-command '(yas-next-field-or-maybe-expand))
+    (should (looking-at "testblable"))
+    (ert-simulate-command '(yas-next-field-or-maybe-expand))
+    (ert-simulate-command '(yas-skip-and-clear-or-delete-char))
+    (should (looking-at "ble"))
+    (should (null (yas--snippets-at-point)))))
+
 ;; (ert-deftest in-snippet-undo ()
 ;;   (with-temp-buffer
 ;;     (yas-minor-mode 1)
diff --git a/yasnippet.el b/yasnippet.el
index 8c9212c..2a2254b 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -3016,7 +3016,8 @@ through the field's start point"
    ;; the field numbered 0, just before the exit marker, should
    ;; never be skipped
    ;;
-   (not (zerop (yas--field-number field)))))
+   (not (and (yas--field-number field)
+             (zerop (yas--field-number field))))))
 
 (defun yas--snippets-at-point (&optional all-snippets)
   "Return a sorted list of snippets at point.

From 885237a4856ff22f0df82ab25e7ea3391a8376bd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Mon, 23 Mar 2015 10:10:56 +0000
Subject: [PATCH 82/83] Add useful development assertion

When debugging snippets after M-x toggle-debug-on-error, errors in the
`post-command-hook' might cause `yas--post-command-handler' to be
removed. That's OK, always check that it's there before attempting any
`yas-expand-snippet' calls, since it is essential to check snippet
movement.

* yasnippet.el (yas-expand-snippet): Assert `yas-minor-mode' and
`yas--post-command-handler' active.
---
 yasnippet.el | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/yasnippet.el b/yasnippet.el
index 2a2254b..95c96e4 100644
--- a/yasnippet.el
+++ b/yasnippet.el
@@ -3490,6 +3490,10 @@ The error should be ignored in `debug-ignored-errors'"
 Text between START and END will be deleted before inserting
 template.  EXPAND-ENV is a list of (SYM VALUE) let-style dynamic bindings
 considered when expanding the snippet."
+  (cl-assert (and yas-minor-mode
+                  (memq 'yas--post-command-handler post-command-hook))
+             nil
+             "[yas] `yas-expand-snippet' needs properly setup `yas-minor-mode'")
   (run-hooks 'yas-before-expand-snippet-hook)
 
   ;;

From a46701966a5abb90c3ca97625b1512ef5859384e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jo=C3=A3o=20T=C3=A1vora?= <joaotavora@gmail.com>
Date: Mon, 23 Mar 2015 10:21:12 +0000
Subject: [PATCH 83/83] `yas-minor-mode' assertion broke a test. Good. Fix it.

* yasnippet-tests.el
(be-careful-when-escaping-in-yas-selected-text-2): Add
`yas-minor-mode'.
---
 yasnippet-tests.el | 1 +
 1 file changed, 1 insertion(+)

diff --git a/yasnippet-tests.el b/yasnippet-tests.el
index 150e1d0..0f11352 100644
--- a/yasnippet-tests.el
+++ b/yasnippet-tests.el
@@ -201,6 +201,7 @@
 
 (ert-deftest be-careful-when-escaping-in-yas-selected-text-2 ()
   (with-temp-buffer
+    (yas-minor-mode 1)
     (let ((yas-selected-text "He)}o world!"))
       (yas-expand-snippet "Look ma! ${1:`(yas-selected-text)`} OK?")
       (should (string= (yas--buffer-contents) "Look ma! He)}o world! OK?")))))