Bram,
here are two small patches:
1) edit.patch: fixes a comment. This is so tiny, that it doesn't deserve
its own patch number.
2) getchar.patch: makes sure, that typebuf.tb_no_abbr_cnt is only set if
the ins_typebuf() function was called with the noremap argument being
non-zero. This actually fixes a problem I see with writing
test_edit.vim because otherwise using feekdeys('str') might not
expand abbreviations which was unexpected for me.
Best
Christian
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
diff --git a/src/edit.c b/src/edit.c
index 6fc1e35ac..27d4ebf1d 100644
--- a/src/edit.c
+++ b/src/edit.c
@@ -542,7 +542,7 @@ edit(
/*
* Handle restarting Insert mode.
* Don't do this for "CTRL-O ." (repeat an insert): we get here with
- * restart_edit non-zero, and something in the stuff buffer.
+ * restart_edit non-zero, and nothing in the stuff buffer.
*/
if (restart_edit != 0 && stuff_empty())
{
diff --git a/src/getchar.c b/src/getchar.c
index 9583d9a8f..874f80f13 100644
--- a/src/getchar.c
+++ b/src/getchar.c
@@ -1076,7 +1076,8 @@ ins_typebuf(
typebuf.tb_silent += addlen;
cmd_silent = TRUE;
}
- if (typebuf.tb_no_abbr_cnt && offset == 0) /* and not used for abbrev.s */
+ if (typebuf.tb_no_abbr_cnt && offset == 0 && !noremap)
+ /* and not used for abbrev.s */
typebuf.tb_no_abbr_cnt += addlen;
return OK;
