Use settings from .editorconfig file #1008
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When an .editorconfig file is present in the project, it should be used.
There is no need, why the editorconfig should be on the top. The description in the comment is also much nicer.
|
👍 |
MicahElliott
pushed a commit
to MicahElliott/prelude
that referenced
this pull request
Jan 11, 2017
When an .editorconfig file is present in the project, it should be used.
hbin
pushed a commit
to hbin/emacs.d
that referenced
this pull request
Feb 22, 2017
When an .editorconfig file is present in the project, it should be used.
hbin
pushed a commit
to hbin/emacs.d
that referenced
this pull request
Feb 22, 2017
When an .editorconfig file is present in the project, it should be used.
pappachino
pushed a commit
to pappachino/prelude
that referenced
this pull request
Mar 16, 2017
When an .editorconfig file is present in the project, it should be used.
SiggyF
pushed a commit
to SiggyF/prelude
that referenced
this pull request
May 1, 2017
* upstream/master: Use elpa repository for 'queue' and 'spinner' packages Add stanza inserted by Package.el cf. bbatsov#1056 [Fix bbatsov#743] Add support for package pinning (bbatsov#1048) Update the copyright years Code style Use http protocol instead of https for ELPA on Windows Disable Flycheck warnings for `personal` Use settings from .editorconfig file (bbatsov#1008) Don't alter C-a binding in orgmode
dliappis
pushed a commit
to dliappis/prelude
that referenced
this pull request
Jul 12, 2017
When an .editorconfig file is present in the project, it should be used.
suutari
added a commit
to suutari/prelude
that referenced
this pull request
Sep 2, 2017
* 'master' of github.com:bbatsov/prelude: Add the prelude-rust.el module (bbatsov#1102) Mentioned requirement of having no ~/.emacs file. Upgrade prelude-common-lisp.el (bbatsov#1099) [Fix bbatsov#1096] Remove ido-ubiquitous and add ido-completing-read+ (bbatsov#1100) Making the prelude-erc module more modular Refine missing bundled example file warning (bbatsov#1094) Fix message about location of prelude-modules.el after install Emacs latest release is 25.2 Use elpa repository for 'queue' and 'spinner' packages Add stanza inserted by Package.el cf. bbatsov#1056 [Fix bbatsov#743] Add support for package pinning (bbatsov#1048) Update the copyright years Code style Use http protocol instead of https for ELPA on Windows Disable Flycheck warnings for `personal` Use settings from .editorconfig file (bbatsov#1008) Don't alter C-a binding in orgmode Update saveplace to work with Emacs 25 (bbatsov#1046) Ignore emacs desktop files (bbatsov#1044) [Fix bbatsov#1004] Correct the Salt link in the README [Fix bbatsov#1012] Update a reference to a crux function Update the README for Emacs 25 Rename .emacs if it exists in the installer(bbatsov#1037) Add helm-occur-from-isearch to isearch-mode-map (bbatsov#1030) Wrap kill-region with defadvice from crux (bbatsov#1035) pretzo -> prezto (bbatsov#1034) Add kotlin-mode to the auto-install list (bbatsov#1016) Fix a broken link in README.md (bbatsov#1007) Add a gratipay badge Make the scala-mode dependency explicit Remove a mention of scala-mode2 Update the donation options Replace `scala-mode2` with the `ensime` package (bbatsov#1001) Update README.md (bbatsov#996) Fix the crux-like changes (bbatsov#995) Change function name to crux (bbatsov#992) Auto-install cask-mode when needed Fix C-a behavior (bbatsov#991) Replace some of the bundled code with the crux package [bbatsov#956] Mention that Emacs 24.4 is required Improve code style a bit [Fix bbatsov#989] Use eldoc-mode instead of haskell-doc-mode Fix some auto-pairing issues when editing erb file with web-mode (bbatsov#805)
suutari-ai
added a commit
to suutari-ai/prelude
that referenced
this pull request
Sep 8, 2017
* 'master' of https://github.com/bbatsov/prelude: Use elpa repository for 'queue' and 'spinner' packages Add stanza inserted by Package.el cf. bbatsov#1056 [Fix bbatsov#743] Add support for package pinning (bbatsov#1048) Update the copyright years Code style Use http protocol instead of https for ELPA on Windows Disable Flycheck warnings for `personal` Use settings from .editorconfig file (bbatsov#1008) Don't alter C-a binding in orgmode
Bklyn
pushed a commit
to Bklyn/prelude
that referenced
this pull request
Dec 4, 2017
* 'master' of https://github.com/bbatsov/prelude: Use elpa repository for 'queue' and 'spinner' packages Add stanza inserted by Package.el cf. bbatsov#1056 [Fix bbatsov#743] Add support for package pinning (bbatsov#1048) Update the copyright years Code style Use http protocol instead of https for ELPA on Windows Disable Flycheck warnings for `personal` Use settings from .editorconfig file (bbatsov#1008) Don't alter C-a binding in orgmode Update saveplace to work with Emacs 25 (bbatsov#1046)
dieuwedeboer
pushed a commit
to ben-denham/prelude
that referenced
this pull request
Dec 12, 2017
When an .editorconfig file is present in the project, it should be used.
elthariel
pushed a commit
to elthariel/prelude
that referenced
this pull request
Sep 24, 2019
When an .editorconfig file is present in the project, it should be used.
Bklyn
added a commit
to Bklyn/prelude
that referenced
this pull request
Sep 5, 2021
commit 714050a Merge: 281599a b42f067 Author: Caleb Epstein <[email protected]> Date: Sun Sep 5 12:40:52 2021 -0400 Merge remote-tracking branch 'bbatsov/master' * bbatsov/master: (149 commits) Add my Liberapay profile Add a module for F# programming (bbatsov#1334) Replace yank-pop key binding with counsel-yank-pop (bbatsov#1331) Change link to stackoveflow tag to emacs-prelude Fix diminishing company-mode Auto-install racket-mode if needed Update the changelog Tweak a bit the new modules [Fix bbatsov#1320] Remove company-lsp Add Racket module (bbatsov#1321) Lua module documentation Add Lua programming support Fix a couple of typos (bbatsov#1319) Bind all essential avy commands Release Prelude 1.1 Use display-line-numbers for Emacs 26.1 and later [Fix bbatsov#1308] Remove ivy-prescient Ignore lsp-generated files Add var/ to gitignore [Docs] Add a note ... commit 281599a Author: Caleb Epstein <[email protected]> Date: Mon Nov 18 09:12:33 2019 -0500 No more helm-map commit 4dcd7e2 Author: Caleb Epstein <[email protected]> Date: Thu Nov 14 13:49:51 2019 -0500 Ignore /transient/ commit 9ab831c Author: Caleb Epstein <[email protected]> Date: Thu Nov 14 13:38:36 2019 -0500 My modules commit ae190ad Merge: 2e4aee3 c951f8e Author: Caleb Epstein <[email protected]> Date: Wed Sep 4 08:33:18 2019 -0400 Merge remote-tracking branch 'bbatsov/master' * bbatsov/master: (57 commits) Update PDF cheatsheet with new Rust bindings Add Handlebars .hbs parsing using web-mode clarify install docs Fix typo Extend rust module keybindings (bbatsov#1237) Kill obsolete funding channels lsp: bind lsp-execute-code-action Relax the stalebot config Spare good first issues from the wrath of stalebot Update the stale bot config Enable probot-stale Replace usage of `magit-dispatch-popup` with `magit-dispatch` Replace the use of `magit-log-popup' with `magit-log' (bbatsov#1231) Update installation instruction link for OCaml module Fix the link of 'prelude-cheatsheet.pdf' Tweak some markup Extend the overview Describe modules Tweak some wording Fix a bad merge ... commit 2e4aee3 Author: apiraino <[email protected]> Date: Tue Jun 18 20:55:48 2019 +0200 Update PDF cheatsheet with new Rust bindings commit 4a54429 Author: Benjamin Howell <[email protected]> Date: Sat Jul 27 18:25:33 2019 -0400 Add Handlebars .hbs parsing using web-mode web-mode.el already supports .hbs (handlebars) files. This extension is used for general handlebars files and is used in ember.js projects. Added .hbs to the web-mode.el file extension list. commit 10138ad Author: apiraino <[email protected]> Date: Sun Jun 16 17:59:32 2019 +0200 clarify install docs commit 7920a6b Author: apiraino <[email protected]> Date: Sun Jun 16 17:42:19 2019 +0200 Fix typo commit b746c3f Author: apiraino <[email protected]> Date: Tue Jun 18 18:33:11 2019 +0200 Extend rust module keybindings (bbatsov#1237) commit 3e1e6ec Author: Bozhidar Batsov <[email protected]> Date: Wed May 29 09:22:46 2019 +0300 Kill obsolete funding channels commit 5fc6a04 Author: Marc-André Lureau <[email protected]> Date: Fri May 17 19:42:44 2019 +0200 lsp: bind lsp-execute-code-action Signed-off-by: Marc-André Lureau <[email protected]> commit f404528 Author: Bozhidar Batsov <[email protected]> Date: Sat May 11 10:44:55 2019 +0300 Relax the stalebot config commit 4833e08 Author: Bozhidar Batsov <[email protected]> Date: Thu May 9 12:07:19 2019 +0300 Spare good first issues from the wrath of stalebot commit 40ad707 Author: Bozhidar Batsov <[email protected]> Date: Wed May 8 18:51:37 2019 +0300 Update the stale bot config commit 383c39a Author: Bozhidar Batsov <[email protected]> Date: Wed May 8 18:10:24 2019 +0300 Enable probot-stale It should help us clean-up the issue tracker and maintain a focused backlog of tasks. commit 184c2d1 Author: azzamsa <[email protected]> Date: Sat May 4 13:37:58 2019 +0700 Replace usage of `magit-dispatch-popup` with `magit-dispatch` `magit-dispatch-popup` is an obsolete command (as of Magit 2.91.0) commit 441107a Author: Henrik Thuesen <[email protected]> Date: Tue Apr 30 21:48:43 2019 +0200 Replace the use of `magit-log-popup' with `magit-log' (bbatsov#1231) This is also mentioned in bbatsov#1226 and originates from magit/magit#3695. commit 3351418 Author: azzamsa <[email protected]> Date: Tue Apr 9 07:42:11 2019 +0700 Update installation instruction link for OCaml module commit 90cf467 Author: weiyang <[email protected]> Date: Wed Jan 23 18:34:25 2019 +0800 Fix the link of 'prelude-cheatsheet.pdf' Signed-off-by: weiyang <[email protected]> commit 031b136 Author: Bozhidar Batsov <[email protected]> Date: Wed Jan 16 19:04:56 2019 +0200 Tweak some markup commit f8c518a Author: Bozhidar Batsov <[email protected]> Date: Wed Jan 16 18:59:56 2019 +0200 Extend the overview commit 94f72a0 Author: Bozhidar Batsov <[email protected]> Date: Wed Jan 16 15:30:23 2019 +0200 Describe modules commit 9057d45 Author: Bozhidar Batsov <[email protected]> Date: Wed Jan 16 15:27:04 2019 +0200 Tweak some wording commit c130f65 Author: Bozhidar Batsov <[email protected]> Date: Wed Jan 16 15:16:17 2019 +0200 Fix a bad merge commit 5b03a56 Author: Bozhidar Batsov <[email protected]> Date: Wed Jan 16 15:06:45 2019 +0200 Mention the new manual in the README commit 08870ce Author: Bozhidar Batsov <[email protected]> Date: Wed Jan 16 14:31:52 2019 +0200 Restructure the README into a manual commit 771991b Author: Josh Comer <[email protected]> Date: Tue Jan 1 07:30:20 2019 -0400 Fix rust LSP * Removed lsp-rust (RLS is built into lsp-mode now) * Fixed setting up flycheck mode in rust mode * Fixed LSP initialization due to deprecation * LSP-mode now self configures company and ui-mode commit 3db2579 Author: Josh Comer <[email protected]> Date: Sat Dec 15 20:22:43 2018 -0400 Update lsp-mode for package changes commit 010ee25 Author: Andrei Beliankou <[email protected]> Date: Thu Nov 22 16:53:52 2018 +0100 [Fix bbatsov#1208] Correct RegExp collisions while loading personal config. commit bdb1eab Author: Ben Alex <[email protected]> Date: Sun Nov 18 14:34:50 2018 +1100 Rust Language Server (RLS) support commit f1e30f9 Author: Andrei Beliankou <[email protected]> Date: Tue Nov 20 22:39:57 2018 +0100 Move `prelude-modules.el` under `personal` directory Prelude modules are required by the definition file `prelude-modules.el`. This file should be part of personal configuration. Therefore: - implemented loading of `personal/prelude-modules.el` in favour of loading `prelude-modules.el`; - added a check for presence of both old and new files; - adjusted documentation; - adjusted the installer. Closes bbatsov#1206. commit 4173744 Author: Stanislav Arnaudov <[email protected]> Date: Tue Oct 23 00:19:31 2018 +0200 [Fix bbatsov#1171] Add gnu/linux specific module and exec-path-from-shell support on linux (bbatsov#1203) commit 6b04a42 Author: Hitesh Jasani <[email protected]> Date: Thu Oct 18 12:01:00 2018 -0400 [Fix bbatsov#596] Improve personal config instructions (bbatsov#1202) commit f5f242b Author: Jean Rigotti <[email protected]> Date: Wed Oct 17 11:23:27 2018 +0200 Fix solarized url commit fd3b297 Author: Daniel Compton <[email protected]> Date: Mon Oct 1 13:05:20 2018 +1300 Note that emacs-mac already remaps Command to Meta commit cf0dd5a Author: Bozhidar Batsov <[email protected]> Date: Sat Sep 29 11:41:23 2018 +0300 Teach super-save about ace-window commit 70c308a Author: Bozhidar Batsov <[email protected]> Date: Sat Sep 29 11:31:50 2018 +0300 Clean up a bit the Common Lisp module commit 2c0c6b7 Author: Bozhidar Batsov <[email protected]> Date: Sat Sep 29 11:28:58 2018 +0300 Fix some indentation commit 5b80c2b Author: Bozhidar Batsov <[email protected]> Date: Sat Sep 29 11:27:37 2018 +0300 [Fix bbatsov#771] Don't auto-start SLIME in Common Lisp source files commit f3f0281 Author: Bozhidar Batsov <[email protected]> Date: Fri Sep 28 18:41:39 2018 +0300 [Fix bbatsov#1194] Restore the advise-commands macro I didn't notice that it had other usages in the code when I deleted it in the commit introducing super-save. commit fff9279 Author: Bozhidar Batsov <[email protected]> Date: Fri Sep 28 17:34:53 2018 +0300 [Fix bbatsov#1193] Fix Prelude's menu definition commit ac65443 Author: Bozhidar Batsov <[email protected]> Date: Fri Sep 28 16:57:17 2018 +0300 Replace Prelude's auto-save functionality with super-save Prelude's auto-save logic was extracted in the super-save packaged and polished a bit there. commit ad967f3 Author: Bozhidar Batsov <[email protected]> Date: Fri Sep 28 09:13:55 2018 +0300 Clean up prelude-mode * Move the mode menu top-level, so it's easier to discover * Make prelude-mode a global mode and remove prelude-global-mode commit 092f6fa Author: Geoff Shannon <[email protected]> Date: Fri Sep 14 02:23:39 2018 -0700 Stop Rust source files from being made executable Rust has an unfortunate syntax for setting attributes on a module file: ```rust #![...] ``` Since this is typically put at the top of the file, that makes the shebang the first two characters, which makes the `after-save-hook` function `executable-make-buffer-file-executable-if-script-p` function change any such rust files executable. commit 28a8fe8 Author: Chilling Hsu <[email protected]> Date: Mon Sep 17 22:46:02 2018 +0800 Don't use an obsolete command commit f04ab24 Author: Bozhidar Batsov <[email protected]> Date: Fri Sep 14 09:50:00 2018 +0300 Replace usages of eval-after-load with with-eval-after-load `with-eval-after-load` was introduced in Emacs 24.4 and its usage results in a cleaner code. `eval-after-load` is considered ill-behaved because it is a function, not a macro, and thus requires the code inside it to be quoted, which means that it cannot be byte-compiled. It also accepts only one form, so if you have more than one, you need to use `progn`. More details - https://stackoverflow.com/questions/21880139/what-is-with-eval-after-load-in-emacs-lisp commit 235d94c Author: Hang Qian <[email protected]> Date: Sat Aug 18 02:57:22 2018 -0700 Fix readme preload description (bbatsov#1187) `prelude-require-package` has not be defined during preloading. This patch fixes readme description. Fixes bbatsov#1161. commit e613f2f Author: Bozhidar Batsov <[email protected]> Date: Thu Aug 9 08:25:07 2018 +0300 Improve the mode menu a bit commit 9811c7a Author: Bozhidar Batsov <[email protected]> Date: Wed Aug 8 15:35:45 2018 +0300 Kill some remnants for god-mode commit 3d2d982 Author: Bozhidar Batsov <[email protected]> Date: Wed Aug 8 15:32:52 2018 +0300 Add back C-c p as a prefix for Projectile commit a2a7608 Author: Iain Beeston <[email protected]> Date: Wed Aug 8 12:35:33 2018 +0100 Revert "Update readme to use the new projectile binding (bbatsov#1183)" This reverts commit 9590d49. commit 6dd374d Author: John Eismeier <[email protected]> Date: Tue Jul 31 10:46:05 2018 -0400 Propose small fix on typo commit 8e1f021 Author: Iain Beeston <[email protected]> Date: Thu Jul 26 15:10:28 2018 +0100 Update readme to use the new projectile binding (bbatsov#1183) In b90b950eead64b171d528098d186c19804739aa0 the default keybinding for projectile mode was changed from `C-c p` to `C-c C-p`. This updates the prelude readme to reflect that. commit d3d0d91 Author: Bozhidar Batsov <[email protected]> Date: Tue Jul 17 10:39:18 2018 +0300 Remove god-mode and grizzl commit 01f4935 Author: Bozhidar Batsov <[email protected]> Date: Tue Jul 17 10:33:36 2018 +0300 [Fix bbatsov#1176] Remove smart-mode-line As mentioned in the issue - it's causing problems on Emacs 26.1. commit 3eba959 Author: Bozhidar Batsov <[email protected]> Date: Tue Jul 10 09:02:25 2018 +0300 Mention my paypal.me link commit d564524 Author: Bozhidar Batsov <[email protected]> Date: Tue Jul 10 09:01:24 2018 +0300 Require Emacs 25.1 commit daac0d6 Author: Bozhidar Batsov <[email protected]> Date: Tue Jul 10 08:53:18 2018 +0300 Update a reference to projectile-global-mode commit 8caa026 Author: Bozhidar Batsov <[email protected]> Date: Tue Jun 26 08:31:25 2018 +0300 Align company's tooltip annotations to the right commit f2e6d81 Author: LEE Dongjun <[email protected]> Date: Tue Jun 26 13:57:16 2018 +0900 Add Typescript programming support (bbatsov#1181) commit 87bc1d4 Author: azzamsa <[email protected]> Date: Sun Jun 3 10:41:50 2018 +0700 Show numbers for company completion candidates (bbatsov#1172) commit b7261eb Author: Caleb Epstein <[email protected]> Date: Wed Sep 4 08:27:34 2019 -0400 Personal style updates (retire defunct C++ style) commit 26ca4cb Merge: a8979bb 493836e Author: Caleb Epstein <[email protected]> Date: Thu May 24 09:30:45 2018 -0400 Merge remote-tracking branch 'bbatsov/master' * bbatsov/master: [Fix bbatsov#1170] Remove the vkill package Remove the mediawiki module Clarify some wording Replace dash with the built-in cl-lib Replace some custom TODO & friends highlighting with the hl-todo package [Fix bbatsov#1151] Bind counsel-ag to "C-c a" Tweak some OS references Simplify the Projectile README section Add a helpful comment Improve the code style Rename prelude-osx.el to prelude-macos.el [Fix bbatsov#1147] Add an extra keybinding for ace-window that's Windows friendly Update the copyright years Add graphql-mode auto installation commit a8979bb Author: Caleb Epstein <[email protected]> Date: Tue May 22 16:25:09 2018 -0400 Retire Vlad stylie commit f7b7153 Merge: 1ffa11b 26d751a Author: Caleb Epstein <[email protected]> Date: Mon Apr 23 14:51:57 2018 -0400 Merge remote-tracking branch 'bbatsov/master' * bbatsov/master: Change cheatsheet color scheme to a light one Improve some wording Kill a stray . Remove some Ruby file associations Remove ruby-tools-mode Remove the gitter link from the beginning of the README Update solarized package name Add cheatsheet commit 1ffa11b Author: Caleb Epstein <[email protected]> Date: Mon Mar 5 15:18:31 2018 -0500 Python Run autopep8 on save; lastpass module doesn't work commit fd87884 Merge: 96f3a32 d1a8566 Author: Caleb Epstein <[email protected]> Date: Thu Jan 18 09:27:33 2018 -0500 Merge branch 'master' of https://github.com/bbatsov/prelude * 'master' of https://github.com/bbatsov/prelude: Improve a bit the formatting of one paragraph Improve the README section on color themes Remove a mention of an obsolete keybinding Add a note about the Super key Remove a couple of redundant requires Add an ivy module Rename OS X to masOS Touch up the README a bit Add a note about remapping Return to Control under macOS Rename OSX to macOS Replace the mention of Gratipay with Liberapay and Patreon Improve a bit the Support section of the README [Fix bbatsov#1138] Fix a typo in the README Kill obsolete defcustom prelude-shell Fix a typo commit 96f3a32 Merge: 0d3e85f 8fa56f8 Author: Caleb Epstein <[email protected]> Date: Mon Dec 4 17:28:46 2017 -0500 Merge branch 'master' of https://github.com/Bklyn/prelude * 'master' of https://github.com/Bklyn/prelude: Patch security vulnerability for emacs < 25.3 commit 8fa56f8 Merge: e0ba82d f7d5d68 Author: Caleb Epstein <[email protected]> Date: Sat Dec 2 18:49:50 2017 -0500 Merge branch 'master' of https://github.com/bbatsov/prelude * 'master' of https://github.com/bbatsov/prelude: (25 commits) Patch security vulnerability for emacs < 25.3 Correct two minor spelling errors Make it possible to auto-create a new perspective for IRC (bbatsov#1097) Add commented out 'prelude-rust to sample [Fix bbatsov#1104] Remove ido-completing-read+ from pinned packages (bbatsov#1105) Ignore network-security.data file Add the prelude-rust.el module (bbatsov#1102) Mentioned requirement of having no ~/.emacs file. Upgrade prelude-common-lisp.el (bbatsov#1099) [Fix bbatsov#1096] Remove ido-ubiquitous and add ido-completing-read+ (bbatsov#1100) Making the prelude-erc module more modular Refine missing bundled example file warning (bbatsov#1094) Fix message about location of prelude-modules.el after install Emacs latest release is 25.2 Use elpa repository for 'queue' and 'spinner' packages Add stanza inserted by Package.el cf. bbatsov#1056 [Fix bbatsov#743] Add support for package pinning (bbatsov#1048) Update the copyright years Code style Use http protocol instead of https for ELPA on Windows ... commit 0d3e85f Merge: d4e0ed1 bd287e6 Author: Caleb Epstein <[email protected]> Date: Fri Sep 1 11:44:41 2017 -0400 Merge bbatsov commit d4e0ed1 Author: Caleb Epstein <[email protected]> Date: Fri Sep 1 11:42:38 2017 -0400 Lastpass commit ad4056b Merge: 4db64a2 7dbf968 Author: Caleb Epstein <caleb@dvt-ny03-lw001> Date: Fri Jan 20 11:26:42 2017 -0500 Merge branch 'master' of https://github.com/bbatsov/prelude * 'master' of https://github.com/bbatsov/prelude: Use elpa repository for 'queue' and 'spinner' packages Add stanza inserted by Package.el cf. bbatsov#1056 [Fix bbatsov#743] Add support for package pinning (bbatsov#1048) Update the copyright years Code style Use http protocol instead of https for ELPA on Windows Disable Flycheck warnings for `personal` Use settings from .editorconfig file (bbatsov#1008) Don't alter C-a binding in orgmode Update saveplace to work with Emacs 25 (bbatsov#1046) commit 4db64a2 Merge: e0ba82d 8f01458 Author: Caleb Epstein <[email protected]> Date: Tue Oct 25 09:34:21 2016 -0400 fix conflict commit e0ba82d Author: Caleb Epstein <[email protected]> Date: Sat Oct 15 12:49:11 2016 -0400 Start server commit 67cc284 Merge: e6604d9 d16c121 Author: Caleb Epstein <[email protected]> Date: Fri Oct 7 11:54:54 2016 -0400 Merge branch 'master' of https://github.com/bbatsov/prelude * 'master' of https://github.com/bbatsov/prelude: [Fix bbatsov#1004] Correct the Salt link in the README [Fix bbatsov#1012] Update a reference to a crux function Update the README for Emacs 25 Rename .emacs if it exists in the installer(bbatsov#1037) Add helm-occur-from-isearch to isearch-mode-map (bbatsov#1030) Wrap kill-region with defadvice from crux (bbatsov#1035) pretzo -> prezto (bbatsov#1034) commit e6604d9 Merge: 22493dc f5f4d77 Author: Caleb Epstein <[email protected]> Date: Wed Aug 31 08:50:21 2016 -0400 Merge branch 'master' of https://github.com/bbatsov/prelude * 'master' of https://github.com/bbatsov/prelude: Add kotlin-mode to the auto-install list (bbatsov#1016) commit 22493dc Author: Caleb Epstein <[email protected]> Date: Wed Jun 15 09:53:22 2016 -0400 helm binding tweaks commit 5ed477b Merge: e8dc0d3 74b2b76 Author: Caleb Epstein <[email protected]> Date: Wed Jun 15 09:52:15 2016 -0400 Merge branch 'master' of https://github.com/bbatsov/prelude * 'master' of https://github.com/bbatsov/prelude: Fix a broken link in README.md (bbatsov#1007) Add a gratipay badge Make the scala-mode dependency explicit Remove a mention of scala-mode2 Update the donation options Replace `scala-mode2` with the `ensime` package (bbatsov#1001) Update README.md (bbatsov#996) Fix the crux-like changes (bbatsov#995) Change function name to crux (bbatsov#992) Auto-install cask-mode when needed Fix C-a behavior (bbatsov#991) Replace some of the bundled code with the crux package [bbatsov#956] Mention that Emacs 24.4 is required Improve code style a bit [Fix bbatsov#989] Use eldoc-mode instead of haskell-doc-mode Fix some auto-pairing issues when editing erb file with web-mode (bbatsov#805) Add a hook to magit that notifies diff-hl commit e8dc0d3 Merge: 174f5ad 1f3ddb6 Author: Caleb Epstein <[email protected]> Date: Fri Apr 1 13:06:39 2016 -0400 Merge branch 'master' of https://github.com/bbatsov/prelude * 'master' of https://github.com/bbatsov/prelude: [Fix bbatsov#977] Add the which-key package commit 174f5ad Merge: 30398e8 3053164 Author: Caleb Epstein <[email protected]> Date: Mon Mar 7 09:44:36 2016 -0500 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 commit 30398e8 Author: Caleb Epstein <[email protected]> Date: Fri Feb 19 11:49:27 2016 -0500 White lines commit 9bf1c1a Merge: 592f3ca 16fe29d Author: Caleb Epstein <[email protected]> Date: Mon Nov 16 11:30:41 2015 -0500 Merge branch 'master' of https://github.com/Bklyn/prelude # By Bozhidar Batsov # Via Bozhidar Batsov (2) and Caleb Epstein (1) * 'master' of https://github.com/Bklyn/prelude: Auto-install elm-mode if needed commit 16fe29d Merge: 8f34d3a c468da2 Author: Caleb Epstein <[email protected]> Date: Sun Nov 15 15:07:26 2015 -0500 Merge branch 'master' of https://github.com/bbatsov/prelude * 'master' of https://github.com/bbatsov/prelude: Auto-install elm-mode if needed Fix README for helm-projectile-find-other-file keybinding Use beacon Replace deprecated utop-setup-ocaml-buffer function Fix magit key bindings Customize shell to run with prelude-visit-term-buffer Use https for melpa commit 592f3ca Merge: 8f34d3a 4635797 Author: Caleb Epstein <[email protected]> Date: Mon Nov 9 08:26:23 2015 -0500 Merge branch 'master' of https://github.com/bbatsov/prelude * 'master' of https://github.com/bbatsov/prelude: Fix README for helm-projectile-find-other-file keybinding Use beacon Replace deprecated utop-setup-ocaml-buffer function Fix magit key bindings Customize shell to run with prelude-visit-term-buffer Use https for melpa commit 8f34d3a Author: Caleb Epstein <[email protected]> Date: Tue Oct 13 08:47:45 2015 -0400 Disable semantic mode; too slow commit 631ee94 Merge: 3a969c4 ca9ed01 Author: Caleb Epstein <[email protected]> Date: Tue Oct 13 08:47:02 2015 -0400 Merge branch 'master' of https://github.com/bbatsov/prelude * 'master' of https://github.com/bbatsov/prelude: Add emoji support Update README.md commit 3a969c4 Author: Caleb Epstein <[email protected]> Date: Thu Sep 24 08:39:06 2015 -0400 Anaconda can bite me commit 00597ee Merge: 827b45a 5b0c51d Author: Caleb Epstein <[email protected]> Date: Thu Sep 24 08:38:43 2015 -0400 Merge branch 'master' of https://github.com/bbatsov/prelude * 'master' of https://github.com/bbatsov/prelude: [Fix bbatsov#902] Fix kill-region advice [Fix bbatsov#899] Make the kill-region advice play nice with rectangle-mark-mode Respect `delete-by-moving-to-trash` Add stylus-mode auto installation add json-mode auto installation Replace a couple of obsolete haskell-mode functions Use the current theme's faces for smart-mode-line Use ruby-mode for .cap files [Fix bbatsov#884] Adopt smart-mode-line Remove go-oracle-mode hook magit-blame-mode -> magit-blame magit-file-log -> magit-log-buffer-file isearch-occur is included in emacs core upstream Bind C-x M-g to magit-dispatch-popup Don't add COMMIT_EDITMSG to recentf-exclude Fix quotes in LaTeX use https when piping to sh for install commit 827b45a Author: Caleb Epstein <[email protected]> Date: Wed May 27 17:48:26 2015 -0400 Work around Prelude annoyances commit 32ae31c Merge: 5d8e096 fe7997b Author: Caleb Epstein <[email protected]> Date: Tue May 26 09:43:32 2015 -0400 Merge branch 'master' of https://github.com/bbatsov/prelude * 'master' of https://github.com/bbatsov/prelude: [Fix bbatsov#827] Make it possible to disable the tips Use jump to word or subword by default Don't open a file as root if it is owned by the current user Change how the "re-open file as root" functionality works Extract a function for reopening a file as root Make it possible to stop prelude loading any theme at all [Fix bbatsov#847] Restore ace-window Don't disabling which-function-mode in Python commit 5d8e096 Merge: 61e713c 7a5e798 Author: Caleb Epstein <[email protected]> Date: Mon May 11 08:44:26 2015 -0400 Merge branch 'master' of https://github.com/bbatsov/prelude * 'master' of https://github.com/bbatsov/prelude: Track upstream changes in avy Replace ace-jump-mode with avy Enable the mode in a definite way Improve slime repl Fixed the problem with ido/untabify defadvice triggering got redefined error commit 61e713c Author: Caleb Epstein <[email protected]> Date: Mon May 11 08:42:46 2015 -0400 Brute force disable flycheck and smartparens commit 9c25f73 Merge: 73992ed dbfe0df Author: Caleb Epstein <[email protected]> Date: Tue Apr 7 15:49:10 2015 -0400 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 commit 73992ed Merge: 10098ab 5d25782 Author: Caleb Epstein <[email protected]> Date: Wed Mar 25 10:54:07 2015 -0400 Merge branch 'master' of https://github.com/bbatsov/prelude * 'master' of https://github.com/bbatsov/prelude: (28 commits) 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 [Fix bbatsov#798] Prompt for confirmation in prelude-kill-other-buffers Use gfm-mode instead of plain markdown-mode Switch the bindings for zop-to-char and zop-up-to-char Add the zop-to-char package Minor README tweak - Gittip is now Gratipay Warn if the modules file is missing Require imenu for prelude-goto-symbol `turn-on-eldoc-mode' is an obsolete command (as of 24.4); use `eldoc-mode' instead. Use K&R as default style Revert "[Fix bbatsov#782] Added magit-filenotify" Remove fringe size customization ... commit 10098ab Author: Caleb Epstein <[email protected]> Date: Wed Mar 25 10:53:00 2015 -0400 Get rid of undo-tree and hideshowvis commit 4dff9fc Merge: 417da78 157aff9 Author: Caleb Epstein <[email protected]> Date: Mon Jan 12 10:55:17 2015 -0500 Merge branch 'master' of https://github.com/bbatsov/prelude * 'master' of https://github.com/bbatsov/prelude: Don't create already existed directories Fix condition for "if prelude alredy installed" commit 417da78 Merge: 9cb1336 9cb8824 Author: Caleb Epstein <[email protected]> Date: Fri Jan 9 09:13:25 2015 -0500 Merge branch 'master' of https://github.com/bbatsov/prelude * 'master' of https://github.com/bbatsov/prelude: Reflect flx upstream variable name fix. autosave undo history Auto install protobuf-mode commit 9cb1336 Author: Caleb Epstein <[email protected]> Date: Wed Jan 7 09:07:37 2015 -0500 Merge branch 'master' of https://github.com/bbatsov/prelude * 'master' of https://github.com/bbatsov/prelude: Reflect flx upstream variable name fix. autosave undo history Auto install protobuf-mode commit 7224d35 Author: Caleb Epstein <[email protected]> Date: Wed Jan 7 09:05:43 2015 -0500 Bind function keys for compile, vc-mode commit c6d5700 Merge: 2969cce 76c2e99 Author: Caleb Epstein <[email protected]> Date: Mon Dec 22 13:35:41 2014 -0500 Merge remote-tracking branch 'bbatsov/master' * bbatsov/master: (72 commits) [Close bbatsov#547] Removed ack-and-a-half from prelude [Fix bbatsov#623] Restored kill-region defadvice [Fix bbatsov#753] Add a note for helm-M-x [Fix bbatsov#756] Added helm-ag to auto install list elixir module Update default opam commands to newest syntax Setup the new flycheck-ocaml syntax checker Update copyright years Install SLIME from MELPA Added helper to open file with emacsclient using filename:line path Add prelude-term-buffer-name variable Disable helm-quick-update Bind info-display-manual to C-h C-i Remove custom erc notifications code helm-every-where takes responsibility for buffers-list Update prelude-packages.el Update README.md Use new melpa.org address Improve ocaml module documentation Have tuareg mode set the compile command ... Conflicts: README.md core/prelude-editor.el modules/prelude-css.el modules/prelude-helm-everywhere.el modules/prelude-helm.el modules/prelude-ocaml.el commit 2969cce Author: Caleb Epstein <[email protected]> Date: Wed Nov 12 13:48:36 2014 -0500 Work changes: ggtags, smex commit e416bb3 Author: Caleb Epstein <[email protected]> Date: Wed Nov 12 13:48:17 2014 -0500 Merge branch 'master' of https://github.com/bbatsov/prelude * 'master' of https://github.com/bbatsov/prelude: (58 commits) Remove custom erc notifications code Update prelude-packages.el Update README.md Use new melpa.org address Improve ocaml module documentation Have tuareg mode set the compile command Fix TOC fix electric-layout-post-self-insert-function autoload Added .kv to auto install list Custom theme via prelude-theme variable exec-path-from-shell-copy-env PYTHONPATH Enable electric-layout-mode only with python-mode In helm-everywhere, bind "C-x C-m" to helm-M-x Add json-mode js2-mode is awesome Clean up prelude-coffee.el Auto install thrift-mode Helm cleanup Leaner Helm config and enable Helm version of Projectile commands remove curly braces from js electric-layout-rules ... commit f2cd4bf Merge: 3bb52d6 12a3fb8 Author: Caleb Epstein <[email protected]> Date: Tue Aug 26 09:01:42 2014 -0400 Merge branch 'master' of https://github.com/bbatsov/prelude * 'master' of https://github.com/bbatsov/prelude: Added M-X to README [Close bbatsov#621] Update documentation and tips for projectile keys Insert magic encoding comment upon save Automatically newline with block start Turn on electric indent mode with python mode Remove two keybinding tips concerning Super Remove the documentation for the <s-g> keybinding Remove the documentation for the <s-x> keybinding Fix Markdown escaping of backslash character. Delete documentation for C-M-h keybinding Associate .elixir files with elixir-mode Redefine C-c C-s to run utop Remove unnecessary autoload call added (interactive-haskell-mode) to enable the use of interactive haskell commands (such as C-c C-l to load file) Fix for ESC -> meta in terminal mode. commit 3bb52d6 Author: Caleb Epstein <[email protected]> Date: Fri Aug 1 16:07:28 2014 -0400 Ya'll snippet, yadig? commit 856167e Merge: c1922b1 c3eac31 Author: Caleb Epstein <[email protected]> Date: Wed Jul 30 18:31:13 2014 -0400 Merge branch 'master' of https://github.com/bbatsov/prelude * 'master' of https://github.com/bbatsov/prelude: Update README A better `prelude-view-url` Fix editing remote unwriteable file Remove hook to activate an apparently obsolete tuareg function Activate company mode support for merlin fixed a bug in prelude-create-scratch-buffer Add the git-timemachine package Add fast math entry methods Company autocompletion for AUCTeX commit c1922b1 Author: Caleb Epstein <[email protected]> Date: Wed Jul 30 18:30:35 2014 -0400 Some time in the saddle with Prelude commit 83a3baa Author: Caleb Epstein <[email protected]> Date: Fri Jul 18 14:50:54 2014 -0400 Grep-not-God commit d20bf96 Merge: 923197b 7b31aad Author: Caleb Epstein <[email protected]> Date: Fri Jul 18 14:50:20 2014 -0400 Merge branch 'master' of https://github.com/bbatsov/prelude * 'master' of https://github.com/bbatsov/prelude: Add basic ocaml setup for prelude Toggle god-local-mode instead of god-mode commit 923197b Author: Caleb Epstein <[email protected]> Date: Fri Jul 18 14:01:00 2014 -0400 Work like a Jerk commit 8c3a08c Author: Caleb Epstein <[email protected]> Date: Wed Jul 16 23:17:46 2014 -0400 Pesky desktop files commit db30a4c Merge: d802311 ef381ed Author: Caleb Epstein <[email protected]> Date: Wed Jul 16 16:28:00 2014 -0400 Merge branch 'master' of https://github.com/bbatsov/prelude * 'master' of https://github.com/bbatsov/prelude: enabled evil-visualstar by default Use the phrase 'open a line' in both tips Minor fix Update the section on Projectile's keybindings [Fix bbatsov#602] Associate .tpl files with web-mode [Fix bbatsov#604] Save only the current buffer on focus lost Add a shorter prefix for all Projectile commands Add god-mode Respect initial-major-mode creating scratch buffer Set buffer mode according to `auto-mode-alist' commit d802311 Author: Caleb Epstein <[email protected]> Date: Wed Jul 16 16:09:40 2014 -0400 Zeroing in on final emacs config commit 88ec0c8 Author: Caleb Epstein <[email protected]> Date: Sat Jul 12 10:51:14 2014 -0400 Personal changes for Prelude
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Editorconfig is a nice way to provide cross editor settings like indentation of files or newlines at the end. Respecting these project specific settings is a good behavior for an editor and makes collaboration much easier.