Commit Graph

3019 Commits

Author SHA1 Message Date
Justin M. Keyes
7d5e1db586 Merge #2157 'Minor cleanups' 2015-03-16 11:01:10 -04:00
Anton Ovchinnikov
4fd8c3cbbb Reuse f_browse function from f_browsedir
The bodies of f_browse() and f_browsedir() were identical.
2015-03-16 11:01:09 -04:00
Anton Ovchinnikov
b81ec82533 Remove unnecessary 'free'
from_noamp is always NULL in this branch
2015-03-16 11:01:09 -04:00
Anton Ovchinnikov
76970fe2c1 Clarify an out-of-memory cleanup, remove a function-wide loop counter 2015-03-16 11:01:09 -04:00
Anton Ovchinnikov
53452663cc Remove redundant parentheses 2015-03-16 11:01:08 -04:00
Anton Ovchinnikov
a62a2b6250 Merge consecutive identical 'if' statements 2015-03-16 11:01:08 -04:00
Anton Ovchinnikov
9927e99948 Remove always-true expressions 2015-03-16 11:01:07 -04:00
Michael Reed
08d2f7b562 scripts/vim-patch.sh: Misc. improvements #2108
- Check for mercurial before using it
- Make 'Merging patches...' wiki page easier to copy
- Use `basename` instead of assuming the user is running vim-patch.sh
  via the repo root
- Appease shellcheck by quoting path variables
- Remove unneeded variable quoting inside [[ ]] blocks
- Don't unconditionally 'exit 1'
  '-h' and '--help' are both recognized options, so current behavior is
  misleading.
2015-03-16 11:00:24 -04:00
Justin M. Keyes
3946810d54 Merge #2074 'Migrate legacy test 19 and 89' 2015-03-16 10:55:21 -04:00
Gustaf Lindstedt
6511c24af8 legacy tests: migrate test19 2015-03-16 10:54:49 -04:00
Gustaf Lindstedt
311f09e20f legacy tests: migrate test89 2015-03-16 10:54:36 -04:00
Thiago de Arruda
f6d4bfd51b Merge PR #2164 'Small changes to ui_busy functions and testing' 2015-03-16 10:59:29 -03:00
Thiago de Arruda
1d80c0e3a0 ui: Only call ui_flush when the busy state changes
Also add back the `ui_flush` call to `get_keystroke`. Its necessary to display
prompt messages correctly.
2015-03-16 08:35:43 -03:00
Thiago de Arruda
5199456471 test: Only display cursor marker in screen tests if nvim is not busy 2015-03-16 08:29:57 -03:00
Thiago de Arruda
7eee9c2a22 Put gitter badge near other badges 2015-03-16 08:14:00 -03:00
The Gitter Badger
4f162a95e6 Added Gitter badge 2015-03-16 11:07:26 +00:00
Thiago de Arruda
9af193bc5c deps: Replace cp by ${CMAKE_COMMAND} -E copy for portability 2015-03-15 14:31:03 -03:00
Thiago de Arruda
c546875daf ui: Replace cursor_{on,off} by busy_{stop,start}
Switching cursor off is only necessary in two occasions:

- When redrawing to avoid terminal flickering
- When the editor is busy

The first can now be handled by the TUI, so most calls to ui_cursor_off can be
removed from the core.

So, before this commit it was only necessary to switch the cursor off to notify
the user that nvim was running some long operation. Now the cursor_{on,off}
functions have been replaced by busy_{stop,start} which can be handled in a
UI-specific way(turning the cursor off or showing a busy indicator, for
example).

To make things even more simpler, nvim is always busy except when waiting for
user input or other asynchronous events: It automatically switches to a non-busy
state when the event loop is about to be entered for more than 100 milliseconds.

`ui_busy_start` can be called when its not desired to change the busy state in
the event loop (As its now done by functions that perform blocking shell
invocations).
2015-03-15 10:30:59 -03:00
Thiago de Arruda
dbe719317c deps: Add utfTerminalDetailed busted output handler
This is a variant of the utfTerminal output handler that will:

- Output the file name before each suite is executed
- Output the test name before each test is executed

This will make it simpler to identify crashing/hanging tests.
2015-03-15 09:13:26 -03:00
John Szakmeister
70b7ba0ccb Merge pull request #2154 from lyuts/build_custom_libtermkey
Fixed compilation when using custom libtermkey (not installed in base system).
2015-03-15 07:19:23 -04:00
lyuts
862d687fea Fixed compilation when using custom libtermkey (not installed in base
system).
2015-03-15 00:11:10 -07:00
Justin M. Keyes
3e9ca91ff6 Merge #2138 'syntax.c: Prevent use after free for variable g:colors_name' 2015-03-13 17:29:25 -04:00
oni-link
0d8a10f6c5 vim-patch: mark 7.4.660 as included
refs #2138

