diff options
| author |  Tom Willemsen | 2012-09-11 10:32:30 +0200 |
|---|---|---|
| committer | Tom Willemsen | 2012-09-11 10:32:30 +0200 |
| commit | 71b21beaa692ad601ed59e756c87d9a083e05172 (patch) | |
| tree | a6b35c23c9e47eabbfd94b20bb404188b65b40cb | |
| parent | e4348644d01df12cf9417332441ab2f81996a9dd (diff) | |
| download | dotfiles-71b21beaa692ad601ed59e756c87d9a083e05172.tar.gz dotfiles-71b21beaa692ad601ed59e756c87d9a083e05172.zip | |
Move Emacs config
| -rw-r--r-- | .emacs.d/eshell/alias (renamed from emacs/eshell/alias) | 0 | ||||
| -rw-r--r-- | .emacs.d/gnus.el (renamed from emacs/gnus.el) | 4 | ||||
| -rw-r--r-- | .emacs.d/init.el (renamed from emacs/init.el) | 2 | ||||
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | emacs/Makefile | 24 | ||||
| -rw-r--r-- | emacs/eshell/Makefile | 6 |
6 files changed, 2 insertions, 36 deletions
diff --git a/emacs/eshell/alias b/.emacs.d/eshell/alias index 940108a..940108a 100644 --- a/emacs/eshell/alias +++ b/.emacs.d/eshell/alias diff --git a/emacs/gnus.el b/.emacs.d/gnus.el index 1f629b5..1bf988a 100644 --- a/emacs/gnus.el +++ b/.emacs.d/gnus.el @@ -68,7 +68,3 @@ (bbdb-initialize 'gnus 'message) (bbdb-insinuate-gnus) (setq bbdb-north-american-phone-numbers-p nil) - -;; Local Variables: -;; no-update-autoloads: t -;; End: diff --git a/emacs/init.el b/.emacs.d/init.el index 41765af..6957cd5 100644 --- a/emacs/init.el +++ b/.emacs.d/init.el @@ -812,6 +812,7 @@ for easy selection." (setq gtags-auto-update t) (setq help-at-pt-display-when-idle t) (setq ido-auto-merge-delay-time 1000000) +(setq ido-default-buffer-method 'selected-window) (setq ido-max-window-height 1) (setq ido-save-directory-list-file nil) (setq ido-ubiquitous-exceptions '(tmm-prompt)) @@ -1044,6 +1045,7 @@ for easy selection." (electric-indent-mode) (electric-pair-mode) (ido-mode) +(ido-ubiquitous) (savehist-mode) (show-paren-mode) (auto-insert-mode) @@ -28,7 +28,6 @@ .dmenu_cache .dvdcss/ .easytag/ -.emass.d/ .emacs-jabber/ .face .filezilla/ @@ -101,7 +100,6 @@ var/ xhtml-loader.rnc .unison/ .pencil/ -.emacs.d/ .cuyo .lgames .beetsmusic.blb diff --git a/emacs/Makefile b/emacs/Makefile deleted file mode 100644 index 51a55a4..0000000 --- a/emacs/Makefile +++ /dev/null @@ -1,24 +0,0 @@ -EMACS = emacs - -files = init.el init.elc -install-files = $(addprefix install-,$(files)) -submodules = eshell -install-submodules = $(addprefix install-,$(submodules)) - -.PHONY: all $(submodules) install $(install-submodules) $(install-files) - -all: $(files) $(submodules) - -$(submodules): - $(MAKE) -C $@/ - -$(filter %.elc,$(files)): %.elc: %.el - $(EMACS) -batch -eval "(byte-compile-file \"$^\")" - -install: $(install-files) $(install-submodules) - -$(install-files): install-%: $* - install -Dm 444 $* ${HOME}/.emacs.d/$* - -$(install-submodules): install-%: - $(MAKE) -C $*/ install diff --git a/emacs/eshell/Makefile b/emacs/eshell/Makefile deleted file mode 100644 index a28a794..0000000 --- a/emacs/eshell/Makefile +++ /dev/null @@ -1,6 +0,0 @@ -.PHONY: all install - -all: - -install: - install -Dm 444 alias ${HOME}/.emacs.d/eshell/alias |