Skip to content
Browse files

Merged origin/master

  • Loading branch information...
1 parent 5bbdb47 commit 63ac5fcd892b4e76f2ed5deef2592f2d84ae1fd2 @tototoshi committed Jun 24, 2012
Showing with 3 additions and 1 deletion.
  1. +1 −0 my-init.el
  2. +2 −1 my-sh-mode-config.el
View
1 my-init.el
@@ -65,4 +65,5 @@
(require 'my-java-config)
(require 'testswitch)
;;(require 'my-ruby-config)
+;; (require 'my-ruby-config)
(autoload 'hideshowvis-enable "hideshowvis" "Highlight foldable regions")
View
3 my-sh-mode-config.el
@@ -1,4 +1,5 @@
(push '("zshrc" . shell-script-mode) auto-mode-alist)
+(setq auto-mode-alist (cons '("\\zshrc" . sh-mode) auto-mode-alist))
(add-hook 'sh-mode-hook
(lambda ()
@@ -8,4 +9,4 @@
(define-key sh-mode-map "[" 'electric-pair)
(define-key sh-mode-map "{" 'electric-pair)))
-(provide 'my-sh-mode-config)
+(provide 'my-sh-mode-config)

0 comments on commit 63ac5fc

Please sign in to comment.
Something went wrong with that request. Please try again.