summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2014-03-02 21:12:12 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2014-03-02 21:12:12 -0800
commitfbaddd63ab38480b0da0435eb577137ae0ae8a99 (patch)
tree31be3e6b9c145ebff1409f10268ab921bf7394ad
parent35e951cd4bee5ef9c4e3158bd7cf13c24fc4b099 (diff)
downloademacs-fbaddd63ab38480b0da0435eb577137ae0ae8a99.tar.gz
Spelling fixes.
-rw-r--r--doc/emacs/basic.texi6
-rw-r--r--test/automated/tramp-tests.el2
2 files changed, 4 insertions, 4 deletions
diff --git a/doc/emacs/basic.texi b/doc/emacs/basic.texi
index f2ec11c2c1e..c0a93c9396d 100644
--- a/doc/emacs/basic.texi
+++ b/doc/emacs/basic.texi
@@ -46,12 +46,12 @@ forward, so that point remains just after the inserted text.
To end a line and start a new one, type @key{RET} (@code{newline}).
(The @key{RET} key may be labeled @key{Return} or @key{Enter} on your
keyboard, but we refer to it as @key{RET} in this manual.) This
-command inserts a newline character into the buffer, then indent
-(@pxref{Indentation}) accroding to major mode. If point is at the end
+command inserts a newline character into the buffer, then indents
+(@pxref{Indentation}) according to the major mode. If point is at the end
of the line, the effect is to create a new blank line after it and
indent the new line; if point is in the middle of a line, the line is
split at that position. To turn off the auto-indentation, you can
-either desable Electric Indent mode (@pxref{Indent Convenience}) or
+either disable Electric Indent mode (@pxref{Indent Convenience}) or
type @kbd{C-j}, which inserts just a newline, without any
auto-indentation.
diff --git a/test/automated/tramp-tests.el b/test/automated/tramp-tests.el
index 25cd0c6a96d..02473f4c63f 100644
--- a/test/automated/tramp-tests.el
+++ b/test/automated/tramp-tests.el
@@ -869,7 +869,7 @@ This tests also `file-readable-p' and `file-regular-p'."
(skip-unless (tramp--test-enabled))
;; `directory-files-and-attributes' contains also values for "../".
- ;; We must nesure, that this doesn't change during tests, for
+ ;; Ensure that this doesn't change during tests, for
;; example due to handling temporary files.
(let* ((tmp-name1 (tramp--test-make-temp-name))
(tmp-name2 (expand-file-name "bla" tmp-name1))