aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Schwab2005-02-27 17:31:56 +0000
committerAndreas Schwab2005-02-27 17:31:56 +0000
commitb71c9e75543263ffd228f36e874377fa39f98b16 (patch)
tree6add8a69319962538ed2f25d7a756911a491c48a
parente6d096835c1eed0bd44eefcec3cf52ce4c6f746c (diff)
downloademacs-b71c9e75543263ffd228f36e874377fa39f98b16.tar.gz
emacs-b71c9e75543263ffd228f36e874377fa39f98b16.zip
(tramp-file-name-for-operation): Fix misapplied
change from sync with Tramp 2.0.47.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/net/tramp.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 082174dcc33..141eec983d9 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12005-02-27 Andreas Schwab <schwab@suse.de>
2
3 * net/tramp.el (tramp-file-name-for-operation): Fix misapplied
4 change from sync with Tramp 2.0.47.
5
12005-02-27 Richard M. Stallman <rms@gnu.org> 62005-02-27 Richard M. Stallman <rms@gnu.org>
2 7
3 * textmodes/ispell.el (ispell-change-dictionary): Doc fix. 8 * textmodes/ispell.el (ispell-change-dictionary): Doc fix.
diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el
index 0fee809789e..14682975fe9 100644
--- a/lisp/net/tramp.el
+++ b/lisp/net/tramp.el
@@ -4107,7 +4107,7 @@ ARGS are the arguments OPERATION has been called with."
4107 ((member operation 4107 ((member operation
4108 (list 'dired-call-process 4108 (list 'dired-call-process
4109 ; Emacs only 4109 ; Emacs only
4110 'shell 4110 'shell-command
4111 ; Post Emacs 21.3 only 4111 ; Post Emacs 21.3 only
4112 'process-file 4112 'process-file
4113 ; XEmacs only 4113 ; XEmacs only