Permalink
Browse files

Update submodules, add gnuplot.

  • Loading branch information...
1 parent 4fb2f38 commit 57343157d7aa141cdb15d5a1e86ef70c2126438c @bretthoerner committed Feb 11, 2013
Showing with 18 additions and 7 deletions.
  1. +3 −0 .gitmodules
  2. +1 −0 gnuplot-mode
  3. +6 −0 init.el
  4. +1 −1 submodules/auto-complete
  5. +1 −1 submodules/deft
  6. +1 −1 submodules/evil
  7. +1 −1 submodules/geiser
  8. +1 −0 submodules/gnuplot-mode
  9. +1 −1 submodules/haskell-mode
  10. +1 −1 submodules/magit
  11. +1 −1 update-submodules.sh
View
@@ -76,3 +76,6 @@
[submodule "submodules/scala-mode2"]
path = submodules/scala-mode2
url = git://github.com/hvesalai/scala-mode2.git
+[submodule "submodules/gnuplot-mode"]
+ path = submodules/gnuplot-mode
+ url = git://github.com/bruceravel/gnuplot-mode.git
View
View
@@ -271,6 +271,12 @@ makes)."
;; goto-last-change
(require 'goto-last-change)
+;; gnuplot
+(add-to-list 'load-path (concat dotfiles-dir "gnuplot-mode"))
+(autoload 'gnuplot-mode "gnuplot" "gnuplot major mode" t)
+(autoload 'gnuplot-make-buffer "gnuplot" "open a buffer in gnuplot mode" t)
+(setq auto-mode-alist (append '(("\\.gp$" . gnuplot-mode)) auto-mode-alist))
+
;; haskell-mode
(load (concat dotfiles-dir "haskell-mode/haskell-site-file"))
(add-hook 'haskell-mode-hook 'turn-on-haskell-indentation)
Submodule deft updated from 7c2fde to ca2cb2
Submodule evil updated from 46e924 to d013dd
Submodule gnuplot-mode added at e1ee09
Submodule magit updated from 368edd to fd215c
View
@@ -1,3 +1,3 @@
#!/bin/bash
-git submodule foreach "pwd" | grep -v "^Entering" | xargs -n 1 -I {} -P 10 bash -c "cd {}; git checkout master; git fetch upstream; git rebase upstream/master; git push"
+git submodule foreach "pwd" | grep -v "^Entering" | xargs -n 1 -I {} -P 10 bash -c "cd {}; git checkout master; (git fetch -q upstream &> /dev/null && git rebase upstream/master && git push) || git pull"

0 comments on commit 5734315

Please sign in to comment.