aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/undo.c
diff options
context:
space:
mode:
authorJustin M. Keyes <justinkz@gmail.com>2017-02-27 09:59:58 +0100
committerGitHub <noreply@github.com>2017-02-27 09:59:58 +0100
commite502cca010357773252c686ef535bb2998aeb50b (patch)
tree8533cb3229c0de3e8e99b9ce1aff5660fa91277a /src/nvim/undo.c
parent73a054d84427191f70ea59fc6dc34314b28ad07c (diff)
parentc484323dc67fbca10a2f3da3d6e65efdb3c678c3 (diff)
downloadrneovim-e502cca010357773252c686ef535bb2998aeb50b.tar.gz
rneovim-e502cca010357773252c686ef535bb2998aeb50b.tar.bz2
rneovim-e502cca010357773252c686ef535bb2998aeb50b.zip
Merge #6142 from justinmk/term-modifiable
terminal: 'modifiable'; 'scrollback'; follow output only if cursor is on last line
Diffstat (limited to 'src/nvim/undo.c')
-rw-r--r--src/nvim/undo.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/src/nvim/undo.c b/src/nvim/undo.c
index 8cedfcb905..c95a795587 100644
--- a/src/nvim/undo.c
+++ b/src/nvim/undo.c
@@ -305,16 +305,12 @@ bool undo_allowed(void)
return true;
}
-/*
- * Get the undolevle value for the current buffer.
- */
+/// Get the 'undolevels' value for the current buffer.
static long get_undolevel(void)
{
- if (curbuf->terminal) {
- return -1;
- }
- if (curbuf->b_p_ul == NO_LOCAL_UNDOLEVEL)
+ if (curbuf->b_p_ul == NO_LOCAL_UNDOLEVEL) {
return p_ul;
+ }
return curbuf->b_p_ul;
}