Permalink
Browse files

disabling cedet and ecb for compatability with emacs23. I wasn't real…

…ly using ecb that much anyway. This speeds up the start up of emacs too.
  • Loading branch information...
ldeck committed Apr 27, 2012
1 parent 7504726 commit 97860cdb91434a6004868773a816312be69d66c6
View
@@ -40,7 +40,7 @@
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
- '(ecb-auto-activate t)
+ '(ecb-auto-activate f)
'(ecb-excluded-directories-regexps (quote ("^\\.\\(DocumentRevisions\\|Spotlight\\)-V100$"
"^\\.Trashes$"
"^\\(CVS\\|TAGS\\)$"
@@ -45,6 +45,19 @@
;; jdee
;; rdebug / ruby-debug?
+
+;; sources disabled
+;; cedet/ecb was working with emacs24,
+;; but emacs24 has some different behaviour which effects ensime
+;; ------
+(setq el-get-sources-disabled
+ '((:name cedet)
+ (:name ecb
+ :type git
+ :url "git://github.com/emacsmirror/ecb.git"
+ :load "ecb.el"))
+ )
+
;; define custom recipes
(setq el-get-sources
'((:name ahg)
@@ -62,10 +75,6 @@
(progn
(require 'zenburn)
(zenburn))))
- (:name ecb
- :type git
- :url "git://github.com/emacsmirror/ecb.git"
- :load "ecb.el")
(:name elisp-slime-nav
:type elpa)
(:name el-get
@@ -39,5 +39,5 @@
;; line separated
;;
(defconst msk-preferred-packages
- '(cedet)
+ '()
"My required packages for launch.")
@@ -110,8 +110,8 @@ This function will not push the deleted text onto the kill ring"
(global-set-key (kbd "M-d") 'msk-delete-word-forward)
(global-set-key (kbd "M-DEL") 'msk-delete-word-backward)
-(global-set-key (kbd "C-k") 'msk-delete-line-forward)
-(global-set-key (kbd "C-c C-k") 'msk-delete-line-backward)
+(global-set-key (kbd "C-M-k") 'msk-delete-line-forward)
+(global-set-key (kbd "C-c C-M-k") 'msk-delete-line-backward)
;; Clipboard interaction
;; ---------------------
@@ -0,0 +1,39 @@
+;;; msk-file-settings.el --- as the name implies
+;;
+;; Copyright (c) 2011 Lachlan Deck and contributors
+;;
+;; Author: Lachlan Deck <lachlan.deck@gmail.com>
+;; URL: http://github.com/ldeck/my-starter-kit
+;; Version: 1.0
+;; Keywords: convenience
+
+;; This file is not part of GNU Emacs.
+
+;;; Commentary:
+
+;; File type settings
+
+;;; License:
+
+;; 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 GNU Emacs; see the file COPYING. If not, write to the
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
+
+;;; Code:
+(provide 'msk-file-settings)
+
+(eval-after-load 'find-file-in-project
+ '(progn
+ (add-to-list 'ffip-patterns "*.scala")
+ (add-to-list 'ffip-patterns "*.props")))

0 comments on commit 97860cd

Please sign in to comment.