jt/emacs-prelude
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of github.com:bbatsov/prelude

Browse source 
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
This commit is contained in:
Bozhidar Batsov 2013-05-19 22:14:55 +03:00
commit a463633f7f
2 changed files with 7 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
core/prelude-editor.el
View file

@ -381,6 +381,9 @@ indent yanked text (with prefix arg don't indent)."
(add-hook 'after-save-hook (add-hook 'after-save-hook
'executable-make-buffer-file-executable-if-script-p) 'executable-make-buffer-file-executable-if-script-p)
;; .zsh file is shell script too
(add-to-list 'auto-mode-alist '("\\.zsh\\'" . shell-script-mode))
;; whitespace-mode config ;; whitespace-mode config
(require 'whitespace) (require 'whitespace)
(setq whitespace-line-column 80) ;; limit line length (setq whitespace-line-column 80) ;; limit line length

4
core/prelude-packages.el
View file

@ -96,6 +96,7 @@ PACKAGE is installed only if not already present. The file is opened in MODE."
("\\.md\\'" markdown-mode markdown-mode) ("\\.md\\'" markdown-mode markdown-mode)
("\\.ml\\'" tuareg tuareg-mode) ("\\.ml\\'" tuareg tuareg-mode)
("\\.php\\'" php-mode php-mode) ("\\.php\\'" php-mode php-mode)
("PKGBUILD\\'" pkgbuild-mode pkgbuild-mode)
("\\.sass\\'" sass-mode sass-mode) ("\\.sass\\'" sass-mode sass-mode)
("\\.scala\\'" scala-mode2 scala-mode) ("\\.scala\\'" scala-mode2 scala-mode)
("\\.scss\\'" scss-mode scss-mode) ("\\.scss\\'" scss-mode scss-mode)
@ -109,6 +110,9 @@ PACKAGE is installed only if not already present. The file is opened in MODE."
(add-to-list 'auto-mode-alist '("\\.markdown\\'" . markdown-mode)) (add-to-list 'auto-mode-alist '("\\.markdown\\'" . markdown-mode))
(add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode))) (add-to-list 'auto-mode-alist '("\\.md\\'" . markdown-mode)))
(when (package-installed-p 'pkgbuild-mode)
(add-to-list 'auto-mode-alist '("PKGBUILD\\'" . pkgbuild-mode)))
;; build auto-install mappings ;; build auto-install mappings
(mapc (mapc
(lambda (entry) (lambda (entry)