3 files changed, 4 insertions, 4 deletions

diff --git a/src/callproc.c b/src/callproc.c
index 07297820cac..7008b916dad 100644
--- a/src/callproc.c
+++ b/src/callproc.c
@@ -1094,7 +1094,7 @@ add_env (char **env, char **new_env, char *string)
       char *p = *ep, *q = string;
       while (ok)
         {
-          if (*q != *p)
+          if (*p && *q != *p)
             break;
           if (*q == 0)
             /* The string is a lone variable name; keep it for now, we
diff --git a/src/fns.c b/src/fns.c
index 731f0a899a9..dbee33aa9f8 100644
--- a/src/fns.c
+++ b/src/fns.c
@@ -226,7 +226,7 @@ Like in `substring', negative values are counted from the end.
 The strings are compared by the numeric values of their characters.
 For instance, STR1 is "less than" STR2 if its first differing
 character has a smaller numeric value.  If IGNORE-CASE is non-nil,
-characters are converted to lower-case before comparing them.  Unibyte
+characters are converted to upper-case before comparing them.  Unibyte
 strings are converted to multibyte for comparison.
 
 The value is t if the strings (or specified portions) match.
diff --git a/src/minibuf.c b/src/minibuf.c
index 7bad6f0e018..efce7e26b29 100644
--- a/src/minibuf.c
+++ b/src/minibuf.c
@@ -1838,8 +1838,8 @@ DEFUN ("assoc-string", Fassoc_string, Sassoc_string, 2, 3, 0,
 This returns the first element of LIST whose car matches the string or
 symbol KEY, or nil if no match exists.  When performing the
 comparison, symbols are first converted to strings, and unibyte
-strings to multibyte.  If the optional arg CASE-FOLD is non-nil, case
-is ignored.
+strings to multibyte.  If the optional arg CASE-FOLD is non-nil, both
+KEY and the elements of LIST are upcased for comparison.
 
 Unlike `assoc', KEY can also match an entry in LIST consisting of a
 single string, rather than a cons cell whose car is a string.  */)