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

* 'master' of https://github.com/bbatsov/prelude:
  Disable the annoying bell ring
  Fix non dotted pair element issue
  Update the copyright years
  Replace prelude-goto-symbol with imenu-anywhere
  Update copyright
  Update cider-mode's hook
  Remove duplicated line
  Don't invoke set-fontset-font if it is void

core/prelude-core.el

@@ -1,6 +1,6 @@
 ;;; prelude-core.el --- Emacs Prelude: Core Prelude functions.
 ;;
-;; Copyright © 2011-2015 Bozhidar Batsov
+;; Copyright © 2011-2016 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude
@@ -499,48 +499,5 @@ With a prefix argument ARG, find the `user-init-file' instead."
      (interactive "P")
      (sp-wrap-with-pair ,s)))
 
-;; needed for prelude-goto-symbol
-(require 'imenu)
-
-(defun prelude-goto-symbol (&optional symbol-list)
-  "Refresh imenu and jump to a place in the buffer using Ido."
-  (interactive)
-  (cond
-   ((not symbol-list)
-    (let (name-and-pos symbol-names position)
-      (while (progn
-               (imenu--cleanup)
-               (setq imenu--index-alist nil)
-               (prelude-goto-symbol (imenu--make-index-alist))
-               (setq selected-symbol
-                     (completing-read "Symbol? " (reverse symbol-names)))
-               (string= (car imenu--rescan-item) selected-symbol)))
-      (unless (and (boundp 'mark-active) mark-active)
-        (push-mark nil t nil))
-      (setq position (cdr (assoc selected-symbol name-and-pos)))
-      (cond
-       ((overlayp position)
-        (goto-char (overlay-start position)))
-       (t
-        (goto-char position)))
-      (recenter)))
-   ((listp symbol-list)
-    (dolist (symbol symbol-list)
-      (let (name position)
-        (cond
-         ((and (listp symbol) (imenu--subalist-p symbol))
-          (prelude-goto-symbol symbol))
-         ((listp symbol)
-          (setq name (car symbol))
-          (setq position (cdr symbol)))
-         ((stringp symbol)
-          (setq name symbol)
-          (setq position
-                (get-text-property 1 'org-imenu-marker symbol))))
-        (unless (or (null position) (null name)
-                    (string= (car imenu--rescan-item) name))
-          (add-to-list 'symbol-names (substring-no-properties name))
-          (add-to-list 'name-and-pos (cons (substring-no-properties name) position))))))))
-
 (provide 'prelude-core)
 ;;; prelude-core.el ends here

core/prelude-custom.el

@@ -1,6 +1,6 @@
 ;;; prelude-custom.el --- Emacs Prelude: Prelude's customizable variables.
 ;;
-;; Copyright © 2011-2015 Bozhidar Batsov
+;; Copyright © 2011-2016 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-2015 Bozhidar Batsov
+;; Copyright © 2011-2016 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude
@@ -183,6 +183,8 @@ The body of the advice is in BODY."
   "Set buffer major mode according to `auto-mode-alist'."
   (let* ((name (buffer-name buffer))
          (mode (assoc-default name auto-mode-alist 'string-match)))
+    (when (and mode (consp mode))
+      (setq mode (car mode)))
     (with-current-buffer buffer (if mode (funcall mode)))))
 
 ;; highlight the current line
@@ -262,7 +264,6 @@ The body of the advice is in BODY."
 (require 'avy)
 (setq avy-background t)
 (setq avy-style 'at-full)
-(setq avy-style 'at-full)
 
 ;; anzu-mode enhances isearch & query-replace by showing total matches and current match position
 (require 'anzu)

core/prelude-global-keybindings.el

@@ -1,6 +1,6 @@
 ;;; prelude-global-keybindings.el --- Emacs Prelude: some useful keybindings.
 ;;
-;; Copyright © 2011-2015 Bozhidar Batsov
+;; Copyright © 2011-2016 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-2015 Bozhidar Batsov
+;; Copyright © 2011-2016 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude
@@ -32,6 +32,7 @@
 
 ;;; Code:
 (require 'easymenu)
+(require 'imenu-anywhere)
 
 (defvar prelude-mode-map
   (let ((map (make-sparse-keymap)))
@@ -63,7 +64,7 @@
     (define-key map (kbd "C-c TAB") 'prelude-indent-rigidly-and-copy-to-clipboard)
     (define-key map (kbd "C-c I") 'prelude-find-user-init-file)
     (define-key map (kbd "C-c S") 'prelude-find-shell-init-file)
-    (define-key map (kbd "C-c i") 'prelude-goto-symbol)
+    (define-key map (kbd "C-c i") 'imenu-anywhere)
     ;; extra prefix for projectile
     (define-key map (kbd "s-p") 'projectile-command-map)
     ;; make some use of the Super key

core/prelude-osx.el

@@ -1,6 +1,6 @@
 ;;; prelude-osx.el --- Emacs Prelude: OSX specific settings.
 ;;
-;; Copyright © 2011-2015 Bozhidar Batsov
+;; Copyright © 2011-2016 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude
@@ -67,7 +67,9 @@ Windows external keyboard from time to time."
 (menu-bar-mode +1)
 
 ;; Enable emoji, and stop the UI from freezing when trying to display them.
-(set-fontset-font t 'unicode "Apple Color Emoji" nil 'prepend)
+(if (fboundp 'set-fontset-font)
+    (set-fontset-font t 'unicode "Apple Color Emoji" nil 'prepend))
+
 
 (provide 'prelude-osx)
 ;;; prelude-osx.el ends here

core/prelude-packages.el

@@ -1,6 +1,6 @@
 ;;; prelude-packages.el --- Emacs Prelude: default package selection.
 ;;
-;; Copyright © 2011-2015 Bozhidar Batsov
+;; Copyright © 2011-2016 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude
@@ -62,6 +62,7 @@
     god-mode
     grizzl
     guru-mode
+    imenu-anywhere
     ov
     projectile
     magit

core/prelude-ui.el

@@ -1,6 +1,6 @@
 ;;; prelude-ui.el --- Emacs Prelude: UI optimizations and tweaks.
 ;;
-;; Copyright © 2011-2015 Bozhidar Batsov
+;; Copyright © 2011-2016 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude
@@ -44,6 +44,9 @@
 ;; the blinking cursor is nothing, but an annoyance
 (blink-cursor-mode -1)
 
+;; disable the annoying bell ring
+(setq ring-bell-function 'ignore)
+
 ;; disable startup screen
 (setq inhibit-startup-screen t)
 

init.el

@@ -1,6 +1,6 @@
 ;;; init.el --- Prelude's configuration entry point.
 ;;
-;; Copyright (c) 2011 Bozhidar Batsov
+;; Copyright (c) 2011-2016 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: http://batsov.com/prelude

modules/prelude-c.el

@@ -1,6 +1,6 @@
 ;;; prelude-c.el --- Emacs Prelude: cc-mode configuration.
 ;;
-;; Copyright © 2011-2015 Bozhidar Batsov
+;; Copyright © 2011-2016 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-2015 Bozhidar Batsov
+;; Copyright © 2011-2016 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: http://batsov.com/prelude
@@ -50,7 +50,7 @@
   '(progn
      (setq nrepl-log-messages t)
 
-     (add-hook 'cider-mode-hook 'cider-turn-on-eldoc-mode)
+     (add-hook 'cider-mode-hook 'eldoc-mode)
 
      (defun prelude-cider-repl-mode-defaults ()
        (subword-mode +1)

modules/prelude-coffee.el

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

modules/prelude-company.el

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

modules/prelude-erlang.el

@@ -1,6 +1,6 @@
 ;;; prelude-erlang.el --- Emacs Prelude: Erlang programming support.
 ;;
-;; Copyright © 2011-2015 Gleb Peregud
+;; Copyright © 2011-2016 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-2015 Bozhidar Batsov
+;; Copyright © 2011-2016 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-2015 Bozhidar Batsov
+;; Copyright © 2011-2016 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-2015 Tu, Do Hoang
+;; Copyright © 2014-2016 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-2015 Bozhidar Batsov
+;; Copyright © 2011-2016 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-2015 Bozhidar Batsov
+;; Copyright © 2011-2016 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-2015 Bozhidar Batsov
+;; Copyright © 2011-2016 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-2015 Bozhidar Batsov
+;; Copyright © 2011-2016 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-2015 Bozhidar Batsov
+;; Copyright © 2011-2016 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-2015 Bozhidar Batsov
+;; Copyright © 2011-2016 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-2015 Bozhidar Batsov
+;; Copyright © 2011-2016 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-2015 Geoff Shannon
+;; Copyright © 2014-2016 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-2015 Bozhidar Batsov
+;; Copyright © 2011-2016 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-2015 Bozhidar Batsov
+;; Copyright © 2011-2016 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-2015 Bozhidar Batsov
+;; Copyright © 2011-2016 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-2015 Bozhidar Batsov
+;; Copyright © 2011-2016 Bozhidar Batsov
 ;;
 ;; Author: Bozhidar Batsov <[email protected]>
 ;; URL: https://github.com/bbatsov/prelude