Merge branch 'master' of https://github.com/bbatsov/prelude

* 'master' of https://github.com/bbatsov/prelude:
  Use sbcl in the absence of ccl on OS X
  Add tip on keyboard shortcut for ace-jump-mode
  Auto install cmake-mode
  Enable ERC spell mode only if prelude-flyspell
  Add tip on keyboard shortcut to open recent file
  Add Prelude tip on keyboard shortcut to join lines
  Added Gitter badge
  Update copyright years
  Kill some tabs
  [Fix bbatsov#813] Add missing smartrep require

README.md

@@ -4,6 +4,8 @@
 Emacs Prelude
 =============
 
+[![Join the chat at https://gitter.im/bbatsov/prelude](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/bbatsov/prelude?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+
 Prelude is an Emacs distribution that aims to enhance the default
 Emacs experience.  Prelude alters a lot of the default settings,
 bundles a plethora of additional packages and adds its own core
@@ -20,41 +22,41 @@ advised to always run Prelude with the latest Emacs - currently
 - [Fast Forward](#fast-forward)
 - [Installing Emacs 24](#installing-emacs-24)
 - [Installation](#installation)
-	- [Automated](#automated)
-		- [Via Curl](#via-curl)
-		- [Via Wget](#via-wget)
-	- [Manual](#manual)
+    - [Automated](#automated)
+        - [Via Curl](#via-curl)
+        - [Via Wget](#via-wget)
+    - [Manual](#manual)
 - [Updating Prelude](#updating-prelude)
-	- [Manual update](#manual-update)
-		- [Update all bundled packages](#update-all-bundled-packages)
-		- [Update Prelude's code](#update-preludes-code)
-		- [Restart Prelude](#restart-prelude)
-	- [Automatic update](#automatic-update)
+    - [Manual update](#manual-update)
+        - [Update all bundled packages](#update-all-bundled-packages)
+        - [Update Prelude's code](#update-preludes-code)
+        - [Restart Prelude](#restart-prelude)
+    - [Automatic update](#automatic-update)
 - [Enabling additional modules](#enabling-additional-modules)
 - [Running](#running)
 - [Getting to know Prelude](#getting-to-know-prelude)
-	- [Keymap](#keymap)
-		- [Global](#global)
-		- [Prelude Mode](#prelude-mode)
-		- [OSX modifier keys](#osx-modifier-keys)
-		- [Projectile](#projectile)
-		- [Helm](#helm)
-		- [Key-chords](#key-chords)
-			- [Disabling key-chords](#disabling-key-chords)
+    - [Keymap](#keymap)
+        - [Global](#global)
+        - [Prelude Mode](#prelude-mode)
+        - [OSX modifier keys](#osx-modifier-keys)
+        - [Projectile](#projectile)
+        - [Helm](#helm)
+        - [Key-chords](#key-chords)
+            - [Disabling key-chords](#disabling-key-chords)
 - [Automatic package installation](#automatic-package-installation)
-	- [Color Themes](#color-themes)
-	- [Personalizing](#personalizing)
-		- [Disabling whitespace-mode](#disabling-whitespace-mode)
-		- [Disable flyspell-mode](#disable-flyspell-mode)
+    - [Color Themes](#color-themes)
+    - [Personalizing](#personalizing)
+        - [Disabling whitespace-mode](#disabling-whitespace-mode)
+        - [Disable flyspell-mode](#disable-flyspell-mode)
 - [Caveats & Pitfalls](#caveats--pitfalls)
-	- [Updating bundled packages](#updating-bundled-packages)
-	- [Problems with flyspell-mode](#problems-with-flyspell-mode)
-	- [Ugly colors in the terminal Emacs version](#ugly-colors-in-the-terminal-emacs-version)
-	- [MELPA error on initial startup](#melpa-error-on-initial-startup)
-	- [Warnings on arrow navigation in editor buffers](#warnings-on-navigation-in-editor-buffers)
-	- [Customized C-a behavior](#customized-c-a-behavior)
-	- [Poor ido matching performance on large datasets](#poor-ido-matching-performance-on-large-datasets)
-	- [Windows compatibility](#windows-compatibility)
+    - [Updating bundled packages](#updating-bundled-packages)
+    - [Problems with flyspell-mode](#problems-with-flyspell-mode)
+    - [Ugly colors in the terminal Emacs version](#ugly-colors-in-the-terminal-emacs-version)
+    - [MELPA error on initial startup](#melpa-error-on-initial-startup)
+    - [Warnings on arrow navigation in editor buffers](#warnings-on-navigation-in-editor-buffers)
+    - [Customized C-a behavior](#customized-c-a-behavior)
+    - [Poor ido matching performance on large datasets](#poor-ido-matching-performance-on-large-datasets)
+    - [Windows compatibility](#windows-compatibility)
 - [Known issues](#known-issues)
 - [Support](#support)
 - [Contributors](#contributors)

core/prelude-core.el

@@ -1,6 +1,6 @@
 ;;; prelude-core.el --- Emacs Prelude: Core Prelude functions.
 ;;
-;; Copyright © 2011-2014 Bozhidar Batsov
+;; Copyright © 2011-2015 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude
@@ -374,6 +374,7 @@ Doesn't mess with special buffers."
 (defvar prelude-tips
   '("Press <C-c o> to open a file with external program."
     "Press <C-c p f> to navigate a project's files with ido."
+    "Press <s-r> to open a recently visited file."
     "Press <C-c p s g> to run grep on a project."
     "Press <C-c p p> to switch between projects."
     "Press <C-=> to expand the selected region."
@@ -392,6 +393,8 @@ Doesn't mess with special buffers."
     "Press <C-c C-z> in a Elisp buffer to launch an interactive Elisp shell."
     "Press <C-Backspace> to kill a line backwards."
     "Press <C-S-Backspace> or <s-k> to kill the whole line."
+    "Press <s-j> or <C-^> to join lines."
+    "Press <s-.> or <C-c j> to jump to the start of a word in any visible window."
     "Press <f11> to toggle fullscreen mode."
     "Press <f12> to toggle the menu bar."
     "Explore the Tools->Prelude menu to find out about some of Prelude extensions to Emacs."

core/prelude-custom.el

@@ -1,6 +1,6 @@
 ;;; prelude-custom.el --- Emacs Prelude: Prelude's customizable variables.
 ;;
-;; Copyright © 2011-2014 Bozhidar Batsov
+;; Copyright © 2011-2015 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

core/prelude-editor.el

@@ -1,6 +1,6 @@
 ;;; prelude-editor.el --- Emacs Prelude: enhanced core editing experience.
 ;;
-;; Copyright © 2011-2014 Bozhidar Batsov
+;; Copyright © 2011-2015 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude
@@ -392,6 +392,8 @@ indent yanked text (with prefix arg don't indent)."
 
 ;; operate-on-number
 (require 'operate-on-number)
+(require 'smartrep)
+
 (smartrep-define-key global-map "C-c ."
   '(("+" . apply-operation-to-number-at-point)
     ("-" . apply-operation-to-number-at-point)

core/prelude-global-keybindings.el

@@ -1,6 +1,6 @@
 ;;; prelude-global-keybindings.el --- Emacs Prelude: some useful keybindings.
 ;;
-;; Copyright © 2011-2014 Bozhidar Batsov
+;; Copyright © 2011-2015 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

core/prelude-mode.el

@@ -1,6 +1,6 @@
 ;;; prelude-mode.el --- Emacs Prelude: minor mode
 ;;
-;; Copyright © 2011-2014 Bozhidar Batsov
+;; Copyright © 2011-2015 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

core/prelude-osx.el

@@ -1,6 +1,6 @@
 ;;; prelude-osx.el --- Emacs Prelude: OSX specific settings.
 ;;
-;; Copyright © 2011-2014 Bozhidar Batsov
+;; Copyright © 2011-2015 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

core/prelude-packages.el

@@ -1,6 +1,6 @@
 ;;; prelude-packages.el --- Emacs Prelude: default package selection.
 ;;
-;; Copyright © 2011-2014 Bozhidar Batsov
+;; Copyright © 2011-2015 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude
@@ -127,6 +127,8 @@ PACKAGE is installed only if not already present.  The file is opened in MODE."
 
 (defvar prelude-auto-install-alist
   '(("\\.clj\\'" clojure-mode clojure-mode)
+    ("\\.cmake\\'" cmake-mode cmake-mode)
+    ("CMakeLists\\.txt\\'" cmake-mode cmake-mode)
     ("\\.coffee\\'" coffee-mode coffee-mode)
     ("\\.css\\'" css-mode css-mode)
     ("\\.csv\\'" csv-mode csv-mode)

core/prelude-ui.el

@@ -1,6 +1,6 @@
 ;;; prelude-ui.el --- Emacs Prelude: UI optimizations and tweaks.
 ;;
-;; Copyright © 2011-2014 Bozhidar Batsov
+;; Copyright © 2011-2015 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

modules/prelude-c.el

@@ -1,6 +1,6 @@
 ;;; prelude-c.el --- Emacs Prelude: cc-mode configuration.
 ;;
-;; Copyright © 2011-2014 Bozhidar Batsov
+;; Copyright © 2011-2015 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

modules/prelude-clojure.el

@@ -1,6 +1,6 @@
 ;;; prelude-clojure.el --- Emacs Prelude: Clojure programming configuration.
 ;;
-;; Copyright © 2011-2014 Bozhidar Batsov
+;; Copyright © 2011-2015 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: http://batsov.com/prelude

modules/prelude-coffee.el

@@ -1,6 +1,6 @@
 ;;; prelude-coffee.el --- Emacs Prelude: CoffeeScript programming support.
 ;;
-;; Copyright © 2011-2014 Bozhidar Batsov
+;; Copyright © 2011-2015 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

modules/prelude-common-lisp.el

@@ -1,6 +1,6 @@
 ;;; prelude-common-lisp.el --- Emacs Prelude: lisp-mode and SLIME config.
 ;;
-;; Copyright © 2011-2014 Bozhidar Batsov
+;; Copyright © 2011-2015 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude
@@ -54,7 +54,8 @@
         (sbcl ("sbcl" "--noinform") :coding-system utf-8-unix)))
 
 ;; select the default value from slime-lisp-implementations
-(if (eq system-type 'darwin)
+(if (and (eq system-type 'darwin)
+         (executable-find "ccl"))
     ;; default to Clozure CL on OS X
     (setq slime-default-lisp 'ccl)
   ;; default to SBCL on Linux and Windows

modules/prelude-company.el

@@ -1,6 +1,6 @@
 ;;; prelude-company.el --- company-mode setup
 ;;
-;; Copyright © 2011-2014 Bozhidar Batsov
+;; Copyright © 2011-2015 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

modules/prelude-css.el

@@ -1,6 +1,6 @@
 ;;; prelude-css.el --- Emacs Prelude: css support
 ;;
-;; Copyright © 2011-2014 Bozhidar Batsov
+;; Copyright © 2011-2015 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: http://www.batsov.com/emacs-prelude

modules/prelude-elixir.el

@@ -1,6 +1,6 @@
 ;;; prelude-elixir.el --- Emacs Prelude: Elixir programming support.
 ;;
-;; Copyright © 2014 Samuel Tonini
+;; Copyright © 2014-2015 Samuel Tonini
 ;;
 ;; Author: Samuel Tonini <[email protected]>
 ;; Version: 1.0.0

modules/prelude-emacs-lisp.el

@@ -1,6 +1,6 @@
 ;;; prelude-emacs-lisp.el --- Emacs Prelude: Nice config for Elisp programming.
 ;;
-;; Copyright © 2011-2014 Bozhidar Batsov
+;; Copyright © 2011-2015 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

modules/prelude-erc.el

@@ -1,6 +1,6 @@
 ;;; prelude-erc.el --- Emacs Prelude: ERC mode configuration.
 ;;
-;; Copyright © 2011-2014 Bozhidar Batsov
+;; Copyright © 2011-2015 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude
@@ -74,7 +74,8 @@
 (erc-truncate-mode +1)
 
 ;; enable spell checking
-(erc-spelling-mode 1)
+(when prelude-flyspell
+  (erc-spelling-mode 1))
 ;; set different dictionaries by different servers/channels
 ;;(setq erc-spelling-dictionaries '(("#emacs" "american")))
 

modules/prelude-erlang.el

@@ -1,6 +1,6 @@
 ;;; prelude-erlang.el --- Emacs Prelude: Erlang programming support.
 ;;
-;; Copyright © 2011-2014 Gleb Peregud
+;; Copyright © 2011-2015 Gleb Peregud
 ;;
 ;; Author: Gleb Peregud <[email protected]>
 ;; Version: 1.0.0

modules/prelude-evil.el

@@ -1,6 +1,6 @@
 ;;; prelude-evil.el --- Emacs Prelude: evil-mode configuration.
 ;;
-;; Copyright © 2011-2014 Bozhidar Batsov
+;; Copyright © 2011-2015 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: http://batsov.com/prelude

modules/prelude-haskell.el

@@ -1,6 +1,6 @@
 ;;; prelude-haskell.el --- Emacs Prelude: Nice config for Haskell programming.
 ;;
-;; Copyright © 2011-2014 Bozhidar Batsov
+;; Copyright © 2011-2015 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

modules/prelude-helm-everywhere.el

@@ -1,6 +1,6 @@
 ;;; prelude-helm-everywhere.el --- Enable Helm everywhere
 ;;
-;; Copyright © 2014 Tu, Do Hoang
+;; Copyright © 2014-2015 Tu, Do Hoang
 ;;
 ;; Author: Tu, Do Hoang ([email protected])
 ;; URL: https://github.com/bbatsov/prelude

modules/prelude-helm.el

@@ -1,6 +1,6 @@
 ;;; prelude-helm.el --- Helm setup
 ;;
-;; Copyright © 2011-2014 Bozhidar Batsov
+;; Copyright © 2011-2015 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

modules/prelude-ido.el

@@ -1,6 +1,6 @@
 ;;; prelude-ido.el --- Ido setup
 ;;
-;; Copyright © 2011-2014 Bozhidar Batsov
+;; Copyright © 2011-2015 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

modules/prelude-js.el

@@ -1,6 +1,6 @@
 ;;; prelude-js.el --- Emacs Prelude: js-mode configuration.
 ;;
-;; Copyright © 2011-2014 Bozhidar Batsov
+;; Copyright © 2011-2015 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

modules/prelude-key-chord.el

@@ -1,6 +1,6 @@
 ;;; prelude-key-chord.el --- Key chord setup
 ;;
-;; Copyright © 2011-2014 Bozhidar Batsov
+;; Copyright © 2011-2015 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

modules/prelude-latex.el

@@ -1,6 +1,6 @@
 ;;; prelude-latex.el --- Emacs Prelude: Sane setup for LaTeX writers.
 ;;
-;; Copyright © 2011-2014 Bozhidar Batsov
+;; Copyright © 2011-2015 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

modules/prelude-lisp.el

@@ -1,6 +1,6 @@
 ;;; prelude-lisp.el --- Emacs Prelude: Configuration common to all lisp modes.
 ;;
-;; Copyright © 2011-2014 Bozhidar Batsov
+;; Copyright © 2011-2015 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

modules/prelude-mediawiki.el

@@ -1,6 +1,6 @@
 ;;; prelude-mediawiki.el --- Emacs Prelude: mediawiki editing config
 ;;
-;; Copyright © 2011-2014 Bozhidar Batsov
+;; Copyright © 2011-2015 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

modules/prelude-ocaml.el

@@ -1,6 +1,6 @@
 ;;; prelude-ocaml.el --- Emacs Prelude: decent Perl coding settings.
 ;;
-;; Copyright © 2014 Geoff Shannon
+;; Copyright © 2014-2015 Geoff Shannon
 ;;
 ;; Author: Geoff Shannon <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

modules/prelude-org.el

@@ -1,6 +1,6 @@
 ;;; prelude-org.el --- Emacs Prelude: org-mode configuration.
 ;;
-;; Copyright © 2011-2014 Bozhidar Batsov
+;; Copyright © 2011-2015 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

modules/prelude-perl.el

@@ -1,6 +1,6 @@
 ;;; prelude-perl.el --- Emacs Prelude: decent Perl coding settings.
 ;;
-;; Copyright © 2011-2014 Bozhidar Batsov
+;; Copyright © 2011-2015 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

modules/prelude-programming.el

@@ -1,6 +1,6 @@
 ;;; prelude-programming.el --- Emacs Prelude: prog-mode configuration
 ;;
-;; Copyright © 2011-2014 Bozhidar Batsov
+;; Copyright © 2011-2015 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude

modules/prelude-python.el

@@ -1,6 +1,6 @@
 ;;; prelude-python.el --- Emacs Prelude: python.el configuration.
 ;;
-;; Copyright © 2011-2014 Bozhidar Batsov
+;; Copyright © 2011-2015 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude