aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2014-03-02 21:12:12 -0800
committerPaul Eggert2014-03-02 21:12:12 -0800
commitfbaddd63ab38480b0da0435eb577137ae0ae8a99 (patch)
tree31be3e6b9c145ebff1409f10268ab921bf7394ad
parent35e951cd4bee5ef9c4e3158bd7cf13c24fc4b099 (diff)
downloademacs-fbaddd63ab38480b0da0435eb577137ae0ae8a99.tar.gz
emacs-fbaddd63ab38480b0da0435eb577137ae0ae8a99.zip
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.
46 To end a line and start a new one, type @key{RET} (@code{newline}). 46 To end a line and start a new one, type @key{RET} (@code{newline}).
47(The @key{RET} key may be labeled @key{Return} or @key{Enter} on your 47(The @key{RET} key may be labeled @key{Return} or @key{Enter} on your
48keyboard, but we refer to it as @key{RET} in this manual.) This 48keyboard, but we refer to it as @key{RET} in this manual.) This
49command inserts a newline character into the buffer, then indent 49command inserts a newline character into the buffer, then indents
50(@pxref{Indentation}) accroding to major mode. If point is at the end 50(@pxref{Indentation}) according to the major mode. If point is at the end
51of the line, the effect is to create a new blank line after it and 51of the line, the effect is to create a new blank line after it and
52indent the new line; if point is in the middle of a line, the line is 52indent the new line; if point is in the middle of a line, the line is
53split at that position. To turn off the auto-indentation, you can 53split at that position. To turn off the auto-indentation, you can
54either desable Electric Indent mode (@pxref{Indent Convenience}) or 54either disable Electric Indent mode (@pxref{Indent Convenience}) or
55type @kbd{C-j}, which inserts just a newline, without any 55type @kbd{C-j}, which inserts just a newline, without any
56auto-indentation. 56auto-indentation.
57 57
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'."
869 (skip-unless (tramp--test-enabled)) 869 (skip-unless (tramp--test-enabled))
870 870
871 ;; `directory-files-and-attributes' contains also values for "../". 871 ;; `directory-files-and-attributes' contains also values for "../".
872 ;; We must nesure, that this doesn't change during tests, for 872 ;; Ensure that this doesn't change during tests, for
873 ;; example due to handling temporary files. 873 ;; example due to handling temporary files.
874 (let* ((tmp-name1 (tramp--test-make-temp-name)) 874 (let* ((tmp-name1 (tramp--test-make-temp-name))
875 (tmp-name2 (expand-file-name "bla" tmp-name1)) 875 (tmp-name2 (expand-file-name "bla" tmp-name1))