aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2012-12-13 09:42:25 +0100
committerMichael Albinus2012-12-13 09:42:25 +0100
commit6ce2146306d4d76fcb365ac64110ca0a99b5530d (patch)
tree61d559d7c51a17c41bba9beb3ace65c26d4578c7
parentd754b364faf73f2e1f2ffaa10caec1f4eabb771c (diff)
downloademacs-6ce2146306d4d76fcb365ac64110ca0a99b5530d.tar.gz
emacs-6ce2146306d4d76fcb365ac64110ca0a99b5530d.zip
* net/tramp-adb.el (tramp-adb-file-name-p): Make it a defsubst.
Otherwise, there could be errors in autoloading. (Bug#13151)
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/tramp-adb.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index cfc1601b098..22069406451 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-12-13 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/tramp-adb.el (tramp-adb-file-name-p): Make it a defsubst.
4 Otherwise, there could be errors in autoloading. (Bug#13151)
5
12012-12-13 Jürgen Hötzel <juergen@archlinux.org> 62012-12-13 Jürgen Hötzel <juergen@archlinux.org>
2 7
3 * net/tramp-adb.el (tramp-adb-wait-for-output): Remove spurious " ^H" 8 * net/tramp-adb.el (tramp-adb-wait-for-output): Remove spurious " ^H"
diff --git a/lisp/net/tramp-adb.el b/lisp/net/tramp-adb.el
index b5b31828bb1..5d13d56f638 100644
--- a/lisp/net/tramp-adb.el
+++ b/lisp/net/tramp-adb.el
@@ -112,7 +112,7 @@
112 "Alist of handler functions for Tramp ADB method.") 112 "Alist of handler functions for Tramp ADB method.")
113 113
114;;;###tramp-autoload 114;;;###tramp-autoload
115(defun tramp-adb-file-name-p (filename) 115(defsubst tramp-adb-file-name-p (filename)
116 "Check if it's a filename for ADB." 116 "Check if it's a filename for ADB."
117 (let ((v (tramp-dissect-file-name filename))) 117 (let ((v (tramp-dissect-file-name filename)))
118 (string= (tramp-file-name-method v) tramp-adb-method))) 118 (string= (tramp-file-name-method v) tramp-adb-method)))