aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2015-03-10 00:49:20 -0700
committerPaul Eggert2015-03-10 00:49:57 -0700
commit33d9869b5f7a5acaca838e2b57e5ae713df9603d (patch)
tree6ee059624338a52c20984282fce300ca92dbfc20
parent778de7270b92fcaabd515816f118b28838318ca2 (diff)
downloademacs-33d9869b5f7a5acaca838e2b57e5ae713df9603d.tar.gz
emacs-33d9869b5f7a5acaca838e2b57e5ae713df9603d.zip
Spelling and minor grammar fixes
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/emacs-lisp/package.el6
-rw-r--r--lisp/net/tramp-adb.el2
-rw-r--r--lisp/net/tramp-sh.el4
4 files changed, 8 insertions, 8 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index df45ec49632..c25f4efcdd0 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -173,7 +173,7 @@
173 Use `with-temp-file'. 173 Use `with-temp-file'.
174 174
175 * net/tramp-sh.el (tramp-perl-file-attributes) 175 * net/tramp-sh.el (tramp-perl-file-attributes)
176 (tramp-perl-directory-files-and-attributes): Escape apostrophs in 176 (tramp-perl-directory-files-and-attributes): Escape apostrophes in
177 file names. 177 file names.
178 (tramp-do-file-attributes-with-stat): Quote file name. 178 (tramp-do-file-attributes-with-stat): Quote file name.
179 (tramp-sh-handle-directory-files-and-attributes): Fall back to 179 (tramp-sh-handle-directory-files-and-attributes): Fall back to
@@ -185,7 +185,7 @@
185 Normalize use of "cd". 185 Normalize use of "cd".
186 (tramp-do-directory-files-and-attributes-with-stat): Use the 186 (tramp-do-directory-files-and-attributes-with-stat): Use the
187 `quoting-style' arg of `ls' if possible. Make it also working for 187 `quoting-style' arg of `ls' if possible. Make it also working for
188 file names with apostrophs. 188 file names with apostrophes.
189 (tramp-sh-handle-file-name-all-completions): Use arguments of `ls' 189 (tramp-sh-handle-file-name-all-completions): Use arguments of `ls'
190 in proper order. 190 in proper order.
191 (tramp-do-copy-or-rename-file-via-buffer) 191 (tramp-do-copy-or-rename-file-via-buffer)
diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index 00608f3d2c7..0d001bff4cf 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1695,10 +1695,10 @@ similar to an entry in `package-alist'. Save the cached copy to
1695 1695
1696;;;###autoload 1696;;;###autoload
1697(defun package-refresh-contents () 1697(defun package-refresh-contents ()
1698 "Download the description of all configured ELPAs. 1698 "Download descriptions of all configured ELPA packages.
1699For each archive configured in the variable `package-archives', 1699For each archive configured in the variable `package-archives',
1700this informs Emacs about the latest versions of all packages it 1700inform Emacs about the latest versions of all packages it offers,
1701offers, and makes them available for download." 1701and make them available for download."
1702 (interactive) 1702 (interactive)
1703 ;; FIXME: Do it asynchronously. 1703 ;; FIXME: Do it asynchronously.
1704 (unless (file-exists-p package-user-dir) 1704 (unless (file-exists-p package-user-dir)
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index fae54520102..6696dcf1505 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -1013,7 +1013,7 @@ PRESERVE-UID-GID and PRESERVE-EXTENDED-ATTRIBUTES are completely ignored."
1013 (tramp-set-connection-property v "process-buffer" nil)))))) 1013 (tramp-set-connection-property v "process-buffer" nil))))))
1014 1014
1015(defun tramp-adb-get-device (vec) 1015(defun tramp-adb-get-device (vec)
1016 "Return full host name from VEC to be used in shell exceution. 1016 "Return full host name from VEC to be used in shell execution.
1017E.g. a host name \"192.168.1.1#5555\" returns \"192.168.1.1:5555\" 1017E.g. a host name \"192.168.1.1#5555\" returns \"192.168.1.1:5555\"
1018 a host name \"R38273882DE\" returns \"R38273882DE\"." 1018 a host name \"R38273882DE\" returns \"R38273882DE\"."
1019 ;; Sometimes this is called before there is a connection process 1019 ;; Sometimes this is called before there is a connection process
diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el
index 580c5d08ecd..76d2b014917 100644
--- a/lisp/net/tramp-sh.el
+++ b/lisp/net/tramp-sh.el
@@ -1695,7 +1695,7 @@ be non-negative integers."
1695 ;; "-"; this would confuse xargs. "ls -aQ" might be a solution, 1695 ;; "-"; this would confuse xargs. "ls -aQ" might be a solution,
1696 ;; but it does not work on all remote systems. Therefore, we 1696 ;; but it does not work on all remote systems. Therefore, we
1697 ;; use \000 as file separator. 1697 ;; use \000 as file separator.
1698 ;; Apostrophs in the stat output are masked as \037 character, in 1698 ;; Apostrophes in the stat output are masked as \037 characters, in
1699 ;; order to make a proper shell escape of them in file names. 1699 ;; order to make a proper shell escape of them in file names.
1700 "cd %s && echo \"(\"; (%s %s -a | " 1700 "cd %s && echo \"(\"; (%s %s -a | "
1701 "xargs %s -c " 1701 "xargs %s -c "
@@ -1703,7 +1703,7 @@ be non-negative integers."
1703 " -- 2>/dev/null | sed -e 's/\"/\\\\\"/g' -e 's/\037/\"/g'); echo \")\"") 1703 " -- 2>/dev/null | sed -e 's/\"/\\\\\"/g' -e 's/\037/\"/g'); echo \")\"")
1704 (tramp-shell-quote-argument localname) 1704 (tramp-shell-quote-argument localname)
1705 (tramp-get-ls-command vec) 1705 (tramp-get-ls-command vec)
1706 ;; On systems which have no quotings style, file names with 1706 ;; On systems which have no quoting style, file names with
1707 ;; special characters could fail. 1707 ;; special characters could fail.
1708 (if (tramp-get-ls-command-with-quoting-style vec) 1708 (if (tramp-get-ls-command-with-quoting-style vec)
1709 "--quoting-style=shell" "") 1709 "--quoting-style=shell" "")