From a8d47d4e76dcc073f199c6fdb51a7744060ef3ae Mon Sep 17 00:00:00 2001 From: syl20bnr Date: Wed, 19 Dec 2012 22:55:46 -0500 Subject: [PATCH] added python-for-emacs and separated global config --- .gitignore | 2 +- config/global.el | 40 ++++++++++++++++++++++++++++++ emacs-for-python | 1 + init.el | 42 -------------------------------- my-package-init/init-eproject.el | 14 ----------- my-package-init/init-pymacs.el | 2 -- my-packages.el | 1 - 7 files changed, 42 insertions(+), 60 deletions(-) create mode 100644 config/global.el create mode 160000 emacs-for-python delete mode 100644 my-package-init/init-eproject.el delete mode 100644 my-package-init/init-pymacs.el diff --git a/.gitignore b/.gitignore index b23627ac2..a7ee238a2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ auto-save-list/ elpa/ -emacs-for-python/ ac-comphist.dat +eproject.lst diff --git a/config/global.el b/config/global.el new file mode 100644 index 000000000..30b560963 --- /dev/null +++ b/config/global.el @@ -0,0 +1,40 @@ +;; font size +(set-face-attribute 'default nil :height 110) +;; number colon mode +(global-linum-mode t) +;; full screen +(tool-bar-mode -1) +(menu-bar-mode -1) +(scroll-bar-mode -1) +(fringe-mode 0) +;; no blink +(blink-cursor-mode (- (*) (*) (*))) +;; save session + (desktop-save-mode 1) +;; tool tips in echo area +(tooltip-mode -1) +(setq tooltip-use-echo-area t) +;; whitespace-mode +(setq-default show-trailing-whitespace nil) +;; Inhibit startup message +(setq inhibit-startup-message t + inhibit-startup-echo-area-message t) +(setq initial-scratch-message "") +;; Do not make backup files +(setq make-backup-files nil) +;; When emacs asks for "yes" or "no", let "y" or "n" sufficide +(fset 'yes-or-no-p 'y-or-n-p) +;; Show column number in mode line +(setq column-number-mode t) +;; When point is on paranthesis, highlight the matching one +(show-paren-mode t) +;; auto-save +(add-hook 'before-save-hook (lambda () (delete-trailing-whitespace))) +(setq redisplay-dont-pause t) +;; use only spaces and no tabs +(setq-default indent-tabs-mode nil) +(setq default-tab-width 4) +;; move focus to newly split window +(defadvice split-window (after move-point-to-new-window activate) + "Moves the point to the newly created window after splitting." + (other-window 1)) diff --git a/emacs-for-python b/emacs-for-python new file mode 160000 index 000000000..08012bc1d --- /dev/null +++ b/emacs-for-python @@ -0,0 +1 @@ +Subproject commit 08012bc1db1259648ebda3b8b9b4f711db367bfe diff --git a/init.el b/init.el index b7b88efb4..c251f5194 100644 --- a/init.el +++ b/init.el @@ -11,48 +11,6 @@ (add-to-list 'load-path user-emacs-directory) -;; Global config =============================================================== -;; font size -(set-face-attribute 'default nil :height 110) -;; number colon mode -(global-linum-mode t) -;; full screen -(tool-bar-mode -1) -(menu-bar-mode -1) -(scroll-bar-mode -1) -(fringe-mode 0) -;; no blink -(blink-cursor-mode (- (*) (*) (*))) -;; save session - (desktop-save-mode 1) -;; tool tips in echo area -(tooltip-mode -1) -(setq tooltip-use-echo-area t) -;; whitespace-mode -(setq-default show-trailing-whitespace nil) -;; Inhibit startup message -(setq inhibit-startup-message t - inhibit-startup-echo-area-message t) -(setq initial-scratch-message "") -;; Do not make backup files -(setq make-backup-files nil) -;; When emacs asks for "yes" or "no", let "y" or "n" sufficide -(fset 'yes-or-no-p 'y-or-n-p) -;; Show column number in mode line -(setq column-number-mode t) -;; When point is on paranthesis, highlight the matching one -(show-paren-mode t) -;; auto-save -(add-hook 'before-save-hook (lambda () (delete-trailing-whitespace))) -(setq redisplay-dont-pause t) -;; use only spaces and no tabs -(setq-default indent-tabs-mode nil) -(setq default-tab-width 4) -;; move focus to newly split window -(defadvice split-window (after move-point-to-new-window activate) - "Moves the point to the newly created window after splitting." - (other-window 1)) - ;; Config files ================================================================ (progn (setq user-emacs-config-dir (concat user-emacs-directory "config/")) diff --git a/my-package-init/init-eproject.el b/my-package-init/init-eproject.el deleted file mode 100644 index 8924466d7..000000000 --- a/my-package-init/init-eproject.el +++ /dev/null @@ -1,14 +0,0 @@ -(require 'eproject) -(require 'eproject-extras) - -(define-project-type python (generic) - (look-for "dummy_dummy") - :relevant-files ("\\.py$") - :irrevelant-files ("\\.pyc$")) - -(define-project-type Wrappy (python) (look-for "wrappy.py")) -(define-project-type Mappy (python) (look-for "mappy.py")) - -(require 'eproject-anything) -(global-set-key (kbd "s-L") 'anything-eproject-files) -(global-set-key (kbd "s-b") 'anything-eproject-buffers) diff --git a/my-package-init/init-pymacs.el b/my-package-init/init-pymacs.el deleted file mode 100644 index 3c47575ce..000000000 --- a/my-package-init/init-pymacs.el +++ /dev/null @@ -1,2 +0,0 @@ -(pymacs-load "ropemacs" "rope-") -(setq ropemacs-enable-autoimport t) diff --git a/my-packages.el b/my-packages.el index f661ac42e..1eb436196 100644 --- a/my-packages.el +++ b/my-packages.el @@ -9,7 +9,6 @@ (defvar z:my-packages '( ace-jump-mode - eproject erlang evil fill-column-indicator