From 45a536ed64c8b9177995aff60c74e3ec80ac463d Mon Sep 17 00:00:00 2001 From: Collin Doering Date: Mon, 27 Jun 2011 12:21:08 -0400 Subject: [PATCH] Added a new template for general scheme (kawa comes to mind); you'll see this in both .emacs and .emacs.d/templates/scheme-template.scm Also since the rkd-conf project now expects your config to diverge projects are now handeled per host with the possibility to still pull from the generic (although this is not clean); still looking into a way to diff between diverged git projects One way is to simply keep an updated copy of the rkd-conf generic so you can diff your diverged config against it like so: diff ~/path/to/you/conf/dir/target_diff_file path/to/rkd-conf/generic/target_diff_file ..you could make this a little nicer by writting a little script that does: cdiff => diff ~/path/to/you/conf/dir/ path/to/rkd-conf/generic/ where cdiff is the name of the script in this case. Sorry for the long commit message. --- .emacs | 1 + .emacs.d/templates/c-template.c | 23 +++++++++++++++++++++++ .emacs.d/templates/haskell-template.hs | 19 +++++++++++++++++++ .emacs.d/templates/python-template.py | 19 +++++++++++++++++++ .emacs.d/templates/racket-template.rkt | 21 +++++++++++++++++++++ .emacs.d/templates/scheme-template.scm | 19 +++++++++++++++++++ .emacs.d/templates/shell-template.sh | 21 +++++++++++++++++++++ 7 files changed, 123 insertions(+) create mode 100644 .emacs.d/templates/c-template.c create mode 100644 .emacs.d/templates/haskell-template.hs create mode 100644 .emacs.d/templates/python-template.py create mode 100644 .emacs.d/templates/racket-template.rkt create mode 100644 .emacs.d/templates/scheme-template.scm create mode 100644 .emacs.d/templates/shell-template.sh diff --git a/.emacs b/.emacs index 39a872c..67f3fda 100644 --- a/.emacs +++ b/.emacs @@ -251,6 +251,7 @@ ("\\.\(cc\|cpp\)$" . ["cpp-template.c" auto-update-generic-template]) ("\\.sh$" . ["shell-template.sh" auto-update-generic-template]) ("\\.rkt$" . ["racket-template.rkt" auto-update-generic-template]) + ("\\.scm$" . ["scheme-template.scm" auto-update-generic-template]) ("\\.hs$" . ["haskell-template.rkt" auto-update-generic-template]) ("\\.py$" . ["python-template.py" auto-update-generic-template]))) (setq auto-insert 'other) diff --git a/.emacs.d/templates/c-template.c b/.emacs.d/templates/c-template.c new file mode 100644 index 0000000..b544a40 --- /dev/null +++ b/.emacs.d/templates/c-template.c @@ -0,0 +1,23 @@ +/** + * (C) Copyright Collin Doering @!@YEAR@!@ + * + * This program 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. + * + * This program 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 this program. If not, see . +*/ + +/** + * File: @!@FILE@!@ + * Author: Collin J. Doering + * Date: @!@DATE@!@ + */ + diff --git a/.emacs.d/templates/haskell-template.hs b/.emacs.d/templates/haskell-template.hs new file mode 100644 index 0000000..4c841a8 --- /dev/null +++ b/.emacs.d/templates/haskell-template.hs @@ -0,0 +1,19 @@ +-- (C) Copyright Collin Doering @!@YEAR@!@ +-- +-- This program 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. +-- +-- This program 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 this program. If not, see . + +-- File: @!@FILE@!@ +-- Author: Collin J. Doering +-- Date: @!@DATE@!@ + diff --git a/.emacs.d/templates/python-template.py b/.emacs.d/templates/python-template.py new file mode 100644 index 0000000..0c076c1 --- /dev/null +++ b/.emacs.d/templates/python-template.py @@ -0,0 +1,19 @@ +# (C) Copyright Collin Doering @!@YEAR@!@ +# +# This program 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. +# +# This program 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 this program. If not, see . + +# File: @!@FILE@!@ +# Author: Collin J. Doering +# Date: @!@DATE@!@ + diff --git a/.emacs.d/templates/racket-template.rkt b/.emacs.d/templates/racket-template.rkt new file mode 100644 index 0000000..d0ef66f --- /dev/null +++ b/.emacs.d/templates/racket-template.rkt @@ -0,0 +1,21 @@ +#lang racket + +;; (C) Copyright Collin Doering @!@YEAR@!@ +;; +;; This program 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. +;; +;; This program 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 this program. If not, see . + +;; File: @!@FILE@!@ +;; Author: Collin J. Doering +;; Date: @!@DATE@!@ + diff --git a/.emacs.d/templates/scheme-template.scm b/.emacs.d/templates/scheme-template.scm new file mode 100644 index 0000000..1eb7deb --- /dev/null +++ b/.emacs.d/templates/scheme-template.scm @@ -0,0 +1,19 @@ +;; (C) Copyright Collin Doering @!@YEAR@!@ +;; +;; This program 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. +;; +;; This program 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 this program. If not, see . + +;; File: @!@FILE@!@ +;; Author: Collin J. Doering +;; Date: @!@DATE@!@ + diff --git a/.emacs.d/templates/shell-template.sh b/.emacs.d/templates/shell-template.sh new file mode 100644 index 0000000..c661c84 --- /dev/null +++ b/.emacs.d/templates/shell-template.sh @@ -0,0 +1,21 @@ +#!/bin/sh + +# (C) Copyright Collin Doering @!@YEAR@!@ +# +# This program 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. +# +# This program 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 this program. If not, see . + +# File: @!@FILE@!@ +# Author: Collin J. Doering +# Date: @!@DATE@!@ +