Commit graph

1388 commits

Author SHA1 Message Date
Bozhidar Batsov 601db9099e Update copyright 2015-12-25 11:31:41 +02:00
Bozhidar Batsov 3906f34d6c Update cider-mode's hook 2015-12-23 10:23:00 +02:00
Bozhidar Batsov 0c4457e1c8 Remove duplicated line 2015-12-19 16:53:56 +02:00
Bozhidar Batsov 5ce441b5ca Merge pull request #936 from dylnclrk/master
Don't invoke set-fontset-font if it is void
2015-12-09 21:48:05 +02:00
Bozhidar Batsov c468da28d4 Merge branch 'master' of github.com:bbatsov/prelude 2015-11-10 22:38:46 +02:00
Bozhidar Batsov ea02ea7c1a Auto-install elm-mode if needed 2015-11-10 22:38:26 +02:00
Dylan Clark a164dfa742 Don't invoke set-fontset-font if it is void
Prevent Prelude's OS X support from breaking the configuration of
users who do not install a Cocoa version of Emacs.
2015-11-02 16:08:21 -08:00
Bozhidar Batsov 4635797ed5 Merge pull request #935 from 4e6/patch-1
Fix README for helm-projectile-find-other-file keybinding
2015-11-02 19:22:18 +02:00
Dmitry Bushev b5f36a73d2 Fix README for helm-projectile-find-other-file keybinding 2015-11-02 16:09:20 +03:00
Bozhidar Batsov f92ea41b72 Use beacon 2015-10-29 19:26:37 +02:00
Bozhidar Batsov cbe988da7a Merge pull request #927 from tmccombs/magit-log-key
Fix magit key bindings.
2015-10-29 16:22:02 +02:00
Bozhidar Batsov 9c07eaefbb Merge pull request #932 from rprimus/ocaml-utop
Replace deprecated utop-setup-ocaml-buffer function
2015-10-29 16:21:46 +02:00
Richard Primus 09b61bbd48 Replace deprecated utop-setup-ocaml-buffer function 2015-10-29 12:51:00 +00:00
Thayne McCombs 9696c56d8b Fix magit key bindings 2015-10-23 22:44:04 -06:00
Bozhidar Batsov 05dc795f2b Merge pull request #911 from bkruczyk/customize-default-shell
Customize shell to run with prelude-visit-term-buffer
2015-10-15 12:21:09 +03:00
Bartłomiej Kruczyk c35bbaaca3 Customize shell to run with prelude-visit-term-buffer 2015-10-15 11:17:21 +02:00
Bozhidar Batsov 863e8c1cec Merge pull request #915 from ducky427/master
Use https for melpa
2015-10-14 17:52:07 +03:00
Bozhidar Batsov ca9ed01b33 Merge pull request #917 from lvh/patch-1
Add emoji support
2015-10-12 16:43:33 +03:00
lvh 15656f072b Add emoji support
Enable emoji, and stop the UI from freezing when trying to display them.
2015-10-12 13:13:45 +02:00
Ducky 5e9a1596ce Use https for melpa 2015-10-06 14:26:43 +01:00
Bozhidar Batsov a952afdb7f Merge pull request #914 from brianloveswords/patch-1
Update README.md
2015-10-02 09:29:59 +03:00
Brian J Brennan c70324bed8 Update README.md
Just updating README for latest version of Emacs
2015-10-01 13:32:49 -04:00
Bozhidar Batsov 5b0c51d0ed Merge pull request #905 from toctan/fix-kill-region-ad
[Fix #902] Fix kill-region advice
2015-09-10 19:55:31 +03:00
toctan 2160bd34a5 [Fix #902] Fix kill-region advice 2015-09-10 16:30:30 +08:00
Bozhidar Batsov 07dc2d1c5d Merge pull request #900 from toctan/fix-kill-region-ad
fix kill-region advice, close bbatsov/prelude#899
2015-09-06 11:31:12 +03:00
toctan 535e054208 [Fix #899] Make the kill-region advice play nice with rectangle-mark-mode 2015-09-06 13:57:15 +08:00
Bozhidar Batsov 4fd85a4e40 Merge pull request #888 from CNBorn/stylus-mode
Add stylus-mode auto installation
2015-09-06 08:55:44 +03:00
Bozhidar Batsov 19cf3dc375 Merge pull request #901 from toctan/trash
Respect `delete-by-moving-to-trash` with `prelude-delete-file-and-buffer`
2015-09-05 11:22:10 +03:00
toctan e28d03818d Respect delete-by-moving-to-trash
close bbatsov/prelude#864
2015-09-03 23:45:46 +08:00
Tyler Xing 8e81a3c712 Add stylus-mode auto installation 2015-08-23 11:15:11 -04:00
Bozhidar Batsov bcdc411744 Merge pull request #890 from CNBorn/patch-1
add json-mode auto installation
2015-08-05 08:18:41 +03:00
Tyler Xing e2d8b9946e add json-mode auto installation 2015-08-04 22:41:12 -04:00
Bozhidar Batsov 4ea6d30dc2 Merge pull request #885 from ankhers/haskell_indentation_function_obsolete
Replace a couple of obsolete haskell-mode functions
2015-07-30 18:49:00 +02:00
Justin Wood 4f07b6a2f6 Replace a couple of obsolete haskell-mode functions
* `turn-on-haskell-indentation` has been marked obsolete in favour of
  `haskell-indentation-mode`

* `turn-on-haskell-doc-mode` has been marked obsolete in favour of
  `haskell-doc-mode`
2015-07-30 12:40:10 -04:00
Bozhidar Batsov 9ffbf9eedc Merge branch 'master' of github.com:bbatsov/prelude 2015-07-28 07:52:44 +03:00
Bozhidar Batsov 8ef0d48991 Use the current theme's faces for smart-mode-line
Auto-detecting faces is not bad, but nothing beats manually
tuned theme faces.
2015-07-28 07:51:00 +03:00
Bozhidar Batsov 29b52264f2 Merge pull request #872 from hbin/add-ruby-auto-mode-alist
Use ruby-mode for .cap files
2015-07-22 10:39:36 +03:00
Bin Huang c97f910efd Use ruby-mode for .cap files 2015-07-22 15:23:40 +08:00
Bozhidar Batsov 1e0911c720 [Fix #884] Adopt smart-mode-line 2015-07-21 14:35:35 +03:00
Bozhidar Batsov b4d4b1e3f9 Merge pull request #883 from dougm/go-oracle
Remove go-oracle-mode hook
2015-07-18 22:15:41 +03:00
Doug MacEachern 2fe4fe5987 Remove go-oracle-mode hook
See golang/tools@68b5f75

Loading of go-oracle is now taken care of by go-projectile

Fixes issue #854
2015-07-18 11:12:29 -07:00
Bozhidar Batsov 605d9aa3de magit-blame-mode -> magit-blame 2015-07-12 00:07:39 +03:00
Bozhidar Batsov 4236acd5b5 Merge branch 'master' of github.com:bbatsov/prelude 2015-07-11 15:26:24 +03:00
Bozhidar Batsov 5c009999be magit-file-log -> magit-log-buffer-file 2015-07-11 15:25:41 +03:00
Bozhidar Batsov ef115319f7 Merge pull request #871 from dgtized/core-isearch-occur
isearch-occur is included in emacs core upstream
2015-07-06 11:20:14 +03:00
Charles Comstock a8a83aeb5e isearch-occur is included in emacs core upstream
Looks like it was originally incorporated in 2007,
6e3057bbed.

Technically this is bound to `M-s o` by default, but `C-o` is a nice shortcut.
2015-07-06 03:01:18 -05:00
Bozhidar Batsov d073402257 Merge pull request #868 from tarsius/magit-next
Support version 2.1.0 of Magit
2015-07-02 00:12:37 +03:00
Bozhidar Batsov afa6ce98c0 Merge pull request #867 from leafac/master
Fix quotes in LaTeX
2015-06-28 10:59:58 +02:00
Jonas Bernoulli 7fa9fd160c Bind C-x M-g to magit-dispatch-popup 2015-06-27 16:19:57 +02:00
Jonas Bernoulli 5e487e5f85 Don't add COMMIT_EDITMSG to recentf-exclude
Loading `git-commit.el' now already does that.
2015-06-27 16:17:29 +02:00