summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--Doc/Zsh/compsys.yo4
-rw-r--r--Src/input.c2
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index a5a09fc71..c35377cdc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-09  Daniel Shahaf  <d.s@daniel.shahaf.name>
+
+	* 40117: Doc/Zsh/compsys.yo, Src/input.c: Revert a hunk of
+	40035 that changed semantics incorrectly.
+
 2016-12-09  Peter Stephenson  <p.stephenson@samsung.com>
 
 	* unposted: Test/D07multibyte.ztst: minor typos.
diff --git a/Doc/Zsh/compsys.yo b/Doc/Zsh/compsys.yo
index 60ef9ee2c..ceb98c7bc 100644
--- a/Doc/Zsh/compsys.yo
+++ b/Doc/Zsh/compsys.yo
@@ -144,8 +144,8 @@ directory mentioned in the tt(fpath) parameter, and should be autoloaded
 few utility functions, arrange for all the necessary shell functions to be
 autoloaded, and will then re-define all widgets that do completion to use the
 new system.  If you use the tt(menu-select) widget, which is part of the
-tt(zsh/complist) module, you should make sure that the module is loaded
-before the call to tt(compinit) so that the widget is also
+tt(zsh/complist) module, you should make sure that that module is loaded
+before the call to tt(compinit) so that that widget is also
 re-defined.  If completion styles (see below) are set up to perform
 expansion as well as completion by default, and the TAB key is bound to
 tt(expand-or-complete), tt(compinit) will rebind it to tt(complete-word);
diff --git a/Src/input.c b/Src/input.c
index fe94b8ef7..eb968ea72 100644
--- a/Src/input.c
+++ b/Src/input.c
@@ -51,7 +51,7 @@
  * Note that the input string is itself used as the input buffer: it is not
  * copied, nor is it every written back to, so using a constant string
  * should work.  Consequently, when passing areas of memory from the heap
- * it is necessary that the heap last as long as the operation of reading
+ * it is necessary that that heap last as long as the operation of reading
  * the string.  After the string is read, the stack should be popped with
  * inpop(), which effectively flushes any unread input as well as restoring
  * the previous input state.