[Emacs-diffs] master 943f7f9: Spelling fixes

[Paul Eggert]

branch: master
commit 943f7f902ed3d7a5ce00bbb5a9cc60e01607b661
Author: Paul Eggert <address@hidden>
Commit: Paul Eggert <address@hidden>

    Spelling fixes
    
    * configure.ac (bitmapdir): Fix misspelling of bmd_acc.
    * test/automated/coding-tests.el (ert-test-coding-bogus-coding-systems):
    Fix misspelling of nonexistent file name.
---
 configure.ac                          |    2 +-
 lisp/ChangeLog.17                     |    4 ++--
 lisp/net/shr.el                       |    2 +-
 src/xterm.c                           |    2 +-
 test/automated/coding-tests.el        |    2 +-
 test/automated/tabulated-list-test.el |    2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 90c4e12..5b2d9c7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1747,7 +1747,7 @@ else
       bmd_acc="${bmd_acc}:${bmd}/bitmaps"
     fi
   done
-  bitmapdir=${bmdacc#:}
+  bitmapdir=${bmd_acc#:}
 fi
 
 test "${with_ns}" = maybe && test "${opsys}" != darwin && with_ns=no
diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17
index a40f8f3..8a255d7 100644
--- a/lisp/ChangeLog.17
+++ b/lisp/ChangeLog.17
@@ -10383,13 +10383,13 @@
        (todo-move-category): Keep the moved category's name unless the
        file moved to already has a category with that name.  If the
        numerically last category of the source file was moved, make the
-       first category current to avoid selecting a nonexisting category.
+       first category current to avoid selecting a nonexistent category.
        (todo-merge-category): Fix implementation to make merging to a
        category in another file work as documented.  Eliminate now
        insufficient and unnecessary renaming of archive category, correct
        document string accordingly, and clarify it.  If the numerically
        last category of the source file was merged, make the first
-       category current to avoid selecting a nonexisting category.
+       category current to avoid selecting a nonexistent category.
        (todo-archive-done-item): When there are marked items and point
        happens to be on an unmarked item, ignore the latter.  Don't leave
        point below last item after archiving marked items.
diff --git a/lisp/net/shr.el b/lisp/net/shr.el
index 9116e50..58deaea 100644
--- a/lisp/net/shr.el
+++ b/lisp/net/shr.el
@@ -463,7 +463,7 @@ size, and full-buffer size."
                                    ;; Adjust the window width for when
                                    ;; the user disables the fringes,
                                    ;; which causes the display engine
-                                   ;; usurp one coplumn for the
+                                   ;; to usurp one column for the
                                    ;; continuation glyph.
                                    (if (and (null shr-width)
                                             (or (zerop (fringe-columns 'right))
diff --git a/src/xterm.c b/src/xterm.c
index b059566..fcd81a1 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -2215,7 +2215,7 @@ x_query_colors (struct frame *f, XColor *colors, int 
ncolors)
         the 0xff00 we'd get by just zero-filling the lower bits.
 
          We generate a 32-bit scaled-up value and shift it, in case
-         the bit count doesn't divide 16 evently (e.g., when dealing
+         the bit count doesn't divide 16 evenly (e.g., when dealing
          with a 3-3-2 bit RGB display), to get more of the lower bits
          correct.
 
diff --git a/test/automated/coding-tests.el b/test/automated/coding-tests.el
index ebbf896..cda382f 100644
--- a/test/automated/coding-tests.el
+++ b/test/automated/coding-tests.el
@@ -36,7 +36,7 @@
       (let (test-file)
         (or (file-directory-p coding-tests-workdir)
             (mkdir coding-tests-workdir t))
-        (setq test-file (expand-file-name "nonexisting" coding-tests-workdir))
+        (setq test-file (expand-file-name "nonexistent" coding-tests-workdir))
         (if (file-exists-p test-file)
             (delete-file test-file))
         (should-error
diff --git a/test/automated/tabulated-list-test.el 
b/test/automated/tabulated-list-test.el
index 5731db4..9aa62ee 100644
--- a/test/automated/tabulated-list-test.el
+++ b/test/automated/tabulated-list-test.el
@@ -60,7 +60,7 @@
        4clojure   4clojure   1507      obsolete    Open and evaluate 
4clojure.com questions
        abc-mode   abc-mode   944       available   Major mode for editing abc 
music files
        mode       mode       1128      installed   A simple mode for editing 
Actionscript 3 files\n"))
-   ;; Preseve position.
+   ;; Preserve position.
    (forward-line 3)
    (let ((pos (thing-at-point 'line)))
      (pop tabulated-list-entries)