aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2011-10-09 11:38:25 +0200
committerMichael Albinus2011-10-09 11:38:25 +0200
commit56f2d1e18338b7096d6b7f85cc11d3bf598ab394 (patch)
treef586ff35250a801018a59a28c80edb18b59811e2
parent112a65928f488fe18fd699a839de70c4ebbe9beb (diff)
downloademacs-56f2d1e18338b7096d6b7f85cc11d3bf598ab394.tar.gz
emacs-56f2d1e18338b7096d6b7f85cc11d3bf598ab394.zip
* net/tramp.el (tramp-file-name-handler): Add 'debug to the error
condition.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/tramp.el11
2 files changed, 12 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ca38b372924..f60616a1b29 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12011-10-09 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/tramp.el (tramp-file-name-handler): Add 'debug to the error
4 condition.
5
12011-10-09 Leo Liu <sdl.web@gmail.com> 62011-10-09 Leo Liu <sdl.web@gmail.com>
2 7
3 * mail/smtpmail.el (smtpmail-send-data): Add a missing space. 8 * mail/smtpmail.el (smtpmail-send-data): Add a missing space.
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 1381d33efa2..7ace2911501 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -1886,7 +1886,7 @@ Falls back to normal file name handler if no Tramp file name handler exists."
1886 (apply foreign operation args)) 1886 (apply foreign operation args))
1887 1887
1888 ;; Trace that somebody has interrupted the operation. 1888 ;; Trace that somebody has interrupted the operation.
1889 (quit 1889 ((debug quit)
1890 (let (tramp-message-show-message) 1890 (let (tramp-message-show-message)
1891 (tramp-message 1891 (tramp-message
1892 v 1 "Interrupt received in operation %s" 1892 v 1 "Interrupt received in operation %s"
@@ -1898,6 +1898,9 @@ Falls back to normal file name handler if no Tramp file name handler exists."
1898 ;; operations shall return at least a default value 1898 ;; operations shall return at least a default value
1899 ;; in order to give the user a chance to correct the 1899 ;; in order to give the user a chance to correct the
1900 ;; file name in the minibuffer. 1900 ;; file name in the minibuffer.
1901 ;; We cannot use 'debug as error handler. In order
1902 ;; to get a full backtrace, one could apply
1903 ;; (setq debug-on-error t debug-on-signal t)
1901 (error 1904 (error
1902 (cond 1905 (cond
1903 ((and completion (zerop (length localname)) 1906 ((and completion (zerop (length localname))
@@ -3850,9 +3853,9 @@ Only works for Bourne-like shells."
3850;; * Run emerge on two remote files. Bug is described here: 3853;; * Run emerge on two remote files. Bug is described here:
3851;; <http://www.mail-archive.com/tramp-devel@nongnu.org/msg01041.html>. 3854;; <http://www.mail-archive.com/tramp-devel@nongnu.org/msg01041.html>.
3852;; (Bug#6850) 3855;; (Bug#6850)
3853 3856;; * It would be very useful if it were possible to load or save a
3854;; Functions for file-name-handler-alist: 3857;; buffer using Tramp in a non-blocking way so that use of Emacs on
3855;; diff-latest-backup-file -- in diff.el 3858;; other buffers could continue. (Bug#9617)
3856 3859
3857;;; tramp.el ends here 3860;;; tramp.el ends here
3858 3861