Commit Graph

4408 Commits

Author SHA1 Message Date
Justin M. Keyes
dd087ea9c9 Merge pull request #3607 from ZyX-I/fix-3605
undo: Remove incorrect NONNULL_ALL attribute
2015-11-05 16:29:27 -05:00
ZyX
96dc38b3c8 undo: Remove incorrect NONNULL_ALL attribute
Fixes #3605
2015-11-05 23:34:48 +03:00
John Szakmeister
e19f1c5491 Merge pull request #3599 from jszakmeister/fix-python-detection
Ensure a session is running before attempting to do Python detection.
2015-11-04 06:34:41 -05:00
John Szakmeister
690df9333a Ensure a session is running before attempting to do Python detection. 2015-11-04 05:01:22 -05:00
Justin M. Keyes
4196d0b983 Merge pull request #3590 from blueyed/fix-python-provider-finish
runtime/autoload/provider/python{,3}.vim: fix E168
2015-11-03 19:08:44 -05:00
Daniel Hahler
dcc71094d1 runtime/autoload/provider/python{,3}.vim: fix E168
Do not use `finish` inside of `provider#python{,3}#Call`, but `return`.
2015-11-03 16:52:26 +01:00
Justin M. Keyes
ea4b8f9c8f Merge pull request #3584 from justinmk/gitdescribe
build: Use `git describe` for version strings.
2015-11-03 09:28:54 -05:00
Justin M. Keyes
d0401b04a4 build: Use git describe for version strings.
When building in a git repo:
  - If HEAD corresponds to an annotated tag, (i.e. git_get_exact_tag()
    returns truthy) the current build is considered a "release" build:
    NVIM_VERSION_MEDIUM is directly assigned the tagged version name,
    and NVIM_VERSION_* defines are ignored.
  - If HEAD is not a tagged release, then NVIM_VERSION_MEDIUM is
    directly assigned the result of `git describe`.

If git (or the repo) is not available:
  - The NVIM_VERSION_* defines are used to define NVIM_VERSION_MEDIUM.

Sample outputs for `nvim --version` and `nvim +version`:

    Building with git @ non-tagged commit e66df14:
      NVIM v0.1.0-1-ge66df14 (compiled Nov  1 2015 19:10:30)
      Commit: e66df148f9401be17adab324a6e41d927aae20b3

    Building with git @ v0.1.1 tag:
      NVIM v0.1.1 (compiled Nov  1 2015 19:03:52)
      [no "Commit:" line]

    Building this commit _not_ in a git repo:
      NVIM 0.1.0-dev (compiled Nov  1 2015 19:16:11)
      [no "Commit:" line]
2015-11-01 21:31:29 -05:00
Justin M. Keyes
c4826c3003 Nvim 0.1.0 2015-11-01 16:16:38 -05:00
Justin M. Keyes
6a5126dd42 Merge pull request #3583 from Pyrohh/browse
Remove useless FEAT_BROWSE ifdef
2015-11-01 15:24:19 -05:00
Michael Reed
0c54dc5528 Remove useless FEAT_BROWSE ifdef
The only thing this affected was the return value of
has('browsefilter').
2015-11-01 14:36:23 -05:00
Justin M. Keyes
4a0c0fd321 Nvim 0.1.0 2015-11-01 14:23:40 -05:00
Justin M. Keyes
a2b8d7cdba Merge 'CMake: Prepare for releases.' 2015-11-01 14:09:05 -05:00
Florian Walch
90909e9362 CMake: Force use of project directory to look for Git data.
Before this change, building Neovim would recursively search parent
directories for a .git directory. If Neovim was downloaded as a tarball
(i.e. without a .git directory), but placed in a subdirectory of
a Git repository, this caused a CMake error. Such a situation could
occur when packaging Neovim, for example.

Unfortunately, the previous attempt in #3317 did not fix this problem.
2015-11-01 16:19:52 +01:00
Florian Walch
a83020922d version: Prepare for releases.
* Hide commit information from --version if we can't find any (e.g. when
  building from tarball).

To define a release in CMake, set NVIM_VERSION_PRERELEASE to "".
This will modify --version output to:

    * Show annotated Git tag instead of commit hash (NVIM_VERSION_COMMIT).
    * Hide commit date (NVIM_VERSION_BUILD).
2015-11-01 15:41:36 +01:00
Florian Walch
cb87ea7e82 CMake: Disable logging for release build types.
These are: Release, MinSizeRel, and RelWithDebInfo.

Closes #2913.
2015-11-01 15:41:36 +01:00
Florian Walch
87e5a41316 CMake: Add custom Dev build type.
Introduce new build type Dev that replaces RelWithDebInfo for development
builds off master and has optimizations, debug info, and logging enabled.
Keep assertions enabled for RelWithDebInfo.
2015-11-01 15:41:36 +01:00
Michael Reed
2e4baa9ae4 Merge pull request #3578 from Pyrohh/gitignore
Update .gitignore
2015-10-31 14:23:17 -04:00
Michael Reed
980359c7f1 Update .gitignore
- the man stuff hasn't been needed since 0086c0a
- "runtime/doc/tags" is already covered by "tags"
2015-10-31 14:21:04 -04:00
Michael Reed
48f67d3816 Merge pull request #3570 from srobbibaro/srobbibaro/doc-update
[RFC] Update terminal documentation for clarity
2015-10-31 13:45:45 -04:00
Steve Robbibaro
cd67c3bacd Update terminal documentation for clarity
A couple lines tripped me up while reading through this document for the first
time. This change aims to reword/rework these areas, so that they are clearer
on the first read.
2015-10-31 09:09:18 -04:00
Thiago de Arruda
0dac666098 ui_bridge: Fix race condition that results in deadlock.
Fixed by waiting until the UI thread finishes processing events. Close #3541.
2015-10-31 08:03:49 -03:00
Justin M. Keyes
ef1d39bbbf Merge pull request #3572 from Pyrohh/os_getenv
os/fs.c: Convert stray getenv() to os_getenv()
2015-10-31 03:22:05 -04:00
Michael Reed
3f8a2faff4 os/fs.c: Convert stray getenv() to os_getenv()
This is the last direct getenv() call in the tree (besides the one in
os_getenv()); most of the work was already done in [1].

