diff options
| author | Paul Eggert | 2013-01-02 08:13:04 -0800 |
|---|---|---|
| committer | Paul Eggert | 2013-01-02 08:13:04 -0800 |
| commit | 0877d0dc24ee792b9b14592869ea1aa0934aee58 (patch) | |
| tree | 08e9265a1dd95974dc72622a9bef194682c0c716 /etc/srecode | |
| parent | aca3d51dfa45794fa68a2ffb6269e34fcee2ec6c (diff) | |
| parent | d8fb8cce84b923a3289b69549e30958710ac3ebb (diff) | |
| download | emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.tar.gz emacs-0877d0dc24ee792b9b14592869ea1aa0934aee58.zip | |
Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca
Diffstat (limited to 'etc/srecode')
| -rw-r--r-- | etc/srecode/c.srt | 2 | ||||
| -rw-r--r-- | etc/srecode/cpp.srt | 2 | ||||
| -rw-r--r-- | etc/srecode/default.srt | 2 | ||||
| -rw-r--r-- | etc/srecode/doc-cpp.srt | 2 | ||||
| -rw-r--r-- | etc/srecode/doc-default.srt | 2 | ||||
| -rw-r--r-- | etc/srecode/doc-java.srt | 2 | ||||
| -rw-r--r-- | etc/srecode/ede-autoconf.srt | 4 | ||||
| -rw-r--r-- | etc/srecode/ede-make.srt | 2 | ||||
| -rw-r--r-- | etc/srecode/el.srt | 2 | ||||
| -rw-r--r-- | etc/srecode/getset-cpp.srt | 2 | ||||
| -rw-r--r-- | etc/srecode/java.srt | 2 | ||||
| -rw-r--r-- | etc/srecode/make.srt | 2 | ||||
| -rw-r--r-- | etc/srecode/template.srt | 2 | ||||
| -rw-r--r-- | etc/srecode/test.srt | 2 | ||||
| -rw-r--r-- | etc/srecode/texi.srt | 2 | ||||
| -rw-r--r-- | etc/srecode/wisent.srt | 2 |
16 files changed, 16 insertions, 18 deletions
diff --git a/etc/srecode/c.srt b/etc/srecode/c.srt index 14d51ed02e6..6c7139f3184 100644 --- a/etc/srecode/c.srt +++ b/etc/srecode/c.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; c.srt --- SRecode templates for c-mode | 1 | ;;; c.srt --- SRecode templates for c-mode |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2007, 2008, 2009, 2010, 2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2007-2010, 2012-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> | 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> |
| 6 | 6 | ||
diff --git a/etc/srecode/cpp.srt b/etc/srecode/cpp.srt index f73dcd2a1ca..b4bbb3817e2 100644 --- a/etc/srecode/cpp.srt +++ b/etc/srecode/cpp.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; cpp.srt --- SRecode templates for c++-mode | 1 | ;;; cpp.srt --- SRecode templates for c++-mode |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2007-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2007-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> | 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> |
| 6 | 6 | ||
diff --git a/etc/srecode/default.srt b/etc/srecode/default.srt index 2cedcfceeff..6147b2ec909 100644 --- a/etc/srecode/default.srt +++ b/etc/srecode/default.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; default.srt --- SRecode templates for srecode-template-mode | 1 | ;;; default.srt --- SRecode templates for srecode-template-mode |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2007-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2007-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> | 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> |
| 6 | 6 | ||
diff --git a/etc/srecode/doc-cpp.srt b/etc/srecode/doc-cpp.srt index 67d13691cef..aefe88f7941 100644 --- a/etc/srecode/doc-cpp.srt +++ b/etc/srecode/doc-cpp.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;; doc-c.srt --- SRecode templates for "document" applications | 1 | ;; doc-c.srt --- SRecode templates for "document" applications |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2008-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2008-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> | 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> |
| 6 | 6 | ||
diff --git a/etc/srecode/doc-default.srt b/etc/srecode/doc-default.srt index f3876c830af..9d28d56fc8b 100644 --- a/etc/srecode/doc-default.srt +++ b/etc/srecode/doc-default.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;; doc-default.srt --- SRecode templates for "document" applications | 1 | ;; doc-default.srt --- SRecode templates for "document" applications |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2009-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2009-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> | 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> |
| 6 | 6 | ||
diff --git a/etc/srecode/doc-java.srt b/etc/srecode/doc-java.srt index 729d025008a..06d800c2294 100644 --- a/etc/srecode/doc-java.srt +++ b/etc/srecode/doc-java.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;; doc-java.srt --- SRecode templates for "document" applications | 1 | ;; doc-java.srt --- SRecode templates for "document" applications |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2009-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2009-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> | 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> |
| 6 | 6 | ||
diff --git a/etc/srecode/ede-autoconf.srt b/etc/srecode/ede-autoconf.srt index daefd532dff..d2ec61a0a93 100644 --- a/etc/srecode/ede-autoconf.srt +++ b/etc/srecode/ede-autoconf.srt | |||
| @@ -15,9 +15,7 @@ | |||
| 15 | ;; General Public License for more details. | 15 | ;; General Public License for more details. |
| 16 | 16 | ||
| 17 | ;; You should have received a copy of the GNU General Public License | 17 | ;; You should have received a copy of the GNU General Public License |
| 18 | ;; along with this program; see the file COPYING. If not, write to | 18 | ;; along with this program. If not, see <http://www.gnu.org/licenses/>. |
| 19 | ;; the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, | ||
| 20 | ;; Boston, MA 02110-1301, USA. | ||
| 21 | 19 | ||
| 22 | set mode "autoconf-mode" | 20 | set mode "autoconf-mode" |
| 23 | set escape_start "{{" | 21 | set escape_start "{{" |
diff --git a/etc/srecode/ede-make.srt b/etc/srecode/ede-make.srt index 0b024cd30e4..f12744e89b7 100644 --- a/etc/srecode/ede-make.srt +++ b/etc/srecode/ede-make.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;; ede-make.srt --- SRecode templates for Makefiles used by EDE. | 1 | ;; ede-make.srt --- SRecode templates for Makefiles used by EDE. |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2008-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2008-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> | 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> |
| 6 | 6 | ||
diff --git a/etc/srecode/el.srt b/etc/srecode/el.srt index 34a8983b29f..458185c43e3 100644 --- a/etc/srecode/el.srt +++ b/etc/srecode/el.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; el.srt --- SRecode templates for Emacs Lisp mode | 1 | ;;; el.srt --- SRecode templates for Emacs Lisp mode |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2007-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2007-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric Ludlam <zappo@gnu.org> | 5 | ;; Author: Eric Ludlam <zappo@gnu.org> |
| 6 | 6 | ||
diff --git a/etc/srecode/getset-cpp.srt b/etc/srecode/getset-cpp.srt index 22dca4ed1b3..4fdfb18e657 100644 --- a/etc/srecode/getset-cpp.srt +++ b/etc/srecode/getset-cpp.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; getset-cpp.srt --- SRecode templates for C++ class getter/setters. | 1 | ;;; getset-cpp.srt --- SRecode templates for C++ class getter/setters. |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2007-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2007-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> | 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> |
| 6 | 6 | ||
diff --git a/etc/srecode/java.srt b/etc/srecode/java.srt index 706b6b39d57..a4a6fc2e863 100644 --- a/etc/srecode/java.srt +++ b/etc/srecode/java.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;; java.srt | 1 | ;; java.srt |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2009-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2009-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> | 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> |
| 6 | 6 | ||
diff --git a/etc/srecode/make.srt b/etc/srecode/make.srt index 4001132e35e..134ae8beb41 100644 --- a/etc/srecode/make.srt +++ b/etc/srecode/make.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;; make.srt | 1 | ;; make.srt |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2009-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2009-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> | 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> |
| 6 | 6 | ||
diff --git a/etc/srecode/template.srt b/etc/srecode/template.srt index 226d51c7ba9..3dad0b544dd 100644 --- a/etc/srecode/template.srt +++ b/etc/srecode/template.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;;; template.srt --- Templates for Semantic Recoders | 1 | ;;; template.srt --- Templates for Semantic Recoders |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2005, 2007-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2005, 2007-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric Ludlam <zappo@gnu.org> | 5 | ;; Author: Eric Ludlam <zappo@gnu.org> |
| 6 | 6 | ||
diff --git a/etc/srecode/test.srt b/etc/srecode/test.srt index fe12eb8b8c5..c5fd25a4c81 100644 --- a/etc/srecode/test.srt +++ b/etc/srecode/test.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;; test.srt --- SRecode templates for testing | 1 | ;; test.srt --- SRecode templates for testing |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2008-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2008-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> | 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> |
| 6 | 6 | ||
diff --git a/etc/srecode/texi.srt b/etc/srecode/texi.srt index 8c4ee858e62..84cd9f42472 100644 --- a/etc/srecode/texi.srt +++ b/etc/srecode/texi.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;; texi.srt --- SRecode templates for Texinfo | 1 | ;; texi.srt --- SRecode templates for Texinfo |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2008-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2008-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> | 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> |
| 6 | 6 | ||
diff --git a/etc/srecode/wisent.srt b/etc/srecode/wisent.srt index 75ce5f6b7ab..18954af235c 100644 --- a/etc/srecode/wisent.srt +++ b/etc/srecode/wisent.srt | |||
| @@ -1,6 +1,6 @@ | |||
| 1 | ;; wisent.srt --- SRecode templates for Emacs/WISENT grammar files. | 1 | ;; wisent.srt --- SRecode templates for Emacs/WISENT grammar files. |
| 2 | 2 | ||
| 3 | ;; Copyright (C) 2007-2012 Free Software Foundation, Inc. | 3 | ;; Copyright (C) 2007-2013 Free Software Foundation, Inc. |
| 4 | 4 | ||
| 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> | 5 | ;; Author: Eric M. Ludlam <eric@siege-engine.com> |
| 6 | 6 | ||