[Emacs-diffs] trunk r114107: * net/tramp-compat.el (tramp-compat-user-error): Move it ...

[Michael Albinus]

------------------------------------------------------------
revno: 114107
revision-id: address@hidden
parent: address@hidden
committer: Michael Albinus <address@hidden>
branch nick: trunk
timestamp: Mon 2013-09-02 15:41:08 +0200
message:
  * net/tramp-compat.el (tramp-compat-user-error): Move it ...
  * net/tramp.el (tramp-user-error): ... here.
  (tramp-find-method, tramp-check-proper-host)
  (tramp-dissect-file-name, tramp-debug-message)
  (tramp-handle-shell-command):
  * net/tramp-adb.el (tramp-adb-handle-shell-command):
  * net/tramp-gvfs.el (tramp-gvfs-file-name-handler): Adapt callees.
  
  * net/tramp-cache.el (tramp-cache-print): Don't print text properties.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/net/tramp-adb.el          trampadb.el-20121204164216-03wyr5miam215d7f-1
  lisp/net/tramp-cache.el        
trampcache.el-20091113204419-o5vbwnq5f7feedwu-5065
  lisp/net/tramp-compat.el       
trampcompat.el-20091113204419-o5vbwnq5f7feedwu-7298
  lisp/net/tramp-gvfs.el         
trampgvfs.el-20091113204419-o5vbwnq5f7feedwu-10898
  lisp/net/tramp.el              tramp.el-20091113204419-o5vbwnq5f7feedwu-2427

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-09-02 07:11:26 +0000
+++ b/lisp/ChangeLog    2013-09-02 13:41:08 +0000
@@ -1,3 +1,15 @@
+2013-09-02  Michael Albinus  <address@hidden>
+
+       * net/tramp-compat.el (tramp-compat-user-error): Move it ...
+       * net/tramp.el (tramp-user-error): ... here.
+       (tramp-find-method, tramp-check-proper-host)
+       (tramp-dissect-file-name, tramp-debug-message)
+       (tramp-handle-shell-command):
+       * net/tramp-adb.el (tramp-adb-handle-shell-command):
+       * net/tramp-gvfs.el (tramp-gvfs-file-name-handler): Adapt callees.
+
+       * net/tramp-cache.el (tramp-cache-print): Don't print text properties.
+
 2013-09-02  Martin Rudalics  <address@hidden>
 
        * avoid.el (mouse-avoidance-point-position)

