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

moved back ack support to prelude's core

Browse source
This commit is contained in:
Bozhidar Batsov 2012-04-19 11:35:17 +03:00
parent f9240dee49
commit 8c04091c97
3 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
init.el
View file

@ -1,9 +1,9 @@
;;; init.el --- Emacs Prelude: configuration entry point. ;;; init.el --- Prelude's configuration entry point.
;; ;;
;; Copyright (c) 2011 Bozhidar Batsov ;; Copyright (c) 2011 Bozhidar Batsov
;; ;;
;; Author: Bozhidar Batsov <bozhidar.batsov@gmail.com> ;; Author: Bozhidar Batsov <bozhidar@batsov.com>
;; URL: http://batsov.com/emacs-prelude ;; URL: http://batsov.com/prelude
;; Version: 1.0.0 ;; Version: 1.0.0
;; Keywords: convenience ;; Keywords: convenience
@ -32,8 +32,8 @@
;; Boston, MA 02110-1301, USA. ;; Boston, MA 02110-1301, USA.
;;; Code: ;;; Code:
(message "Emacs Prelude is powering up... Be patient, Master %s!"
(getenv "USER")) (message "Prelude is powering up... Be patient, Master %s!" (getenv "USER"))
(defvar prelude-dir (file-name-directory load-file-name) (defvar prelude-dir (file-name-directory load-file-name)
"The root dir of the Emacs Prelude distribution.") "The root dir of the Emacs Prelude distribution.")
@ -63,6 +63,7 @@ ELPA (or MELPA).")
(require 'prelude-global-keybindings) (require 'prelude-global-keybindings)
(require 'prelude-auto-install) (require 'prelude-auto-install)
;; OSX specific settings
(when (eq system-type 'darwin) (when (eq system-type 'darwin)
(require 'prelude-osx)) (require 'prelude-osx))
@ -73,7 +74,6 @@ ELPA (or MELPA).")
(when (file-exists-p prelude-personal-dir) (when (file-exists-p prelude-personal-dir)
(mapc 'load (directory-files prelude-personal-dir 't "^[^#].*el$"))) (mapc 'load (directory-files prelude-personal-dir 't "^[^#].*el$")))
(message "Emacs Prelude is ready to do thy bidding, Master %s!" (message "Prelude is ready to do thy bidding, Master %s!" (getenv "USER"))
(getenv "USER"))
;;; init.el ends here ;;; init.el ends here

5
prelude/prelude-editor.el
View file

@ -221,6 +221,11 @@
;; otherwise fallback to helm-mini ;; otherwise fallback to helm-mini
(helm-mini))) (helm-mini)))
;; shorter aliases for ack-and-a-half commands
(defalias 'ack 'ack-and-a-half)
(defalias 'ack-same 'ack-and-a-half-same)
(defalias 'ack-find-file 'ack-and-a-half-find-file)
(defalias 'ack-find-file-same 'ack-and-a-half-find-file-same)
;; dired - reuse current buffer by pressing 'a' ;; dired - reuse current buffer by pressing 'a'
(put 'dired-find-alternate-file 'disabled nil) (put 'dired-find-alternate-file 'disabled nil)

4
prelude/prelude-packages.el
View file

@ -41,8 +41,8 @@
(setq url-http-attempt-keepalives nil) (setq url-http-attempt-keepalives nil)
(defvar prelude-packages (defvar prelude-packages
'(melpa expand-region gist helm helm-projectile magit magithub '(ack-and-a-half expand-region gist helm helm-projectile magit magithub melpa
rainbow-mode volatile-highlights yasnippet zenburn-theme) rainbow-mode volatile-highlights yasnippet zenburn-theme)
"A list of packages to ensure are installed at launch.") "A list of packages to ensure are installed at launch.")
(defun prelude-packages-installed-p () (defun prelude-packages-installed-p ()