[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master a1d8b5b 5/5: Merge yasnippet 0.12.1 from upstream
|
From: |
Noam Postavsky |
|
Subject: |
[elpa] master a1d8b5b 5/5: Merge yasnippet 0.12.1 from upstream |
|
Date: |
Sun, 23 Jul 2017 18:40:03 -0400 (EDT) |
branch: master
commit a1d8b5bd3cb652ef96d590d6729d300de2fd40f7
Merge: 32b8352 0463c75
Author: Noam Postavsky <address@hidden>
Commit: Noam Postavsky <address@hidden>
Merge yasnippet 0.12.1 from upstream
---
packages/yasnippet/.travis.yml | 22 ++-
packages/yasnippet/NEWS | 8 +-
packages/yasnippet/Rakefile | 16 +-
packages/yasnippet/yasnippet-debug.el | 61 +++-----
packages/yasnippet/yasnippet-tests.el | 282 +++++++++++++++++-----------------
packages/yasnippet/yasnippet.el | 28 +++-
6 files changed, 214 insertions(+), 203 deletions(-)
diff --git a/packages/yasnippet/.travis.yml b/packages/yasnippet/.travis.yml
index 1dfb3fa..3e27a32 100644
--- a/packages/yasnippet/.travis.yml
+++ b/packages/yasnippet/.travis.yml
@@ -4,10 +4,18 @@ git:
submodules: false
env:
- - EMACS_VERSION=23.4
- - EMACS_VERSION=24.3
- - EMACS_VERSION=24.5
- - EMACS_VERSION=25.2
+ global:
+ - Wlexical=t
+ - Werror=t
+ - tests_Werror=t # For yasnippet-tests.el
+ matrix:
+ - EMACS_VERSION=23.4
+ # 24.3 gives a bunch of 'value returned from (car value-N) is
+ # unused' warnings.
+ - EMACS_VERSION=24.3 tests_Werror=nil
+ - EMACS_VERSION=24.5
+ - EMACS_VERSION=25.2
+
install:
- curl -LO
https://github.com/npostavs/emacs-travis/releases/download/bins/emacs-bin-${EMACS_VERSION}.tar.gz
@@ -15,7 +23,7 @@ install:
# Configure $PATH: Emacs installed to /tmp/emacs
- export PATH=/tmp/emacs/bin:${PATH}
- if ! emacs -Q --batch --eval "(require 'cl-lib)" ; then
- curl -Lo cl-lib.el http://elpa.gnu.org/packages/cl-lib-0.5.el ;
+ curl -Lo cl-lib.el http://elpa.gnu.org/packages/cl-lib-0.6.1.el ;
export warnings="'(not cl-functions)" ;
fi
- if ! emacs -Q --batch --eval "(require 'ert)" ; then
@@ -25,7 +33,9 @@ install:
- emacs --version
script:
- - rake compile
+ - rake yasnippet.elc
+ - rake yasnippet-debug.elc
+ - rake yasnippet-tests.elc Werror=$tests_Werror
- rake tests
notifications:
diff --git a/packages/yasnippet/NEWS b/packages/yasnippet/NEWS
index 0f6b7d8..bc0863f 100644
--- a/packages/yasnippet/NEWS
+++ b/packages/yasnippet/NEWS
@@ -4,8 +4,14 @@ Copyright (C) 2016 Free Software Foundation, Inc.
See the end of the file for license conditions.
-Don't delete snippets more than once.
+* 0.12.1 (Jul 23, 2017)
+This is a quick bugfix release.
+
+** Compilation errors in yasnippet-tests.el and yasnippet-debug.el are fixed.
+
+** A snippet-local setting of 'yas-indent-line' is now respected
+during indentation triggered by auto-fill as well. See Github #838.
* 0.12.0 (Jul 17, 2017)
diff --git a/packages/yasnippet/Rakefile b/packages/yasnippet/Rakefile
index 85133e6..83c6257 100644
--- a/packages/yasnippet/Rakefile
+++ b/packages/yasnippet/Rakefile
@@ -100,14 +100,22 @@ end
desc "Compile yasnippet.el into yasnippet.elc"
rule '.elc' => '.el' do |t|
- set_warnings = ""
+ cmdline = $EMACS + ' --batch -L .'
if ENV['warnings']
- set_warnings = " --eval \"(setq byte-compile-warnings
#{ENV['warnings']})\""
+ cmdline += " --eval \"(setq byte-compile-warnings #{ENV['warnings']})\""
end
- sh "#{$EMACS} --batch -L . --eval \"(setq byte-compile-error-on-warn t)\"" +
- "#{set_warnings} -f batch-byte-compile #{t.source}"
+ if ENV['Werror']
+ cmdline += " --eval \"(setq byte-compile-error-on-warn #{ENV['Werror']})\""
+ end
+ if ENV['Wlexical']
+ cmdline += " --eval \"(setq byte-compile-force-lexical-warnings
#{ENV['Wlexical']})\""
+ end
+ cmdline +=" -f batch-byte-compile #{t.source}"
+
+ sh cmdline
end
task :compile => FileList["yasnippet.el"].ext('elc')
+task :compile_all => FileList["*.el"].ext('elc')
task :default => :doc
diff --git a/packages/yasnippet/yasnippet-debug.el
b/packages/yasnippet/yasnippet-debug.el
index 7c09412..178e627 100644
--- a/packages/yasnippet/yasnippet-debug.el
+++ b/packages/yasnippet/yasnippet-debug.el
@@ -36,10 +36,18 @@
(file-name-directory (or load-file-name buffer-file-name))
"Directory that yasnippet was loaded from.")
-(require 'yasnippet (expand-file-name "yasnippet" yas--loaddir))
+(require 'yasnippet (if (boundp 'yas--loaddir)
+ ;; Don't require '-L <path>' when debugging.
+ (expand-file-name "yasnippet" yas--loaddir)))
(require 'cl-lib)
(eval-when-compile
- (unless (require 'subr-x nil t)
+ (unless (fboundp 'cl-flet)
+ (defalias 'cl-flet 'flet)))
+(require 'color nil t)
+(require 'edebug)
+(eval-when-compile
+ (unless (and (require 'subr-x nil t) (fboundp 'when-let))
+ ;; Introduced in 25.1
(defmacro when-let (key-val &rest body)
(declare (indent 1) (debug ((symbolp form) body)))
`(let ((,(car key-val) ,(cadr key-val)))
@@ -73,7 +81,9 @@
(color
(cl-loop with best-color = nil with max-dist = -1
for color = (format "#%06X" (random #x1000000))
- for comp = (apply #'color-rgb-to-hex
(color-complement color))
+ for comp = (if (fboundp 'color-complement)
+ (apply #'color-rgb-to-hex
(color-complement color))
+ color)
if (< (color-distance color (face-foreground
'default))
(color-distance comp (face-foreground
'default)))
do (setq color comp)
@@ -91,8 +101,7 @@
(puthash location (cons color ov) yas-debug-live-indicators)))))
(defun yas-debug-live-marker (marker)
- (let* ((buffer (current-buffer))
- (color-ov (yas-debug-get-live-indicator marker))
+ (let* ((color-ov (yas-debug-get-live-indicator marker))
(color (car color-ov))
(ov (cdr color-ov))
(decorator (overlay-get ov 'before-string))
@@ -100,7 +109,7 @@
(if (markerp marker)
(propertize str
'cursor-sensor-functions
- `(,(lambda (window _oldpos dir)
+ `(,(lambda (_window _oldpos dir)
(overlay-put
ov 'before-string
(propertize decorator
@@ -129,7 +138,7 @@
(if (and beg end (not (integerp beg)) (not (integerp end)))
(propertize (format "from %d to %d" (+ beg) (+ end))
'cursor-sensor-functions
- `(,(lambda (window _oldpos dir)
+ `(,(lambda (_window _oldpos dir)
(let ((face (if (eq dir 'entered)
'mode-line-highlight color)))
(overlay-put ov 'before-string
@@ -193,7 +202,9 @@
(yas--debug-format-fom-concise (yas--mirror-next
mirror))))))))
(defvar yas-debug-target-buffer nil)
-(defvar-local yas-debug-target-snippets nil)
+(defvar yas-debug-target-snippets nil nil)
+(make-variable-buffer-local 'yas-debug-target-snippets)
+
(defvar yas-debug-undo nil)
(defun yas-toggle-debug-undo (value)
@@ -247,7 +258,6 @@
;; want when the caller has a single window open. Good
;; enough for now.
(when (eq hook 'create)
- (require 'edebug)
(edebug-instrument-function 'yas--snippet-parse-create)
(let ((buf-point (find-function-noselect
'yas--snippet-parse-create)))
(with-current-buffer (car buf-point)
@@ -258,36 +268,6 @@
(defun yas-debug-snippet-create ()
(yas-debug-snippets nil 'create))
-(defun yas-debug-snippet-vars ()
- "Debug snippets, fields, mirrors and the `buffer-undo-list'."
- (interactive)
- (yas-debug-with-tracebuf ()
- (printf "Interesting YASnippet vars: \n\n")
-
- (printf "\nPost command hook: %s\n" post-command-hook)
- (printf "\nPre command hook: %s\n" pre-command-hook)
-
- (printf "%s live snippets in total\n" (length (yas-active-snippets
'all-snippets)))
- (printf "%s overlays in buffer:\n\n" (length (overlays-in (point-min)
(point-max))))
- (printf "%s live snippets at point:\n\n" (length (yas-active-snippets)))
-
- (yas-debug-snippets outbuf)
-
- (printf "\nUndo is %s and point-max is %s.\n"
- (if (eq buffer-undo-list t)
- "DISABLED"
- "ENABLED")
- (point-max))
- (unless (eq buffer-undo-list t)
- (printf "Undpolist has %s elements. First 10 elements follow:\n"
- (length buffer-undo-list))
- (let ((first-ten (cl-subseq buffer-undo-list 0
- (min 19 (length buffer-undo-list)))))
- (dolist (undo-elem first-ten)
- (printf "%2s: %s\n" (cl-position undo-elem first-ten)
- (truncate-string-to-width (format "%s" undo-elem) 70)))))
- (display-buffer tracebuf)))
-
(defun yas--debug-format-fom-concise (fom)
(when fom
(cond ((yas--field-p fom)
@@ -308,8 +288,7 @@
(setq yas-verbosity 99)
(setq yas-triggers-in-field t)
(setq debug-on-error t)
- (let* ((snippet-file nil)
- (snippet-mode 'fundamental-mode)
+ (let* ((snippet-mode 'fundamental-mode)
(snippet-key nil))
(unless options
(setq options (cl-loop for opt = (pop command-line-args-left)
diff --git a/packages/yasnippet/yasnippet-tests.el
b/packages/yasnippet/yasnippet-tests.el
index c5a94f5..748ba97 100644
--- a/packages/yasnippet/yasnippet-tests.el
+++ b/packages/yasnippet/yasnippet-tests.el
@@ -22,6 +22,11 @@
;; Test basic snippet mechanics and the loading system
+;; To test this in emacs22 mac osx:
+;; curl -L -O
https://github.com/mirrors/emacs/raw/master/lisp/emacs-lisp/ert.el
+;; curl -L -O
https://github.com/mirrors/emacs/raw/master/lisp/emacs-lisp/ert-x.el
+;; /usr/bin/emacs -nw -Q -L . -l yasnippet-tests.el --batch -e ert
+
;;; Code:
(require 'yasnippet)
@@ -31,6 +36,122 @@
(require 'org)
+;;; Helper macros and function
+
+(defmacro yas-with-snippet-dirs (dirs &rest body)
+ (declare (indent defun) (debug t))
+ `(yas-call-with-snippet-dirs
+ ,dirs #'(lambda () ,@body)))
+
+(defun yas-should-expand (keys-and-expansions)
+ (dolist (key-and-expansion keys-and-expansions)
+ (yas-exit-all-snippets)
+ (erase-buffer)
+ (insert (car key-and-expansion))
+ (ert-simulate-command '(yas-expand))
+ (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--collect-menu-items (menu-keymap)
+ (let ((yas--menu-items ()))
+ (map-keymap (lambda (_binding definition)
+ (when (eq (car-safe definition) 'menu-item)
+ (push definition yas--menu-items)))
+ menu-keymap)
+ yas--menu-items))
+
+(defun yas-should-not-expand (keys)
+ (dolist (key keys)
+ (yas-exit-all-snippets)
+ (erase-buffer)
+ (insert key)
+ (ert-simulate-command '(yas-expand))
+ (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)
+ (dotimes (i (length string))
+ (let ((last-command-event (aref string i)))
+ (ert-simulate-command '(self-insert-command 1)))))
+
+(defun yas-mock-yank (string)
+ (let ((interprogram-paste-function (lambda () string)))
+ (ert-simulate-command '(yank nil))))
+
+(defun yas--key-binding (key)
+ "Like `key-binding', but override `this-command-keys-vector'.
+This lets `yas--maybe-expand-from-keymap-filter' work as expected."
+ (cl-letf (((symbol-function 'this-command-keys-vector)
+ (lambda () (cl-coerce key 'vector))))
+ (key-binding key)))
+
+(defun yas-make-file-or-dirs (ass)
+ (let ((file-or-dir-name (car ass))
+ (content (cdr ass)))
+ (cond ((listp content)
+ (make-directory file-or-dir-name 'parents)
+ (let ((default-directory (concat default-directory "/"
file-or-dir-name)))
+ (mapc #'yas-make-file-or-dirs content)))
+ ((stringp content)
+ (with-temp-buffer
+ (insert content)
+ (write-region nil nil file-or-dir-name nil 'nomessage)))
+ (t
+ (message "[yas] oops don't know this content")))))
+
+
+(defun yas-variables ()
+ (let ((syms))
+ (mapatoms #'(lambda (sym)
+ (if (and (string-match "^yas-[^/]" (symbol-name sym))
+ (boundp sym))
+ (push sym syms))))
+ syms))
+
+(defun yas-call-with-saving-variables (fn)
+ (let* ((vars (yas-variables))
+ (saved-values (mapcar #'symbol-value vars)))
+ (unwind-protect
+ (funcall fn)
+ (cl-loop for var in vars
+ for saved in saved-values
+ do (set var saved)))))
+
+(defun yas-call-with-snippet-dirs (dirs fn)
+ (let* ((default-directory (make-temp-file "yasnippet-fixture" t))
+ (yas-snippet-dirs (mapcar (lambda (d) (expand-file-name (car d)))
dirs)))
+ (with-temp-message ""
+ (unwind-protect
+ (progn
+ (mapc #'yas-make-file-or-dirs dirs)
+ (funcall fn))
+ (when (>= emacs-major-version 24)
+ (delete-directory default-directory 'recursive))))))
+
+;;; Older emacsen
+;;;
+(unless (fboundp 'special-mode)
+ ;; FIXME: Why provide this default definition here?!?
+ (defalias 'special-mode 'fundamental))
+
+(unless (fboundp 'string-suffix-p)
+ ;; introduced in Emacs 24.4
+ (defun string-suffix-p (suffix string &optional ignore-case)
+ "Return non-nil if SUFFIX is a suffix of STRING.
+If IGNORE-CASE is non-nil, the comparison is done without paying
+attention to case differences."
+ (let ((start-pos (- (length string) (length suffix))))
+ (and (>= start-pos 0)
+ (eq t (compare-strings suffix nil nil
+ string start-pos nil ignore-case))))))
+
+
;;; Snippet mechanics
(defun yas--buffer-contents ()
@@ -499,14 +620,9 @@ mapconcat #'(lambda (arg)
(kill-buffer ,temp-buffer))))))))
(defmacro yas-saving-variables (&rest body)
+ (declare (debug t))
`(yas-call-with-saving-variables #'(lambda () ,@body)))
-(defmacro yas-with-snippet-dirs (dirs &rest body)
- (declare (indent defun))
- `(yas-call-with-snippet-dirs ,dirs
- #'(lambda ()
- ,@body)))
-
(ert-deftest example-for-issue-474 ()
(yas--with-font-locked-temp-buffer
(c-mode)
@@ -597,21 +713,22 @@ TODO: correct this bug!"
"brother from another mother") ;; no newline should be
here!
)))
+(defvar yas-tests--ran-exit-hook nil)
+
(ert-deftest snippet-exit-hooks ()
- (defvar yas--ran-exit-hook)
(with-temp-buffer
(yas-saving-variables
- (let ((yas--ran-exit-hook nil)
+ (let ((yas-tests--ran-exit-hook nil)
(yas-triggers-in-field t))
(yas-with-snippet-dirs
'((".emacs.d/snippets"
("emacs-lisp-mode"
("foo" . "\
-# expand-env: ((yas-after-exit-snippet-hook (lambda () (setq
yas--ran-exit-hook t))))
+# expand-env: ((yas-after-exit-snippet-hook (lambda () (setq
yas-tests--ran-exit-hook t))))
# --
FOO ${1:f1} ${2:f2}")
("sub" . "\
-# expand-env: ((yas-after-exit-snippet-hook (lambda () (setq
yas--ran-exit-hook 'sub))))
+# expand-env: ((yas-after-exit-snippet-hook (lambda () (setq
yas-tests--ran-exit-hook 'sub))))
# --
SUB"))))
(yas-reload-all)
@@ -619,22 +736,21 @@ SUB"))))
(yas-minor-mode +1)
(insert "foo")
(ert-simulate-command '(yas-expand))
- (should-not yas--ran-exit-hook)
+ (should-not yas-tests--ran-exit-hook)
(yas-mock-insert "sub")
(ert-simulate-command '(yas-expand))
(ert-simulate-command '(yas-next-field))
- (should-not yas--ran-exit-hook)
+ (should-not yas-tests--ran-exit-hook)
(ert-simulate-command '(yas-next-field))
- (should (eq yas--ran-exit-hook t)))))))
+ (should (eq yas-tests--ran-exit-hook t)))))))
(ert-deftest snippet-exit-hooks-bindings ()
"Check that `yas-after-exit-snippet-hook' is handled correctly
in the case of a buffer-local variable and being overwritten by
the expand-env field."
- (defvar yas--ran-exit-hook)
(with-temp-buffer
(yas-saving-variables
- (let ((yas--ran-exit-hook nil)
+ (let ((yas-tests--ran-exit-hook nil)
(yas-triggers-in-field t)
(yas-after-exit-snippet-hook nil))
(yas-with-snippet-dirs
@@ -642,21 +758,21 @@ the expand-env field."
("emacs-lisp-mode"
("foo" . "foobar\n")
("baz" . "\
-# expand-env: ((yas-after-exit-snippet-hook (lambda () (setq
yas--ran-exit-hook 'letenv))))
+# expand-env: ((yas-after-exit-snippet-hook (lambda () (setq
yas-tests--ran-exit-hook 'letenv))))
# --
foobaz\n"))))
(yas-reload-all)
(emacs-lisp-mode)
(yas-minor-mode +1)
- (add-hook 'yas-after-exit-snippet-hook (lambda () (push 'global
yas--ran-exit-hook)))
- (add-hook 'yas-after-exit-snippet-hook (lambda () (push 'local
yas--ran-exit-hook)) nil t)
+ (add-hook 'yas-after-exit-snippet-hook (lambda () (push 'global
yas-tests--ran-exit-hook)))
+ (add-hook 'yas-after-exit-snippet-hook (lambda () (push 'local
yas-tests--ran-exit-hook)) nil t)
(insert "baz")
(ert-simulate-command '(yas-expand))
- (should (eq 'letenv yas--ran-exit-hook))
+ (should (eq 'letenv yas-tests--ran-exit-hook))
(insert "foo")
(ert-simulate-command '(yas-expand))
- (should (eq 'global (nth 0 yas--ran-exit-hook)))
- (should (eq 'local (nth 1 yas--ran-exit-hook))))))))
+ (should (eq 'global (nth 0 yas-tests--ran-exit-hook)))
+ (should (eq 'local (nth 1 yas-tests--ran-exit-hook))))))))
(ert-deftest snippet-mirror-bindings ()
"Check that variables defined with the expand-env field are
@@ -784,6 +900,7 @@ hello ${1:$(when (stringp yas-text) (funcall func
yas-text))} foo${1:$$(concat \
;;;
(defmacro yas-with-overriden-buffer-list (&rest body)
+ (declare (debug t))
(let ((saved-sym (make-symbol "yas--buffer-list")))
`(let ((,saved-sym (symbol-function 'buffer-list)))
(cl-letf (((symbol-function 'buffer-list)
@@ -796,6 +913,7 @@ hello ${1:$(when (stringp yas-text) (funcall func
yas-text))} foo${1:$$(concat \
(defmacro yas-with-some-interesting-snippet-dirs (&rest body)
+ (declare (debug t))
`(yas-saving-variables
(yas-with-overriden-buffer-list
(yas-with-snippet-dirs
@@ -1259,128 +1377,6 @@ add the snippets associated with the given mode."
(yas-should-expand '(("car" . "(car )")))))))
-;;; Helpers
-;;;
-(defun yas-should-expand (keys-and-expansions)
- (dolist (key-and-expansion keys-and-expansions)
- (yas-exit-all-snippets)
- (erase-buffer)
- (insert (car key-and-expansion))
- (let ((yas-fallback-behavior nil))
- (ert-simulate-command '(yas-expand)))
- (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--collect-menu-items (menu-keymap)
- (let ((yas--menu-items ()))
- (map-keymap (lambda (_binding definition)
- (when (eq (car-safe definition) 'menu-item)
- (push definition yas--menu-items)))
- menu-keymap)
- yas--menu-items))
-
-(defun yas-should-not-expand (keys)
- (dolist (key keys)
- (yas-exit-all-snippets)
- (erase-buffer)
- (insert key)
- (let ((yas-fallback-behavior nil))
- (ert-simulate-command '(yas-expand)))
- (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)
- (dotimes (i (length string))
- (let ((last-command-event (aref string i)))
- (ert-simulate-command '(self-insert-command 1)))))
-
-(defun yas-mock-yank (string)
- (let ((interprogram-paste-function (lambda () string)))
- (ert-simulate-command '(yank nil))))
-
-(defun yas--key-binding (key)
- "Like `key-binding', but override `this-command-keys-vector'.
-This lets `yas--maybe-expand-from-keymap-filter' work as expected."
- (cl-letf (((symbol-function 'this-command-keys-vector)
- (lambda () (cl-coerce key 'vector))))
- (key-binding key)))
-
-(defun yas-make-file-or-dirs (ass)
- (let ((file-or-dir-name (car ass))
- (content (cdr ass)))
- (cond ((listp content)
- (make-directory file-or-dir-name 'parents)
- (let ((default-directory (concat default-directory "/"
file-or-dir-name)))
- (mapc #'yas-make-file-or-dirs content)))
- ((stringp content)
- (with-temp-buffer
- (insert content)
- (write-region nil nil file-or-dir-name nil 'nomessage)))
- (t
- (message "[yas] oops don't know this content")))))
-
-
-(defun yas-variables ()
- (let ((syms))
- (mapatoms #'(lambda (sym)
- (if (and (string-match "^yas-[^/]" (symbol-name sym))
- (boundp sym))
- (push sym syms))))
- syms))
-
-(defun yas-call-with-saving-variables (fn)
- (let* ((vars (yas-variables))
- (saved-values (mapcar #'symbol-value vars)))
- (unwind-protect
- (funcall fn)
- (cl-loop for var in vars
- for saved in saved-values
- do (set var saved)))))
-
-(defun yas-call-with-snippet-dirs (dirs fn)
- (let* ((default-directory (make-temp-file "yasnippet-fixture" t))
- (yas-snippet-dirs (mapcar (lambda (d) (expand-file-name (car d)))
dirs)))
- (with-temp-message ""
- (unwind-protect
- (progn
- (mapc #'yas-make-file-or-dirs dirs)
- (funcall fn))
- (when (>= emacs-major-version 24)
- (delete-directory default-directory 'recursive))))))
-
-;;; Older emacsen
-;;;
-(unless (fboundp 'special-mode)
- ;; FIXME: Why provide this default definition here?!?
- (defalias 'special-mode 'fundamental))
-
-(unless (fboundp 'string-suffix-p)
- ;; introduced in Emacs 24.4
- (defun string-suffix-p (suffix string &optional ignore-case)
- "Return non-nil if SUFFIX is a suffix of STRING.
-If IGNORE-CASE is non-nil, the comparison is done without paying
-attention to case differences."
- (let ((start-pos (- (length string) (length suffix))))
- (and (>= start-pos 0)
- (eq t (compare-strings suffix nil nil
- string start-pos nil ignore-case))))))
-
-;;; btw to test this in emacs22 mac osx:
-;;; curl -L -O
https://github.com/mirrors/emacs/raw/master/lisp/emacs-lisp/ert.el
-;;; curl -L -O
https://github.com/mirrors/emacs/raw/master/lisp/emacs-lisp/ert-x.el
-;;; /usr/bin/emacs -nw -Q -L . -l yasnippet-tests.el --batch -e ert
-
-
-(put 'yas-saving-variables 'edebug-form-spec t)
-(put 'yas-with-snippet-dirs 'edebug-form-spec t)
-(put 'yas-with-overriden-buffer-list 'edebug-form-spec t)
-(put 'yas-with-some-interesting-snippet-dirs 'edebug-form-spec t)
(provide 'yasnippet-tests)
;; Local Variables:
diff --git a/packages/yasnippet/yasnippet.el b/packages/yasnippet/yasnippet.el
index 834d035..94ccffb 100644
--- a/packages/yasnippet/yasnippet.el
+++ b/packages/yasnippet/yasnippet.el
@@ -5,7 +5,7 @@
;; João Távora <address@hidden>,
;; Noam Postavsky <address@hidden>
;; Maintainer: Noam Postavsky <address@hidden>
-;; Version: 0.12.0
+;; Version: 0.12.1
;; X-URL: http://github.com/joaotavora/yasnippet
;; Keywords: convenience, emulation
;; URL: http://github.com/joaotavora/yasnippet
@@ -132,6 +132,7 @@
;;; Code:
(require 'cl-lib)
+(declare-function cl-progv-after "cl-extra") ; Needed for 23.4.
(require 'easymenu)
(require 'help-mode)
@@ -535,7 +536,7 @@ override bindings from other packages (e.g.,
`company-mode')."
;;; Internal variables
-(defconst yas--version "0.12.0")
+(defconst yas--version "0.12.1")
(defvar yas--menu-table (make-hash-table)
"A hash table of MAJOR-MODE symbols to menu keymaps.")
@@ -585,6 +586,8 @@ override bindings from other packages (e.g.,
`company-mode')."
(defvar yas--minor-mode-menu nil
"Holds the YASnippet menu.")
+(defvar yas--condition-cache-timestamp nil)
+
(defun yas--maybe-expand-key-filter (cmd)
(when (let ((yas--condition-cache-timestamp (current-time)))
(yas--templates-for-key-at-point))
@@ -2183,7 +2186,6 @@ Just put this function in
`hippie-expand-try-functions-list'."
;;;
;;;
;;;
-(defvar yas--condition-cache-timestamp nil)
(defmacro yas-define-condition-cache (func doc &rest body)
"Define a function FUNC with doc DOC and body BODY.
BODY is executed at most once every snippet expansion attempt, to check
@@ -3028,9 +3030,16 @@ DEPTH is a count of how many nested mirrors can affect
this mirror"
(defmacro yas--letenv (env &rest body)
"Evaluate BODY with bindings from ENV.
-ENV is a list of elements with the form (VAR FORM)."
+ENV is a lisp expression that evaluates to list of elements with
+the form (VAR FORM), where VAR is a symbol and FORM is a lisp
+expression that evaluates to its value."
(declare (debug (form body)) (indent 1))
- `(eval (cl-list* 'let* ,env ',body)))
+ (let ((envvar (make-symbol "envvar")))
+ `(let ((,envvar ,env))
+ (cl-progv
+ (mapcar #'car ,envvar)
+ (mapcar (lambda (v-f) (eval (cadr v-f))) ,envvar)
+ ,@body))))
(defun yas--snippet-map-markers (fun snippet)
"Apply FUN to all marker (sub)fields in SNIPPET.
@@ -3635,7 +3644,10 @@ field start. This hook does nothing if an undo is in
progress."
(narrow-to-region beg end)
(mapc #'yas--restore-marker-location remarkers)
(mapc #'yas--restore-overlay-location reoverlays))
- (mapc #'yas--update-mirrors snippets))))
+ (mapc (lambda (snippet)
+ (yas--letenv (yas--snippet-expand-env snippet)
+ (yas--update-mirrors snippet)))
+ snippets))))
;;; Apropos protection overlays:
@@ -4540,7 +4552,7 @@ When multiple expressions are found, only the last one
counts."
(when parent-field
(yas--advance-start-maybe mirror (yas--fom-start parent-field))))
;; Update this mirror.
- do (yas--mirror-update-display mirror field snippet)
+ do (yas--mirror-update-display mirror field)
;; Delay indenting until we're done all mirrors. We must do
;; this to avoid losing whitespace between fields that are
;; still empty (i.e., they will be non-empty after updating).
@@ -4557,7 +4569,7 @@ When multiple expressions are found, only the last one
counts."
(cl-loop for (beg . end) in (cl-sort indent-regions #'< :key #'car)
do (yas--indent-region beg end snippet)))))))
-(defun yas--mirror-update-display (mirror field snippet)
+(defun yas--mirror-update-display (mirror field)
"Update MIRROR according to FIELD (and mirror transform)."
(let* ((mirror-parent-field (yas--mirror-parent-field mirror))
- [elpa] master updated (32b8352 -> a1d8b5b), Noam Postavsky, 2017/07/23
- [elpa] master 7365f9e 1/5: Avoid to indent snippets having setup `(yas-indent-line 'fixed)', Noam Postavsky, 2017/07/23
- [elpa] master 0463c75 4/5: Release 0.12.1, Noam Postavsky, 2017/07/23
- [elpa] master 304c01a 2/5: Fix some compilation warnings, Noam Postavsky, 2017/07/23
- [elpa] master dd65fe6 3/5: Add compile_all target, fix all compilation warnings, Noam Postavsky, 2017/07/23
- [elpa] master a1d8b5b 5/5: Merge yasnippet 0.12.1 from upstream,
Noam Postavsky <=