diff options
| author | Joakim Verona | 2012-12-05 11:15:12 +0100 |
|---|---|---|
| committer | Joakim Verona | 2012-12-05 11:15:12 +0100 |
| commit | 79503a8fa661915c7d4d4ab107683e2cf2abbbe5 (patch) | |
| tree | 2324dd0b8deb5858f156b57ee88131802d2a8133 | |
| parent | d0540aa2bf4661554043a05cc000d3a0efcdaf67 (diff) | |
| parent | 51b890acbf62bb3b9c10c025413786d69f6c87d4 (diff) | |
| download | emacs-79503a8fa661915c7d4d4ab107683e2cf2abbbe5.tar.gz emacs-79503a8fa661915c7d4d4ab107683e2cf2abbbe5.zip | |
auto upstream
| -rw-r--r-- | lisp/ChangeLog | 5 | ||||
| -rw-r--r-- | lisp/net/tramp-adb.el | 8 |
2 files changed, 10 insertions, 3 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b6f03d4a5d3..42cd1dca308 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-12-05 Michael Albinus <michael.albinus@gmx.de> | ||
| 2 | |||
| 3 | * net/tramp-adb.el (tramp-adb-sdk-dir, tramp-adb-prompt): Use | ||
| 4 | group `tramp'. Add version. | ||
| 5 | |||
| 1 | 2012-12-05 Chong Yidong <cyd@gnu.org> | 6 | 2012-12-05 Chong Yidong <cyd@gnu.org> |
| 2 | 7 | ||
| 3 | * ffap.el (ffap-url-regexp): Don't require matching at front of | 8 | * ffap.el (ffap-url-regexp): Don't require matching at front of |
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el index a56ccd98e47..3a2500bb5c7 100644 --- a/lisp/net/tramp-adb.el +++ b/lisp/net/tramp-adb.el | |||
| @@ -39,16 +39,18 @@ | |||
| 39 | (defcustom tramp-adb-sdk-dir "~/Android/sdk" | 39 | (defcustom tramp-adb-sdk-dir "~/Android/sdk" |
| 40 | "Set to the directory containing the Android SDK." | 40 | "Set to the directory containing the Android SDK." |
| 41 | :type 'string | 41 | :type 'string |
| 42 | :group 'tramp-adb) | 42 | :version "24.4" |
| 43 | :group 'tramp) | ||
| 43 | 44 | ||
| 44 | ;;;###tramp-autoload | 45 | ;;;###tramp-autoload |
| 45 | (defconst tramp-adb-method "adb" | 46 | (defconst tramp-adb-method "adb" |
| 46 | "*When this method name is used, forward all calls to Android Debug Bridge.") | 47 | "*When this method name is used, forward all calls to Android Debug Bridge.") |
| 47 | 48 | ||
| 48 | (defcustom tramp-adb-prompt "^\\(?:[[:alnum:]]*@[[:alnum:]]*[^#\\$]*\\)?[#\\$][[:space:]]" | 49 | (defcustom tramp-adb-prompt "^\\(?:[[:alnum:]]*@[[:alnum:]]*[^#\\$]*\\)?[#\\$][[:space:]]" |
| 49 | "Regexp used as prompt in ADB shell." | 50 | "Regexp used as prompt in almquist shell." |
| 50 | :type 'string | 51 | :type 'string |
| 51 | :group 'tramp-adb) | 52 | :version "24.4" |
| 53 | :group 'tramp) | ||
| 52 | 54 | ||
| 53 | (defconst tramp-adb-ls-date-regexp "[[:space:]][0-9]\\{4\\}-[0-9][0-9]-[0-9][0-9][[:space:]][0-9][0-9]:[0-9][0-9][[:space:]]") | 55 | (defconst tramp-adb-ls-date-regexp "[[:space:]][0-9]\\{4\\}-[0-9][0-9]-[0-9][0-9][[:space:]][0-9][0-9]:[0-9][0-9][[:space:]]") |
| 54 | 56 | ||