diff options
| author | Paul Eggert | 2013-01-09 00:17:47 -0800 |
|---|---|---|
| committer | Paul Eggert | 2013-01-09 00:17:47 -0800 |
| commit | 677d5c928c0da0fd0b3172d2ea023bc73777a06c (patch) | |
| tree | cf7e210fb57613c89efcb184f3c9b1b86fdb40a9 /lisp | |
| parent | b84e3dda5b63822f233732174f63e4854ca3f878 (diff) | |
| download | emacs-677d5c928c0da0fd0b3172d2ea023bc73777a06c.tar.gz emacs-677d5c928c0da0fd0b3172d2ea023bc73777a06c.zip | |
Spelling fixes.
* lisp/net/tramp-adb.el (tramp-adb-get-toolbox):
Fix misspelling of 'unknown'.
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 12 | ||||
| -rw-r--r-- | lisp/net/tramp-adb.el | 6 |
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 @@ | |||
| 1 | 2013-01-09 Paul Eggert <eggert@cs.ucla.edu> | ||
| 2 | |||
| 3 | Spelling fixes. | ||
| 4 | * net/tramp-adb.el (tramp-adb-get-toolbox): | ||
| 5 | Fix misspelling of 'unknown'. | ||
| 6 | |||
| 1 | 2013-01-08 Juri Linkov <juri@jurta.org> | 7 | 2013-01-08 Juri Linkov <juri@jurta.org> |
| 2 | 8 | ||
| 3 | * textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate): | 9 | * textmodes/flyspell.el (flyspell-incorrect, flyspell-duplicate): |
| @@ -436,7 +442,7 @@ | |||
| 436 | 442 | ||
| 437 | * net/tramp-adb.el (tramp-adb-get-ls-command): New defun. | 443 | * net/tramp-adb.el (tramp-adb-get-ls-command): New defun. |
| 438 | Suppress coloring, if possible (required for BusyBox based systems like | 444 | Suppress coloring, if possible (required for BusyBox based systems like |
| 439 | CynagenMod). | 445 | CyanogenMod). |
| 440 | (tramp-adb-handle-file-attributes) | 446 | (tramp-adb-handle-file-attributes) |
| 441 | (tramp-adb-handle-insert-directory) | 447 | (tramp-adb-handle-insert-directory) |
| 442 | (tramp-adb-handle-file-name-all-completions): Use it. | 448 | (tramp-adb-handle-file-name-all-completions): Use it. |
| @@ -11609,7 +11615,7 @@ | |||
| 11609 | 11615 | ||
| 11610 | 2012-03-16 Alan Mackenzie <acm@muc.de> | 11616 | 2012-03-16 Alan Mackenzie <acm@muc.de> |
| 11611 | 11617 | ||
| 11612 | Further optimise the handling of large macros. | 11618 | Further optimize the handling of large macros. |
| 11613 | 11619 | ||
| 11614 | * progmodes/cc-engine.el (c-crosses-statement-barrier-p): Use a | 11620 | * progmodes/cc-engine.el (c-crosses-statement-barrier-p): Use a |
| 11615 | limit to a call of `c-literal-limits'. | 11621 | limit to a call of `c-literal-limits'. |
| @@ -13261,7 +13267,7 @@ | |||
| 13261 | 13267 | ||
| 13262 | 2012-01-08 Alan Mackenzie <acm@muc.de> | 13268 | 2012-01-08 Alan Mackenzie <acm@muc.de> |
| 13263 | 13269 | ||
| 13264 | Optimise font locking in long enum definitions. | 13270 | Optimize font locking in long enum definitions. |
| 13265 | 13271 | ||
| 13266 | * progmodes/cc-fonts.el (c-font-lock-declarations): Add an extra | 13272 | * progmodes/cc-fonts.el (c-font-lock-declarations): Add an extra |
| 13267 | arm to a cond form to handle enums. | 13273 | 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." | |||
| 372 | "ls"))) | 372 | "ls"))) |
| 373 | 373 | ||
| 374 | (defun tramp-adb-get-toolbox (vec) | 374 | (defun tramp-adb-get-toolbox (vec) |
| 375 | "Get shell toolbox implementation: `toolbox' for orginal distributions | 375 | "Get shell toolbox implementation: `toolbox' for original distributions |
| 376 | or `busybox' for CynagenMode based distributions" | 376 | or `busybox' for CyanogenMod based distributions" |
| 377 | (with-tramp-connection-property vec "toolbox" | 377 | (with-tramp-connection-property vec "toolbox" |
| 378 | (tramp-message vec 5 "Checking shell toolbox implementation") | 378 | (tramp-message vec 5 "Checking shell toolbox implementation") |
| 379 | (cond | 379 | (cond |
| 380 | ((zerop (tramp-adb-command-exit-status vec "busybox")) 'busybox) | 380 | ((zerop (tramp-adb-command-exit-status vec "busybox")) 'busybox) |
| 381 | ((zerop (tramp-adb-command-exit-status vec "toolbox")) 'toolbox) | 381 | ((zerop (tramp-adb-command-exit-status vec "toolbox")) 'toolbox) |
| 382 | (t 'unkown)))) | 382 | (t 'unknown)))) |
| 383 | 383 | ||
| 384 | (defun tramp-adb--gnu-switches-to-ash | 384 | (defun tramp-adb--gnu-switches-to-ash |
| 385 | (switches) | 385 | (switches) |