From 481decd28b7940d1dae11fd0ff2dc06143c46ee8 Mon Sep 17 00:00:00 2001 From: Simeon Simeonov Date: Wed, 17 Feb 2016 07:39:51 +0100 Subject: Add java-mode snippets. Upgrade yasnippet and yaml-mode --- .emacs.d/lisp/yaml-mode.el | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to '.emacs.d/lisp/yaml-mode.el') diff --git a/.emacs.d/lisp/yaml-mode.el b/.emacs.d/lisp/yaml-mode.el index 15f3872..b932576 100644 --- a/.emacs.d/lisp/yaml-mode.el +++ b/.emacs.d/lisp/yaml-mode.el @@ -4,6 +4,8 @@ ;; Author: Yoshiki Kurihara ;; Marshall T. Vandegrift +;; Maintainer: Vasilij Schneidermann +;; Package-Requires: ((emacs "24.1")) ;; Keywords: data yaml ;; Version: 0.0.12 @@ -19,10 +21,9 @@ ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. -;; You should have received a copy of the GNU General Public License -;; along with GNU Emacs; see the file COPYING. If not, write to -;; the Free Software Foundation, Inc., 59 Temple Place - Suite 330, -;; Boston, MA 02111-1307, USA. +;; You should have received a copy of the GNU General Public License along +;; with this program; if not, write to the Free Software Foundation, Inc., +;; 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. ;;; Commentary: @@ -144,7 +145,7 @@ that key is pressed to begin a block literal." "Regexp matching a single YAML hash key.") (defconst yaml-scalar-context-re - (concat "\\(?:^\\(?:--- \\)?\\|{\\|\\(?:[-,] +\\)+\\) *" + (concat "\\(?:^\\(?:--- \\)?\\|{\\|\\(?: *[-,] +\\)+\\) *" "\\(?:" yaml-bare-scalar-re " *: \\)?") "Regexp indicating the begininng of a scalar context.") @@ -162,7 +163,7 @@ that key is pressed to begin a block literal." "Regexp matching a line beginning a YAML block literal.") (defconst yaml-nested-sequence-re - (concat "^\\(?: *- +\\)+" + (concat "^\\(?:\\(?: *- +\\)+\\|\\(:? *-$\\)\\)" "\\(?:" yaml-bare-scalar-re " *:\\(?: +.*\\)?\\)?$") "Regexp matching a line containing one or more nested YAML sequences.") @@ -213,7 +214,7 @@ that key is pressed to begin a block literal." (modify-syntax-entry ?\] ")[" yaml-mode-syntax-table)) ;;;###autoload -(define-derived-mode yaml-mode fundamental-mode "YAML" +(define-derived-mode yaml-mode text-mode "YAML" "Simple mode to edit YAML. \\{yaml-mode-map}" -- cgit v1.3