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-04-30 23:40:15 +03:00
commit 72294d1e70
2 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/prelude-packages.el
View file

@ -80,8 +80,12 @@ PACKAGE is installed only if not already present. The file is opened in MODE."
'(("\\.clj\\'" clojure-mode clojure-mode) '(("\\.clj\\'" clojure-mode clojure-mode)
("\\.coffee\\'" coffee-mode coffee-mode) ("\\.coffee\\'" coffee-mode coffee-mode)
("\\.css\\'" css-mode css-mode) ("\\.css\\'" css-mode css-mode)
("\\.csv\\'" csv-mode csv-mode)
("\\.d\\'" d-mode d-mode)
("\\.dart\\'" dart-mode dart-mode)
("\\.erl\\'" erlang erlang-mode) ("\\.erl\\'" erlang erlang-mode)
("\\.feature\\'" feature-mode feature-mode) ("\\.feature\\'" feature-mode feature-mode)
("\\.go\\'" go-mode go-mode)
("\\.groovy\\'" groovy-mode groovy-mode) ("\\.groovy\\'" groovy-mode groovy-mode)
("\\.haml\\'" haml-mode haml-mode) ("\\.haml\\'" haml-mode haml-mode)
("\\.hs\\'" haskell-mode haskell-mode) ("\\.hs\\'" haskell-mode haskell-mode)
@ -90,11 +94,13 @@ PACKAGE is installed only if not already present. The file is opened in MODE."
("\\.lua\\'" lua-mode lua-mode) ("\\.lua\\'" lua-mode lua-mode)
("\\.markdown\\'" markdown-mode markdown-mode) ("\\.markdown\\'" markdown-mode markdown-mode)
("\\.md\\'" markdown-mode markdown-mode) ("\\.md\\'" markdown-mode markdown-mode)
("\\.ml\\'" tuareg tuareg-mode)
("\\.php\\'" php-mode php-mode) ("\\.php\\'" php-mode php-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)
("\\.slim\\'" slim-mode slim-mode) ("\\.slim\\'" slim-mode slim-mode)
("\\.textile\\'" textile-mode textile-mode)
("\\.yml\\'" yaml-mode yaml-mode))) ("\\.yml\\'" yaml-mode yaml-mode)))
;; markdown-mode doesn't have autoloads for the auto-mode-alist ;; markdown-mode doesn't have autoloads for the auto-mode-alist

2
modules/prelude-programming.el
View file

@ -97,7 +97,7 @@
;; show the name of the current function definition in the modeline ;; show the name of the current function definition in the modeline
(require 'which-func) (require 'which-func)
(setq which-func-modes t) (add-to-list 'which-func-modes 'ruby-mode)
(which-function-mode 1) (which-function-mode 1)
;; in Emacs 24 programming major modes generally derive from a common ;; in Emacs 24 programming major modes generally derive from a common