summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
Diffstat (limited to 'lisp')
-rw-r--r--lisp/ChangeLog12
-rw-r--r--lisp/net/tramp-adb.el6
2 files changed, 12 insertions, 6 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ba5fc47a0b9..3f6244b5c91 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-09 Paul Eggert <eggert@cs.ucla.edu>
+
+ Spelling fixes.
+ * net/tramp-adb.el (tramp-adb-get-toolbox):
+ Fix misspelling of 'unknown'.
+
2013-01-08 Juri Linkov <juri@jurta.org>
* textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate):
@@ -436,7 +442,7 @@
* net/tramp-adb.el (tramp-adb-get-ls-command): New defun.
Suppress coloring, if possible (required for BusyBox based systems like
- CynagenMod).
+ CyanogenMod).
(tramp-adb-handle-file-attributes)
(tramp-adb-handle-insert-directory)
(tramp-adb-handle-file-name-all-completions): Use it.
@@ -11609,7 +11615,7 @@
2012-03-16 Alan Mackenzie <acm@muc.de>
- Further optimise the handling of large macros.
+ Further optimize the handling of large macros.
* progmodes/cc-engine.el (c-crosses-statement-barrier-p): Use a
limit to a call of `c-literal-limits'.
@@ -13261,7 +13267,7 @@
2012-01-08 Alan Mackenzie <acm@muc.de>
- Optimise font locking in long enum definitions.
+ Optimize font locking in long enum definitions.
* progmodes/cc-fonts.el (c-font-lock-declarations): Add an extra
arm to a cond form to handle enums.
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index d3a11a866c0..ab13d4cf442 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -372,14 +372,14 @@ pass to the OPERATION."
"ls")))
(defun tramp-adb-get-toolbox (vec)
- "Get shell toolbox implementation: `toolbox' for orginal distributions
-or `busybox' for CynagenMode based distributions"
+ "Get shell toolbox implementation: `toolbox' for original distributions
+or `busybox' for CyanogenMod based distributions"
(with-tramp-connection-property vec "toolbox"
(tramp-message vec 5 "Checking shell toolbox implementation")
(cond
((zerop (tramp-adb-command-exit-status vec "busybox")) 'busybox)
((zerop (tramp-adb-command-exit-status vec "toolbox")) 'toolbox)
- (t 'unkown))))
+ (t 'unknown))))
(defun tramp-adb--gnu-switches-to-ash
(switches)