Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

resolved conflict #3

Merged
merged 1,644 commits into from
Jun 9, 2016
Merged

resolved conflict #3

merged 1,644 commits into from
Jun 9, 2016

Conversation

osamu2001
Copy link

Is this branch working state?

maxigit and others added 30 commits May 5, 2016 12:57
This fix the bug when errors are not being filtered in error list or
`flycheck-navigation-minimum-level` not taken into account.
the prefix on the README didn't correspond to the real keybindings on the package.el
Introduce a variable spacemacs-large-file-modes-list to determine these
modes.
Visiting the dump file before writing to it is slow, because it triggers
all the regular actions that happen when a user opens a file, e.g.
enable major mode and minor modes. We don't need all that,
with-temp-file is what we really want.
Add syntax checking section and improve FAQ so solve syntax checker problems.
Also:
- don't pad drawer surround with extra newlines
- upcase the drawer surround as per org conventions
default to disabled to follow vim's behavior.

fixes syl20bnr#5273
- Rename mode to state (preferred nomenclature in evil)
- Change default value
- Add to dotspacemacs template
- Fix parens
Bracketed paste is built into emacs 25+
Also fix the actual expression :-)
Adds a binding to gtags which opens the found tag in another window
similar to gg and gG.
This commit introduces two new options to add-toggle:

:prefix, a symbol that is bound to the raw prefix argument (as
in `(interactive "P") forms).

:on-message, an expression overriding the default 'on' toggle
message (useful to document a toggle's argument).

These new options are applied to long-lines' toggle, so we can choose
how many lines to toggle it on via a raw prefix argument.
TheBB and others added 28 commits June 6, 2016 09:01
This function is already being called when setting a theme, if it
exists.
(In vim style) this leaves the `n` to its usual binding to repeat the
last search which is much more practical when searching for package to
install.

elm-package-next / elm-packge-previous don't seem to do much more than
move to next/previous line so not much functionality is lost.
…ecs for a

specific directory.

This commit creates a 'ruby/rspec-verify-directory command, which
prompts for a directory and runs rspec on it. This command is bound to
ruby-modes' keymaps under the "td" keybinding.
…ebugger

This commit adds the 'inf-ruby-auto-enter method to
'compilation-filter-hook, automatically entering inf-ruby-mode when it
hits a breakpoint (see the
[inf-ruby-manual](https://github.com/nonsequitur/inf-ruby/#manual) for
more details).

The hook is added locally to the rspec-compilation-mode-hook to avoid
global slowdown, as the compilation-filter-hook is called whenever a
new line is entered.
Invoking "make" or "project compilation" (<kbd>SPC c m</kbd>, <kbd>SPC c
c</kbd>) is currently not supported in ivy mode. The PR re-enables them
by adding helm-make to the ivy packages with ivy completion method.
jabber has the annoying habit of overwriting the mini-buffer with status
messages
# Conflicts:
#	layers/+lang/php/packages.el
@kostajh
Copy link
Owner

kostajh commented Jun 9, 2016

hi @osamu2001, I haven't worked on the php layer in a long time. I think we could start over... meanwhile I'll merge your PR.

@kostajh kostajh merged commit 106ea24 into kostajh:php-layer-improvements Jun 9, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet