diff --git a/init.el b/init.el index b7bf90f..d4cd88b 100644 --- a/init.el +++ b/init.el @@ -1,9 +1,9 @@ -;;; init.el --- Emacs Prelude: configuration entry point. +;;; init.el --- Prelude's configuration entry point. ;; ;; Copyright (c) 2011 Bozhidar Batsov ;; -;; Author: Bozhidar Batsov -;; URL: http://batsov.com/emacs-prelude +;; Author: Bozhidar Batsov +;; URL: http://batsov.com/prelude ;; Version: 1.0.0 ;; Keywords: convenience @@ -32,8 +32,8 @@ ;; Boston, MA 02110-1301, USA. ;;; 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) "The root dir of the Emacs Prelude distribution.") @@ -63,6 +63,7 @@ ELPA (or MELPA).") (require 'prelude-global-keybindings) (require 'prelude-auto-install) +;; OSX specific settings (when (eq system-type 'darwin) (require 'prelude-osx)) @@ -73,7 +74,6 @@ ELPA (or MELPA).") (when (file-exists-p prelude-personal-dir) (mapc 'load (directory-files prelude-personal-dir 't "^[^#].*el$"))) -(message "Emacs Prelude is ready to do thy bidding, Master %s!" - (getenv "USER")) +(message "Prelude is ready to do thy bidding, Master %s!" (getenv "USER")) ;;; init.el ends here diff --git a/prelude/prelude-editor.el b/prelude/prelude-editor.el index e916d2a..d497a2f 100644 --- a/prelude/prelude-editor.el +++ b/prelude/prelude-editor.el @@ -221,6 +221,11 @@ ;; otherwise fallback to 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' (put 'dired-find-alternate-file 'disabled nil) diff --git a/prelude/prelude-packages.el b/prelude/prelude-packages.el index 54656de..9ae6dc1 100644 --- a/prelude/prelude-packages.el +++ b/prelude/prelude-packages.el @@ -41,8 +41,8 @@ (setq url-http-attempt-keepalives nil) (defvar prelude-packages - '(melpa expand-region gist helm helm-projectile magit magithub - rainbow-mode volatile-highlights yasnippet zenburn-theme) + '(ack-and-a-half expand-region gist helm helm-projectile magit magithub melpa + rainbow-mode volatile-highlights yasnippet zenburn-theme) "A list of packages to ensure are installed at launch.") (defun prelude-packages-installed-p ()