[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] master a4deb1b 432/433: Merge commit 'cb905bdc728fb3b5f9fdff8836d
From: |
Dmitry Gutov |
Subject: |
[elpa] master a4deb1b 432/433: Merge commit 'cb905bdc728fb3b5f9fdff8836d71b62bd717eab' from mmm-mode |
Date: |
Thu, 15 Mar 2018 19:44:50 -0400 (EDT) |
branch: master
commit a4deb1b5492e95a0d4646563560fd180a1c3ef0d
Merge: aeb1c33 cb905bd
Author: Dmitry Gutov <address@hidden>
Commit: Dmitry Gutov <address@hidden>
Merge commit 'cb905bdc728fb3b5f9fdff8836d71b62bd717eab' from mmm-mode
---
packages/mmm-mode/tests/highlighting.el | 21 +++++++++++++++++++++
packages/mmm-mode/tests/html-erb.el | 21 +++++++++++++++++++++
2 files changed, 42 insertions(+)
diff --git a/packages/mmm-mode/tests/highlighting.el
b/packages/mmm-mode/tests/highlighting.el
index b10aca8..5ce2269 100644
--- a/packages/mmm-mode/tests/highlighting.el
+++ b/packages/mmm-mode/tests/highlighting.el
@@ -1,3 +1,24 @@
+;; Copyright (C) 2013-2014 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; 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. If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+
(require 'ert-x)
(defvar foo-mode-keywords
diff --git a/packages/mmm-mode/tests/html-erb.el
b/packages/mmm-mode/tests/html-erb.el
index ff974cc..fe34c86 100644
--- a/packages/mmm-mode/tests/html-erb.el
+++ b/packages/mmm-mode/tests/html-erb.el
@@ -1,3 +1,24 @@
+;; Copyright (C) 2013 Free Software Foundation, Inc.
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs is free software: you can redistribute it and/or modify
+;; it under the terms of the GNU General Public License as published by
+;; the Free Software Foundation, either version 3 of the License, or
+;; (at your option) any later version.
+
+;; GNU Emacs is distributed in the hope that it will be useful,
+;; but WITHOUT ANY WARRANTY; without even the implied warranty of
+;; 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. If not, see <https://www.gnu.org/licenses/>.
+
+;;; Commentary:
+
+;;; Code:
+
(require 'ert)
(require 'ert-x)
(require 'mmm-erb)
- [elpa] master 912f3bd 335/433: Use syntax-propertize-function set in submodes, (continued)
- [elpa] master 912f3bd 335/433: Use syntax-propertize-function set in submodes, Dmitry Gutov, 2018/03/15
- [elpa] master c9dea38 363/433: Update the FAQ, Dmitry Gutov, 2018/03/15
- [elpa] master 628e1dc 380/433: Merge pull request #31 from tom-tan/add-autoloads, Dmitry Gutov, 2018/03/15
- [elpa] master 01b5cd9 338/433: * mmm-apply-all: flush syntax cache, Dmitry Gutov, 2018/03/15
- [elpa] master e257808 413/433: Copy mmm-indent-line body into mmm-indent-narrowed, Dmitry Gutov, 2018/03/15
- [elpa] master 3895201 294/433: Merge pull request #3 from dgutov/shortcuts-fix, Dmitry Gutov, 2018/03/15
- [elpa] master de643c9 409/433: Mode transition hooks, Dmitry Gutov, 2018/03/15
- [elpa] master 395317c 332/433: * mmm-make-region: Don't call mmm-save-changed-local-variables, or set the, Dmitry Gutov, 2018/03/15
- [elpa] master 38439a4 301/433: Reparse mmm-mode buffer when Emacs is idle, Dmitry Gutov, 2018/03/15
- [elpa] master c76b13e 418/433: Add some NEWS entries, Dmitry Gutov, 2018/03/15
- [elpa] master a4deb1b 432/433: Merge commit 'cb905bdc728fb3b5f9fdff8836d71b62bd717eab' from mmm-mode,
Dmitry Gutov <=
- [elpa] master aeb1c33 430/433: Add 'packages/mmm-mode/' from commit '00c10a69c8c90178530219730ccea14ab634a74e', Dmitry Gutov, 2018/03/15