vim-patch: https://code.google.com/p/vim/source/detail?r=476a12a96bb1e5ccc71b1c1010d529deca271617
2015-03-13 17:27:44 -04:00
oni-link
a916696a13 syntax.c: Prevent use after free for variable g:colors_name.
ASan spotted a problem when using 'set background={light,dark}' with
color scheme solarized.
While loading the colors for color scheme 'g:colors_name', the pointer
on the value for this variable can become invalid, because of an 'unlet
colors_name' (part of an :highlight clear, syntax.c:6173).

To prevent the use of the freed value, decouple the value from
'g:colors_name' before calling load_colors() with it.
2015-03-13 17:26:54 -04:00
Lech Lorens
bdbbdb5888 vim-patch:7.4.637 #2126
Problem:    Incorrectly read the number of buffer for which an autocommand
            should be registered.
Solution:   Reverse check for "<buffer=abuf>". (Lech Lorens)

https://code.google.com/p/vim/source/detail?r=v7-4-637
2015-03-13 17:25:04 -04:00
John Szakmeister
dda914fd6a build: fix a missing reference to libunibilium missed in #2125 2015-03-13 16:26:13 -04:00
John Szakmeister
59fca5b482 Merge pull request #2125 from jszakmeister/fix-whitespace-third-party
third-party: fix whitespace and naming
2015-03-13 15:59:41 -04:00
John Szakmeister
c015eabe13 Merge pull request #2118 from rev112/fix_redundant_cast
Remove redundant casts
2015-03-13 07:09:08 -04:00
Justin M. Keyes
b5bb6269b0 Merge #2008 'Special interfaces cleanup' 2015-03-12 21:59:33 -04:00
Michael Reed
29ad67dd47 gitignore: add /src/nvim/testdir/del
refs #1875
2015-03-12 20:04:26 -04:00
Michael Reed
2d11eba6fd Interface cleanup: Man pages 2015-03-12 20:04:26 -04:00
Michael Reed
481ebc0bb1 Interface cleanup: Symlink handling & docs
This removes the ability to start nvim via the following aliases in
favor of just using their command line arguments:

ex        vim -e
exim      vim -E
view      vim -R
gvim      vim -g
gex       vim -eg
gview     vim -Rg
rvim      vim -Z
rview     vim -RZ
rgvim     vim -gZ
rgview    vim -RgZ

This also removes Vi mode (-v) for consistency. From ':help -v':

    -v  Start Ex in Vi mode.  Only makes a difference when the
    executable is called "ex" or "gvim".  For gvim the GUI is not
    started if possible.
2015-03-12 20:04:26 -04:00
Michael Reed
5fcd12f8b5 vim-patch: mark 7.4.615 as included #2109
refs #1761

Original vim patch: http://ftp.vim.org/vim/patches/7.4/7.4.615
2015-03-12 19:24:21 -04:00
John Szakmeister
74531e50dc Merge pull request #2114 from oni-link/remove.assert
Fixes for two compiler warnings
2015-03-12 07:24:15 -04:00
Michael Reed
032c20078a os_unix_defs && os/unix_defs: Consistently use '~' over '$HOME' #2009
these path names are ridiculous...

Based on #889, but also remove some unused #defines
2015-03-11 18:32:58 -04:00
Justin M. Keyes
1e6c487488 Merge pull request #2129 from justinmk/fixlegacytest005
Fix some legacy tests
2015-03-11 02:20:17 -04:00
Justin M. Keyes
3de0f5654b tests: fix 005_bufleave_delete_buffer_spec.lua
- After _spec suffix was added so busted could find the test, it failed.
- The original legacy test wrote to a "test.out", but the new test uses
  register @A.
- Original test did not contain 1d and new test shouldn't either.

ref c152cdd0f3
2015-03-11 01:47:38 -04:00
Justin M. Keyes
f8f07891e7 tests: add missing "_spec" suffix 2015-03-11 00:56:53 -04:00
Justin M. Keyes
7c29aa1060 Merge #2029 'migrate legacy tests' 2015-03-11 00:33:02 -04:00
Rainer Borene
c9fefe2a74 legacy tests: migrate test84 2015-03-11 00:22:23 -04:00
Rainer Borene
126b169f99 legacy tests: migrate test91 2015-03-11 00:22:23 -04:00
Rainer Borene
1e4a5f878f legacy tests: migrate test90 2015-03-11 00:22:23 -04:00
Rainer Borene
a1aacb2a32 legacy tests: migrate test95 2015-03-11 00:22:23 -04:00
Rainer Borene
2cfecf5420 legacy tests: migrate test15 2015-03-11 00:22:23 -04:00
Rainer Borene
0099f6148c legacy tests: migrate test_listlbr_utf8 2015-03-11 00:22:23 -04:00
Rainer Borene
0f97f52ded legacy tests: migrate test98 2015-03-11 00:22:22 -04:00
Rainer Borene
9c40721ea4 legacy tests: migrate test103 2015-03-11 00:22:22 -04:00
Rainer Borene
05fcce3896 legacy tests: migrate test_qf_title 2015-03-11 00:00:22 -04:00
Rainer Borene
b18cd63260 legacy tests: migrate test100 2015-03-11 00:00:22 -04:00
John Szakmeister
f7332273cc third-party: change all references to libunibilium to just unibilium 2015-03-10 18:38:41 -04:00