=== modified file 'lisp/net/tramp-adb.el'
--- a/lisp/net/tramp-adb.el     2013-08-26 13:17:22 +0000
+++ b/lisp/net/tramp-adb.el     2013-09-02 13:41:08 +0000
@@ -874,7 +874,7 @@
     (when p
       (if (yes-or-no-p "A command is running.  Kill it? ")
          (ignore-errors (kill-process p))
-       (tramp-compat-user-error "Shell command in progress")))
+       (tramp-user-error p "Shell command in progress")))
 
     (if current-buffer-p
        (progn

=== modified file 'lisp/net/tramp-cache.el'
--- a/lisp/net/tramp-cache.el   2013-08-15 14:29:08 +0000
+++ b/lisp/net/tramp-cache.el   2013-09-02 13:41:08 +0000
@@ -285,6 +285,11 @@
     (let (result)
       (maphash
        (lambda (key value)
+        ;; Remove text properties from KEY.
+        (when (vectorp key)
+          (dotimes (i (length key))
+            (when (stringp (aref key i))
+              (aset key i (substring-no-properties (aref key i))))))
         (let ((tmp (format
                     "(%s %s)"
                     (if (processp key)

=== modified file 'lisp/net/tramp-compat.el'
--- a/lisp/net/tramp-compat.el  2013-08-26 13:17:22 +0000
+++ b/lisp/net/tramp-compat.el  2013-09-02 13:41:08 +0000
@@ -518,12 +518,6 @@
                        "`dos', `unix', or `mac'")))))
         (t (error "Can't change EOL conversion -- is MULE missing?"))))
 
-;; `user-error' has been added to Emacs 24.3.
-(defun tramp-compat-user-error (format &rest args)
-  "Signal a pilot error."
-;  (tramp-backtrace)
-  (apply (if (fboundp 'user-error) 'user-error 'error) format args))
-
 (add-hook 'tramp-unload-hook
          (lambda ()
            (unload-feature 'tramp-compat 'force)))

=== modified file 'lisp/net/tramp-gvfs.el'
--- a/lisp/net/tramp-gvfs.el    2013-08-26 13:17:22 +0000
+++ b/lisp/net/tramp-gvfs.el    2013-09-02 13:41:08 +0000
@@ -490,7 +490,7 @@
 First arg specifies the OPERATION, second arg is a list of arguments to
 pass to the OPERATION."
   (unless tramp-gvfs-enabled
-    (tramp-compat-user-error "Package `tramp-gvfs' not supported"))
+    (tramp-user-error nil "Package `tramp-gvfs' not supported"))
   (let ((fn (assoc operation tramp-gvfs-file-name-handler-alist)))
     (if fn
        (save-match-data (apply (cdr fn) args))

=== modified file 'lisp/net/tramp.el'
--- a/lisp/net/tramp.el 2013-08-29 19:55:58 +0000
+++ b/lisp/net/tramp.el 2013-09-02 13:41:08 +0000
@@ -1120,6 +1120,12 @@
 
 ;;; Internal functions which must come first:
 
+(defsubst tramp-user-error (vec-or-proc format &rest args)
+  "Signal a pilot error."
+  (apply
+   'tramp-error vec-or-proc
+   (if (fboundp 'user-error) 'user-error 'error) format args))
+
 ;; Conversion functions between external representation and
 ;; internal data structure.  Convenience functions for internal
 ;; data structure.
@@ -1232,9 +1238,9 @@
        (if noninteractive
            (warn "Method %s is obsolete, using %s"
                  result (substring result 0 -1))
-         (unless (y-or-n-p (format "Method %s is obsolete, use %s? "
+         (unless (y-or-n-p (format "Method \"%s\" is obsolete, use \"%s\"? "
                                    result (substring result 0 -1)))
-           (tramp-compat-user-error "Method \"%s\" not supported" result)))
+           (tramp-user-error nil "Method \"%s\" not supported" result)))
        (add-to-list 'tramp-warned-obsolete-methods result))
       ;; This works with the current set of `tramp-obsolete-methods'.
       ;; Must be improved, if their are more sophisticated replacements.
@@ -1289,8 +1295,8 @@
               (or (null method) (get-text-property 0 'tramp-default method))
               (or (null user) (get-text-property 0 'tramp-default user))
               (member host (mapcar 'car tramp-methods)))
-      (tramp-compat-user-error
-       "Host name must not match method `%s'" host))))
+      (tramp-cleanup-connection vec)
+      (tramp-user-error vec "Host name must not match method \"%s\"" host))))
 
 (defun tramp-dissect-file-name (name &optional nodefault)
   "Return a `tramp-file-name' structure.
@@ -1300,7 +1306,7 @@
 values."
   (save-match-data
     (let ((match (string-match (nth 0 tramp-file-name-structure) name)))
-      (unless match (tramp-compat-user-error "Not a Tramp file name: %s" name))
+      (unless match (tramp-user-error nil "Not a Tramp file name: \"%s\"" 
name))
       (let ((method    (match-string (nth 1 tramp-file-name-structure) name))
            (user      (match-string (nth 2 tramp-file-name-structure) name))
            (host      (match-string (nth 3 tramp-file-name-structure) name))
@@ -1485,7 +1491,8 @@
                         "tramp-debug-message"
                         "tramp-error"
                         "tramp-error-with-buffer"
-                        "tramp-message")
+                        "tramp-message"
+                        "tramp-user-error")
                       t)
                      "$")
                     fn)))
@@ -3236,7 +3243,7 @@
     (when p
       (if (yes-or-no-p "A command is running.  Kill it? ")
          (ignore-errors (kill-process p))
-       (tramp-compat-user-error "Shell command in progress")))
+       (tramp-user-error p "Shell command in progress")))
 
     (if current-buffer-p
        (progn