[1]: 412d246be7
2015-10-31 02:05:58 -04:00
Michael Reed
e1bc792403 Merge pull request #3550 from Pyrohh/docs-os-unix
[RFC] doc: Remove os_unix.txt
2015-10-31 01:52:06 -04:00
Michael Reed
06c2057a0e doc: Fix lint warning
found with `gmake html'
2015-10-31 01:28:43 -04:00
Michael Reed
247041886f doc: Nuke os_unix.txt
All of this information is a combination of incorrect, outdated, or
redundant given its availability in other help files.

Reviewed-by: Justin M. Keyes <justinkz@gmail.com>
Reviewed-by: Felipe Morales <hel.sheep@gmail.com>
2015-10-31 01:25:08 -04:00
Justin M. Keyes
a48949a3da Update README.md 2015-10-30 22:33:28 -04:00
Justin M. Keyes
d1cfaa0a55 Merge pull request #3553 from ZyX-I/fix-xdg-2
Some more fixes to XDG code
2015-10-30 12:45:34 -04:00
ZyX
10080366b8 documentation: Fix &undodir default 2015-10-30 17:42:54 +03:00
Justin M. Keyes
4abf108f46 Merge pull request #3556 from Pyrohh/local-mk-update
contrib/local.mk.example: Mention ENABLE_JEMALLOC
2015-10-29 21:10:07 -04:00
Michael Reed
8ef2bb5366 contrib/local.mk.example: Mention ENABLE_JEMALLOC
This doesn't prevent compilation of jemalloc, but the important thing is
that it prevents it being used in nvim.

refs 6cd20177df
refs 95707bf336
2015-10-29 16:19:34 -04:00
Thiago de Arruda
6cd20177df build: Set the default value of ENABLE_JEMALLOC to ON
Restoring the default which was changed by #3515.
2015-10-29 14:51:56 -03:00
ZyX
ffdf9399ba undo: Automatically create undo directory if needed 2015-10-29 19:34:26 +03:00
ZyX
d99941777d undo: Do some refactoring
Specifically refactor u_get_undo_file_name which will be modified to
automatically create undo directory and replace `char_u` with `char` in some of
the related functions.
2015-10-29 19:34:25 +03:00
ZyX
1af15494c2 stdpaths: Document that stdpaths_*_subpath is not returning NULL 2015-10-29 19:34:25 +03:00
ZyX
baf032834a stdpaths: Use NULL in place of empty strings 2015-10-29 19:34:25 +03:00
ZyX
0bcc2bf126 option: Add current directory to &backupdir option
Fixes #3496
2015-10-29 19:34:24 +03:00
Thiago de Arruda
58962d89c8 Merge PR #3546 'Fix some regressions' 2015-10-29 10:06:05 -03:00
Thiago de Arruda
c2185833e8 tui: Don't use stderr as an output fallback for the TUI
Ref: https://github.com/neovim/neovim/issues/3547#issuecomment-152156639
2015-10-29 09:09:05 -03:00
Thiago de Arruda
7e8b431d3f tui: Fix abort when stdout and stderr are not tty.
The abort came from using libuv tty handle on non-tty fd. Use uv_pipe_t in these
cases. Also add simple test for this case.
2015-10-29 08:13:45 -03:00
Thiago de Arruda
7dae3ad24d os/input.c: Fix assertion in create_cursorhold_event
The assertion now considers the case where events are disabled.
2015-10-29 07:47:48 -03:00
Justin M. Keyes
98b5ec565b Merge pull request #3554 from ovidiu/fix-exrc-option
Fix the 'exrc' option
2015-10-28 23:24:55 -04:00
Ovidiu Curcan
dbef4111ed Fix 'exrc' option
`do_user_initialization()` ignored changes to the value of the `exrc` option
caused by the processing of environment variables or sourcing of files.
2015-10-29 02:28:07 +01:00
Justin M. Keyes
dc8b0c47b1 Merge pull request #3540 from fmoralesc/fix-spellfile
spellfile: follow the XDG spec
2015-10-28 09:52:49 -04:00
Felipe Morales
6b6f018f84 spellfile: follow the XDG spec
Closes #3535
2015-10-28 14:46:00 +01:00
Justin M. Keyes
454b087dda Merge pull request #3539 from jszakmeister/js/use-updated-busted
Remove our cliargs workaround use 2.0.rc11 of Busted.
2015-10-28 08:26:14 -04:00
John Szakmeister
e34ae35d10 Remove our cliargs workaround use 2.0.rc11 of Busted.
Busted now correctly excludes the 3.0 line of cliargs.
2015-10-28 03:12:48 -04:00
Justin M. Keyes
2394a1aeee Merge pull request #3528 from Grimy/directory-last-char
option: fix off-by-one error when handling &directory
2015-10-27 22:08:34 -04:00
Justin M. Keyes
e6525f3ceb Merge pull request #3525 from jszakmeister/fix-busted-dependency
Update busted to pick up the CLI fix.
2015-10-27 14:20:06 -04:00