From 27eb5412df5b4971fa9facb5241db6be52bf37c1 Mon Sep 17 00:00:00 2001 From: Simeon Simeonov Date: Thu, 17 Nov 2016 13:30:23 +0100 Subject: Upgraded yasnippet and mode-yaml --- .emacs.d/lisp/yaml-mode.el | 8 ++++---- .emacs.d/lisp/yasnippet.el | 19 +++++++++++-------- 2 files changed, 15 insertions(+), 12 deletions(-) diff --git a/.emacs.d/lisp/yaml-mode.el b/.emacs.d/lisp/yaml-mode.el index 2cc7392..44650be 100644 --- a/.emacs.d/lisp/yaml-mode.el +++ b/.emacs.d/lisp/yaml-mode.el @@ -7,7 +7,7 @@ ;; Maintainer: Vasilij Schneidermann ;; Package-Requires: ((emacs "24.1")) ;; Keywords: data yaml -;; Version: 0.0.12 +;; Version: 0.0.13 ;; This file is not part of Emacs @@ -117,7 +117,7 @@ that key is pressed to begin a block literal." ;; Constants -(defconst yaml-mode-version "0.0.12" "Version of `yaml-mode'.") +(defconst yaml-mode-version "0.0.13" "Version of `yaml-mode'.") (defconst yaml-blank-line-re "^ *$" "Regexp matching a line containing only (valid) whitespace.") @@ -190,7 +190,7 @@ that key is pressed to begin a block literal." (define-key map ">" 'yaml-electric-bar-and-angle) (define-key map "-" 'yaml-electric-dash-and-dot) (define-key map "." 'yaml-electric-dash-and-dot) - (define-key map [backspace] 'yaml-electric-backspace) + (define-key map (kbd "DEL") 'yaml-electric-backspace) map) "Keymap used in `yaml-mode' buffers.") @@ -201,7 +201,7 @@ that key is pressed to begin a block literal." (modify-syntax-entry ?# "<" syntax-table) (modify-syntax-entry ?\n ">" syntax-table) (modify-syntax-entry ?\\ "\\" syntax-table) - (modify-syntax-entry ?- "w" syntax-table) + (modify-syntax-entry ?- "_" syntax-table) (modify-syntax-entry ?_ "_" syntax-table) (modify-syntax-entry ?\( "." syntax-table) (modify-syntax-entry ?\) "." syntax-table) diff --git a/.emacs.d/lisp/yasnippet.el b/.emacs.d/lisp/yasnippet.el index 3f9660e..c308c9b 100644 --- a/.emacs.d/lisp/yasnippet.el +++ b/.emacs.d/lisp/yasnippet.el @@ -5,10 +5,10 @@ ;; João Távora , ;; Noam Postavsky ;; Maintainer: Noam Postavsky -;; Version: 0.10.0 -;; X-URL: http://github.com/capitaomorte/yasnippet +;; Version: 0.11.0 +;; X-URL: http://github.com/joaotavora/yasnippet ;; Keywords: convenience, emulation -;; URL: http://github.com/capitaomorte/yasnippet +;; URL: http://github.com/joaotavora/yasnippet ;; Package-Requires: ((cl-lib "0.5")) ;; EmacsWiki: YaSnippetMode @@ -127,7 +127,7 @@ ;; `custom-set-variables' is executed in your .emacs file. ;; ;; For more information and detailed usage, refer to the project page: -;; http://github.com/capitaomorte/yasnippet +;; http://github.com/joaotavora/yasnippet ;;; Code: @@ -514,7 +514,7 @@ snippet itself contains a condition that returns the symbol ;;; Internal variables -(defconst yas--version "0.10.0") +(defconst yas--version "0.11.0") (defvar yas--menu-table (make-hash-table) "A hash table of MAJOR-MODE symbols to menu keymaps.") @@ -1876,9 +1876,12 @@ prefix argument." (yas-direct-keymaps-reload) (run-hooks 'yas-after-reload-hook) - (yas--message (if errors 2 3) "Reloaded everything%s...%s." - (if no-jit "" " (snippets will load just-in-time)") - (if errors " (some errors, check *Messages*)" ""))))) + (yas--message (if errors 2 3) + (if no-jit "Snippets loaded %s." + "Prepared just-in-time loading of snippets %s.") + (if errors + "with some errors. Check *Messages*" + "successfully"))))) (defvar yas-after-reload-hook nil "Hooks run after `yas-reload-all'.") -- cgit v1.3