Merge remote-tracking branch 'origin/master' into feature/android

3 files changed, 3 insertions, 3 deletions

diff --git a/src/ccl.c b/src/ccl.c
index c92684f4bc7..6e780ef9f0c 100644
--- a/src/ccl.c
+++ b/src/ccl.c
@@ -1987,7 +1987,7 @@ ccl_get_compiled_code (Lisp_Object ccl_prog, ptrdiff_t *idx)
 /* Setup fields of the structure pointed by CCL appropriately for the
    execution of CCL program CCL_PROG.  CCL_PROG is the name (symbol)
    of the CCL program or the already compiled code (vector).
-   Return true iff successful.
+   Return true if successful.
 
    If CCL_PROG is nil, just reset the structure pointed by CCL.  */
 bool
diff --git a/src/keyboard.c b/src/keyboard.c
index 306fea354e2..990b5307f14 100644
--- a/src/keyboard.c
+++ b/src/keyboard.c
@@ -10128,7 +10128,7 @@ read_key_sequence (Lisp_Object *keybuf, Lisp_Object prompt,
 
       if (/* first_unbound < indec.start && first_unbound < fkey.start && */
           first_unbound < keytran.start)
-        { /* The prefix upto first_unbound has no binding and has
+        { /* The prefix up to first_unbound has no binding and has
              no translation left to do either, so we know it's unbound.
              If we don't stop now, we risk staying here indefinitely
              (if the user keeps entering fkey or keytran prefixes
diff --git a/src/regex-emacs.c b/src/regex-emacs.c
index 6b2fa5df037..2dca0d16ad9 100644
--- a/src/regex-emacs.c
+++ b/src/regex-emacs.c
@@ -223,7 +223,7 @@ typedef enum
            is followed by a range table:
                2 bytes of flags for character sets (low 8 bits, high 8 bits)
                    See RANGE_TABLE_WORK_BITS below.
-               2 bytes, the number of pairs that follow (upto 32767)
+               2 bytes, the number of pairs that follow (up to 32767)
                pairs, each 2 multibyte characters,
                    each multibyte character represented as 3 bytes.  */
   charset,