Mercurial > emacs
annotate lisp/net/tramp-compat.el @ 110149:4ac2b883320e
Forgor to save ChangeLog for previous commit.
author | Jan D. <jan.h.d@swipnet.se> |
---|---|
date | Thu, 02 Sep 2010 12:20:20 +0200 |
parents | 280c8ae2476d |
children | ec526909f60b |
rev | line source |
---|---|
85024
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
1 ;;; tramp-compat.el --- Tramp compatibility functions |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
2 |
106815 | 3 ;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
4 |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
5 ;; Author: Michael Albinus <michael.albinus@gmx.de> |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
6 ;; Keywords: comm, processes |
110015
280c8ae2476d
Add "Package:" file headers to denote built-in packages.
Chong Yidong <cyd@stupidchicken.com>
parents:
108975
diff
changeset
|
7 ;; Package: tramp |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
8 |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
9 ;; This file is part of GNU Emacs. |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
10 |
94677
91e5880a36c1
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94402
diff
changeset
|
11 ;; GNU Emacs is free software: you can redistribute it and/or modify |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
12 ;; it under the terms of the GNU General Public License as published by |
94677
91e5880a36c1
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94402
diff
changeset
|
13 ;; the Free Software Foundation, either version 3 of the License, or |
91e5880a36c1
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94402
diff
changeset
|
14 ;; (at your option) any later version. |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
15 |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
16 ;; GNU Emacs is distributed in the hope that it will be useful, |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
17 ;; but WITHOUT ANY WARRANTY; without even the implied warranty of |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
18 ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
19 ;; GNU General Public License for more details. |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
20 |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
21 ;; You should have received a copy of the GNU General Public License |
94677
91e5880a36c1
Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents:
94402
diff
changeset
|
22 ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
23 |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
24 ;;; Commentary: |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
25 |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
26 ;; Tramp's main Emacs version for development is GNU Emacs 24. This |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
27 ;; package provides compatibility functions for GNU Emacs 22, GNU |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
28 ;; Emacs 23 and XEmacs 21.4+. |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
29 |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
30 ;;; Code: |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
31 |
87322
e99e230d7eb3
* files.el (cd-absolute): Set `list-buffers-directory' in order to
Michael Albinus <michael.albinus@gmx.de>
parents:
85067
diff
changeset
|
32 (eval-when-compile |
e99e230d7eb3
* files.el (cd-absolute): Set `list-buffers-directory' in order to
Michael Albinus <michael.albinus@gmx.de>
parents:
85067
diff
changeset
|
33 |
e99e230d7eb3
* files.el (cd-absolute): Set `list-buffers-directory' in order to
Michael Albinus <michael.albinus@gmx.de>
parents:
85067
diff
changeset
|
34 ;; Pacify byte-compiler. |
e99e230d7eb3
* files.el (cd-absolute): Set `list-buffers-directory' in order to
Michael Albinus <michael.albinus@gmx.de>
parents:
85067
diff
changeset
|
35 (require 'cl)) |
e99e230d7eb3
* files.el (cd-absolute): Set `list-buffers-directory' in order to
Michael Albinus <michael.albinus@gmx.de>
parents:
85067
diff
changeset
|
36 |
85024
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
37 (eval-and-compile |
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
38 |
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
39 (require 'custom) |
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
40 |
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
41 ;; Load the appropriate timer package. |
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
42 (if (featurep 'xemacs) |
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
43 (require 'timer-funcs) |
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
44 (require 'timer)) |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
45 |
104808
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
46 (autoload 'tramp-tramp-file-p "tramp") |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
47 (autoload 'tramp-file-name-handler "tramp") |
108975
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
48 |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
49 ;; We check whether `start-file-process' is bound. |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
50 (unless (fboundp 'start-file-process) |
104808
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
51 |
108975
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
52 ;; tramp-util offers integration into other (X)Emacs packages like |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
53 ;; compile.el, gud.el etc. Not necessary in Emacs 23. |
85067
4636000015c5
* net/tramp.el (top): Move loading of tramp-util.el and
Michael Albinus <michael.albinus@gmx.de>
parents:
85041
diff
changeset
|
54 (eval-after-load "tramp" |
108975
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
55 '(progn |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
56 (require 'tramp-util) |
85067
4636000015c5
* net/tramp.el (top): Move loading of tramp-util.el and
Michael Albinus <michael.albinus@gmx.de>
parents:
85041
diff
changeset
|
57 (add-hook 'tramp-unload-hook |
4636000015c5
* net/tramp.el (top): Move loading of tramp-util.el and
Michael Albinus <michael.albinus@gmx.de>
parents:
85041
diff
changeset
|
58 '(lambda () |
108975
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
59 (when (featurep 'tramp-util) |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
60 (unload-feature 'tramp-util 'force)))))) |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
61 |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
62 ;; Make sure that we get integration with the VC package. When it |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
63 ;; is loaded, we need to pull in the integration module. Not |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
64 ;; necessary in Emacs 23. |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
65 (eval-after-load "vc" |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
66 (eval-after-load "tramp" |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
67 '(progn |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
68 (require 'tramp-vc) |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
69 (add-hook 'tramp-unload-hook |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
70 '(lambda () |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
71 (when (featurep 'tramp-vc) |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
72 (unload-feature 'tramp-vc 'force)))))))) |
85067
4636000015c5
* net/tramp.el (top): Move loading of tramp-util.el and
Michael Albinus <michael.albinus@gmx.de>
parents:
85041
diff
changeset
|
73 |
85024
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
74 ;; Avoid byte-compiler warnings if the byte-compiler supports this. |
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
75 ;; Currently, XEmacs supports this. |
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
76 (when (featurep 'xemacs) |
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
77 (unless (boundp 'byte-compile-default-warnings) |
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
78 (defvar byte-compile-default-warnings nil)) |
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
79 (delq 'unused-vars byte-compile-default-warnings)) |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
80 |
85024
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
81 ;; `last-coding-system-used' is unknown in XEmacs. |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
82 (unless (boundp 'last-coding-system-used) |
85024
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
83 (defvar last-coding-system-used nil)) |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
84 |
85024
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
85 ;; `directory-sep-char' is an obsolete variable in Emacs. But it is |
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
86 ;; used in XEmacs, so we set it here and there. The following is |
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
87 ;; needed to pacify Emacs byte-compiler. |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
88 (unless (boundp 'byte-compile-not-obsolete-var) |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
89 (defvar byte-compile-not-obsolete-var nil)) |
85024
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
90 (setq byte-compile-not-obsolete-var 'directory-sep-char) |
108377
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
91 ;; Emacs 23.2. |
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
92 (unless (boundp 'byte-compile-not-obsolete-vars) |
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
93 (defvar byte-compile-not-obsolete-vars nil)) |
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
94 (setq byte-compile-not-obsolete-vars '(directory-sep-char)) |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
95 |
85024
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
96 ;; `with-temp-message' does not exists in XEmacs. |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
97 (condition-case nil |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
98 (with-temp-message (current-message) nil) |
85024
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
99 (error (defmacro with-temp-message (message &rest body) `(progn ,@body)))) |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
100 |
108377
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
101 ;; For not existing functions, or functions with a changed argument |
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
102 ;; list, there are compiler warnings. We want to avoid them in |
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
103 ;; cases we know what we do. |
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
104 (defmacro tramp-compat-funcall (function &rest arguments) |
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
105 (if (featurep 'xemacs) |
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
106 `(funcall (symbol-function ,function) ,@arguments) |
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
107 `(when (or (subrp ,function) (functionp ,function)) |
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
108 (with-no-warnings (funcall ,function ,@arguments))))) |
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
109 |
85024
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
110 ;; `set-buffer-multibyte' comes from Emacs Leim. |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
111 (unless (fboundp 'set-buffer-multibyte) |
85024
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
112 (defalias 'set-buffer-multibyte 'ignore)) |
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
113 |
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
114 ;; `font-lock-add-keywords' does not exist in XEmacs. |
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
115 (unless (fboundp 'font-lock-add-keywords) |
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
116 (defalias 'font-lock-add-keywords 'ignore)) |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
117 |
104808
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
118 ;; The following functions cannot be aliases of the corresponding |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
119 ;; `tramp-handle-*' functions, because this would bypass the locking |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
120 ;; mechanism. |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
121 |
85024
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
122 ;; `file-remote-p' has been introduced with Emacs 22. The version |
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
123 ;; of XEmacs is not a magic file name function (yet); this is |
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
124 ;; corrected in tramp-util.el. Here it is sufficient if the |
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
125 ;; function exists. |
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
126 (unless (fboundp 'file-remote-p) |
104808
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
127 (defalias 'file-remote-p |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
128 (lambda (file &optional identification connected) |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
129 (when (tramp-tramp-file-p file) |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
130 (tramp-file-name-handler |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
131 'file-remote-p file identification connected))))) |
85024
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
132 |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
133 ;; `process-file' does not exist in XEmacs. |
85024
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
134 (unless (fboundp 'process-file) |
104808
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
135 (defalias 'process-file |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
136 (lambda (program &optional infile buffer display &rest args) |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
137 (when (tramp-tramp-file-p default-directory) |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
138 (apply |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
139 'tramp-file-name-handler |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
140 'process-file program infile buffer display args))))) |
85024
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
141 |
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
142 ;; `start-file-process' is new in Emacs 23. |
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
143 (unless (fboundp 'start-file-process) |
104808
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
144 (defalias 'start-file-process |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
145 (lambda (name buffer program &rest program-args) |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
146 (when (tramp-tramp-file-p default-directory) |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
147 (apply |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
148 'tramp-file-name-handler |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
149 'start-file-process name buffer program program-args))))) |
85024
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
150 |
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
151 ;; `set-file-times' is also new in Emacs 23. |
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
152 (unless (fboundp 'set-file-times) |
104808
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
153 (defalias 'set-file-times |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
154 (lambda (filename &optional time) |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
155 (when (tramp-tramp-file-p filename) |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
156 (tramp-file-name-handler |
106613
291ea018e478
* files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents:
105892
diff
changeset
|
157 'set-file-times filename time))))) |
291ea018e478
* files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents:
105892
diff
changeset
|
158 |
291ea018e478
* files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents:
105892
diff
changeset
|
159 ;; We currently use "[" and "]" in the filename format for IPv6 |
291ea018e478
* files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents:
105892
diff
changeset
|
160 ;; hosts of GNU Emacs. This means, that Emacs wants to expand |
291ea018e478
* files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents:
105892
diff
changeset
|
161 ;; wildcards if `find-file-wildcards' is non-nil, and then barfs |
291ea018e478
* files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents:
105892
diff
changeset
|
162 ;; because no expansion could be found. We detect this situation |
291ea018e478
* files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents:
105892
diff
changeset
|
163 ;; and do something really awful: we have `file-expand-wildcards' |
291ea018e478
* files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents:
105892
diff
changeset
|
164 ;; return the original filename if it can't expand anything. Let's |
291ea018e478
* files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents:
105892
diff
changeset
|
165 ;; just hope that this doesn't break anything else. |
291ea018e478
* files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents:
105892
diff
changeset
|
166 ;; It is not needed anymore since GNU Emacs 23.2. |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
167 (unless (or (featurep 'xemacs) |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
168 ;; `featurep' has only one argument in XEmacs. |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
169 (funcall 'featurep 'files 'remote-wildcards)) |
106613
291ea018e478
* files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents:
105892
diff
changeset
|
170 (defadvice file-expand-wildcards |
291ea018e478
* files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents:
105892
diff
changeset
|
171 (around tramp-advice-file-expand-wildcards activate) |
291ea018e478
* files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents:
105892
diff
changeset
|
172 (let ((name (ad-get-arg 0))) |
291ea018e478
* files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents:
105892
diff
changeset
|
173 ;; If it's a Tramp file, look if wildcards need to be expanded |
291ea018e478
* files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents:
105892
diff
changeset
|
174 ;; at all. |
291ea018e478
* files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents:
105892
diff
changeset
|
175 (if (and |
291ea018e478
* files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents:
105892
diff
changeset
|
176 (tramp-tramp-file-p name) |
291ea018e478
* files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents:
105892
diff
changeset
|
177 (not (string-match |
108975
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
178 "[[*?]" (tramp-compat-funcall |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
179 'file-remote-p name 'localname)))) |
106613
291ea018e478
* files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents:
105892
diff
changeset
|
180 (setq ad-return-value (list name)) |
291ea018e478
* files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents:
105892
diff
changeset
|
181 ;; Otherwise, just run the original function. |
291ea018e478
* files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents:
105892
diff
changeset
|
182 ad-do-it))) |
291ea018e478
* files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents:
105892
diff
changeset
|
183 (add-hook |
291ea018e478
* files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents:
105892
diff
changeset
|
184 'tramp-unload-hook |
291ea018e478
* files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents:
105892
diff
changeset
|
185 (lambda () |
291ea018e478
* files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents:
105892
diff
changeset
|
186 (ad-remove-advice |
291ea018e478
* files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents:
105892
diff
changeset
|
187 'file-expand-wildcards 'around 'tramp-advice-file-expand-wildcards) |
291ea018e478
* files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents:
105892
diff
changeset
|
188 (ad-activate 'file-expand-wildcards))))) |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
189 |
104851
5e1bd0e3a13b
* net/tramp-compat.el (tramp-compat-line-beginning-position): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
104808
diff
changeset
|
190 (defsubst tramp-compat-line-beginning-position () |
5e1bd0e3a13b
* net/tramp-compat.el (tramp-compat-line-beginning-position): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
104808
diff
changeset
|
191 "Return point at beginning of line (compat function). |
5e1bd0e3a13b
* net/tramp-compat.el (tramp-compat-line-beginning-position): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
104808
diff
changeset
|
192 Calls `line-beginning-position' or `point-at-bol' if defined, else |
5e1bd0e3a13b
* net/tramp-compat.el (tramp-compat-line-beginning-position): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
104808
diff
changeset
|
193 own implementation." |
5e1bd0e3a13b
* net/tramp-compat.el (tramp-compat-line-beginning-position): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
104808
diff
changeset
|
194 (cond |
5e1bd0e3a13b
* net/tramp-compat.el (tramp-compat-line-beginning-position): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
104808
diff
changeset
|
195 ((fboundp 'line-beginning-position) |
108377
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
196 (tramp-compat-funcall 'line-beginning-position)) |
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
197 ((fboundp 'point-at-bol) (tramp-compat-funcall 'point-at-bol)) |
104851
5e1bd0e3a13b
* net/tramp-compat.el (tramp-compat-line-beginning-position): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
104808
diff
changeset
|
198 (t (save-excursion (beginning-of-line) (point))))) |
5e1bd0e3a13b
* net/tramp-compat.el (tramp-compat-line-beginning-position): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents:
104808
diff
changeset
|
199 |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
200 (defsubst tramp-compat-line-end-position () |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
201 "Return point at end of line (compat function). |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
202 Calls `line-end-position' or `point-at-eol' if defined, else |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
203 own implementation." |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
204 (cond |
108377
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
205 ((fboundp 'line-end-position) (tramp-compat-funcall 'line-end-position)) |
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
206 ((fboundp 'point-at-eol) (tramp-compat-funcall 'point-at-eol)) |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
207 (t (save-excursion (end-of-line) (point))))) |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
208 |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
209 (defsubst tramp-compat-temporary-file-directory () |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
210 "Return name of directory for temporary files (compat function). |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
211 For Emacs, this is the variable `temporary-file-directory', for XEmacs |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
212 this is the function `temp-directory'." |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
213 (cond |
85024
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
214 ((boundp 'temporary-file-directory) (symbol-value 'temporary-file-directory)) |
108377
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
215 ((fboundp 'temp-directory) (tramp-compat-funcall 'temp-directory)) |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
216 ((let ((d (getenv "TEMP"))) (and d (file-directory-p d))) |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
217 (file-name-as-directory (getenv "TEMP"))) |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
218 ((let ((d (getenv "TMP"))) (and d (file-directory-p d))) |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
219 (file-name-as-directory (getenv "TMP"))) |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
220 ((let ((d (getenv "TMPDIR"))) (and d (file-directory-p d))) |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
221 (file-name-as-directory (getenv "TMPDIR"))) |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
222 ((file-exists-p "c:/temp") (file-name-as-directory "c:/temp")) |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
223 (t (message (concat "Neither `temporary-file-directory' nor " |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
224 "`temp-directory' is defined -- using /tmp.")) |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
225 (file-name-as-directory "/tmp")))) |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
226 |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
227 ;; `make-temp-file' exists in Emacs only. On XEmacs, we use our own |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
228 ;; implementation with `make-temp-name', creating the temporary file |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
229 ;; immediately in order to avoid a security hole. |
107320
d2bfe26756ed
* net/tramp.el (tramp-do-copy-or-rename-file-out-of-band): Fix an
Michael Albinus <michael.albinus@gmx.de>
parents:
106815
diff
changeset
|
230 (defsubst tramp-compat-make-temp-file (filename &optional dir-flag) |
85041
a42b8750a992
* net/tramp.el (tramp-make-temp-file): Move to tramp-compat.el.
Michael Albinus <michael.albinus@gmx.de>
parents:
85024
diff
changeset
|
231 "Create a temporary file (compat function). |
a42b8750a992
* net/tramp.el (tramp-make-temp-file): Move to tramp-compat.el.
Michael Albinus <michael.albinus@gmx.de>
parents:
85024
diff
changeset
|
232 Add the extension of FILENAME, if existing." |
94402
2faa99de7eef
* net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents:
92981
diff
changeset
|
233 (let* (file-name-handler-alist |
2faa99de7eef
* net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents:
92981
diff
changeset
|
234 (prefix (expand-file-name |
2faa99de7eef
* net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents:
92981
diff
changeset
|
235 (symbol-value 'tramp-temp-name-prefix) |
2faa99de7eef
* net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents:
92981
diff
changeset
|
236 (tramp-compat-temporary-file-directory))) |
2faa99de7eef
* net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents:
92981
diff
changeset
|
237 (extension (file-name-extension filename t)) |
2faa99de7eef
* net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents:
92981
diff
changeset
|
238 result) |
108975
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
239 (condition-case nil |
85041
a42b8750a992
* net/tramp.el (tramp-make-temp-file): Move to tramp-compat.el.
Michael Albinus <michael.albinus@gmx.de>
parents:
85024
diff
changeset
|
240 (setq result |
108377
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
241 (tramp-compat-funcall 'make-temp-file prefix dir-flag extension)) |
108975
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
242 (error |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
243 ;; We use our own implementation, taken from files.el. |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
244 (while |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
245 (condition-case () |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
246 (progn |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
247 (setq result (concat (make-temp-name prefix) extension)) |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
248 (if dir-flag |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
249 (make-directory result) |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
250 (write-region "" nil result nil 'silent)) |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
251 nil) |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
252 (file-already-exists t)) |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
253 ;; The file was somehow created by someone else between |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
254 ;; `make-temp-name' and `write-region', let's try again. |
c4552014bea2
* net/tramp.el (tramp-remote-process-environment): Protect version
Michael Albinus <albinus@detlef>
parents:
108816
diff
changeset
|
255 nil))) |
85041
a42b8750a992
* net/tramp.el (tramp-make-temp-file): Move to tramp-compat.el.
Michael Albinus <michael.albinus@gmx.de>
parents:
85024
diff
changeset
|
256 result)) |
a42b8750a992
* net/tramp.el (tramp-make-temp-file): Move to tramp-compat.el.
Michael Albinus <michael.albinus@gmx.de>
parents:
85024
diff
changeset
|
257 |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
258 ;; `most-positive-fixnum' does not exist in XEmacs. |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
259 (defsubst tramp-compat-most-positive-fixnum () |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
260 "Return largest positive integer value (compat function)." |
85024
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
261 (cond |
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
262 ((boundp 'most-positive-fixnum) (symbol-value 'most-positive-fixnum)) |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
263 ;; Default value in XEmacs. |
85024
ef71cdab0d5c
* net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents:
84992
diff
changeset
|
264 (t 134217727))) |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
265 |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
266 ;; ID-FORMAT does not exists in XEmacs. |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
267 (defun tramp-compat-file-attributes (filename &optional id-format) |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
268 "Like `file-attributes' for Tramp files (compat function)." |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
269 (cond |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
270 ((or (null id-format) (eq id-format 'integer)) |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
271 (file-attributes filename)) |
104808
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
272 ((tramp-tramp-file-p filename) |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
273 (tramp-file-name-handler 'file-attributes filename id-format)) |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
274 (t (condition-case nil |
108377
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
275 (tramp-compat-funcall 'file-attributes filename id-format) |
108269
96984953f99e
* net/tramp.el (top, with-progress-reporter): Use
Michael Albinus <michael.albinus@gmx.de>
parents:
108244
diff
changeset
|
276 (wrong-number-of-arguments (file-attributes filename)))))) |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
277 |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
278 ;; PRESERVE-UID-GID has been introduced with Emacs 23. It does not |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
279 ;; hurt to ignore it for other (X)Emacs versions. |
108377
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
280 ;; PRESERVE-SELINUX-CONTEXT has been introduced with Emacs 24. |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
281 (defun tramp-compat-copy-file |
108377
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
282 (filename newname &optional ok-if-already-exists keep-date |
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
283 preserve-uid-gid preserve-selinux-context) |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
284 "Like `copy-file' for Tramp files (compat function)." |
108377
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
285 (cond |
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
286 (preserve-selinux-context |
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
287 (tramp-compat-funcall |
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
288 'copy-file filename newname ok-if-already-exists keep-date |
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
289 preserve-uid-gid preserve-selinux-context)) |
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
290 (preserve-uid-gid |
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
291 (tramp-compat-funcall |
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
292 'copy-file filename newname ok-if-already-exists keep-date |
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
293 preserve-uid-gid)) |
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
294 (t |
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
295 (copy-file filename newname ok-if-already-exists keep-date)))) |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
296 |
105892
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
297 ;; `copy-directory' is a new function in Emacs 23.2. Implementation |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
298 ;; is taken from there. |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
299 (defun tramp-compat-copy-directory |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
300 (directory newname &optional keep-time parents) |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
301 "Make a copy of DIRECTORY (compat function)." |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
302 (if (fboundp 'copy-directory) |
108377
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
303 (tramp-compat-funcall 'copy-directory directory newname keep-time parents) |
105892
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
304 |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
305 ;; If `default-directory' is a remote directory, make sure we find |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
306 ;; its `copy-directory' handler. |
105892
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
307 (let ((handler (or (find-file-name-handler directory 'copy-directory) |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
308 (find-file-name-handler newname 'copy-directory)))) |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
309 (if handler |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
310 (funcall handler 'copy-directory directory newname keep-time parents) |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
311 |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
312 ;; Compute target name. |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
313 (setq directory (directory-file-name (expand-file-name directory)) |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
314 newname (directory-file-name (expand-file-name newname))) |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
315 (if (and (file-directory-p newname) |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
316 (not (string-equal (file-name-nondirectory directory) |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
317 (file-name-nondirectory newname)))) |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
318 (setq newname |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
319 (expand-file-name |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
320 (file-name-nondirectory directory) newname))) |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
321 (if (not (file-directory-p newname)) (make-directory newname parents)) |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
322 |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
323 ;; Copy recursively. |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
324 (mapc |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
325 (lambda (file) |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
326 (if (file-directory-p file) |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
327 (tramp-compat-copy-directory file newname keep-time parents) |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
328 (copy-file file newname t keep-time))) |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
329 ;; We do not want to delete "." and "..". |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
330 (directory-files |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
331 directory 'full "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*")) |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
332 |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
333 ;; Set directory attributes. |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
334 (set-file-modes newname (file-modes directory)) |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
335 (if keep-time |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
336 (set-file-times newname (nth 5 (file-attributes directory)))))))) |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
337 |
108806
511da81b16c5
Change delete-by-moving-to-trash so Lisp calls explicitly request trashing.
Chong Yidong <cyd@stupidchicken.com>
parents:
108377
diff
changeset
|
338 ;; TRASH has been introduced with Emacs 24.1. |
511da81b16c5
Change delete-by-moving-to-trash so Lisp calls explicitly request trashing.
Chong Yidong <cyd@stupidchicken.com>
parents:
108377
diff
changeset
|
339 (defun tramp-compat-delete-file (filename &optional trash) |
108244
2ee48fcc701c
Add FORCE argument to `delete-file'.
Michael Albinus <michael.albinus@gmx.de>
parents:
107820
diff
changeset
|
340 "Like `delete-file' for Tramp files (compat function)." |
108806
511da81b16c5
Change delete-by-moving-to-trash so Lisp calls explicitly request trashing.
Chong Yidong <cyd@stupidchicken.com>
parents:
108377
diff
changeset
|
341 (condition-case nil |
511da81b16c5
Change delete-by-moving-to-trash so Lisp calls explicitly request trashing.
Chong Yidong <cyd@stupidchicken.com>
parents:
108377
diff
changeset
|
342 (tramp-compat-funcall 'delete-file filename trash) |
511da81b16c5
Change delete-by-moving-to-trash so Lisp calls explicitly request trashing.
Chong Yidong <cyd@stupidchicken.com>
parents:
108377
diff
changeset
|
343 ;; This Emacs version does not support the TRASH flag. |
511da81b16c5
Change delete-by-moving-to-trash so Lisp calls explicitly request trashing.
Chong Yidong <cyd@stupidchicken.com>
parents:
108377
diff
changeset
|
344 (wrong-number-of-arguments |
511da81b16c5
Change delete-by-moving-to-trash so Lisp calls explicitly request trashing.
Chong Yidong <cyd@stupidchicken.com>
parents:
108377
diff
changeset
|
345 (let ((delete-by-moving-to-trash |
511da81b16c5
Change delete-by-moving-to-trash so Lisp calls explicitly request trashing.
Chong Yidong <cyd@stupidchicken.com>
parents:
108377
diff
changeset
|
346 (and (boundp 'delete-by-moving-to-trash) |
108816
94d1d8a6dcfd
* net/tramp-compat.el (tramp-compat-delete-file): Use
Michael Albinus <michael.albinus@gmx.de>
parents:
108806
diff
changeset
|
347 (symbol-value 'delete-by-moving-to-trash) |
108806
511da81b16c5
Change delete-by-moving-to-trash so Lisp calls explicitly request trashing.
Chong Yidong <cyd@stupidchicken.com>
parents:
108377
diff
changeset
|
348 trash))) |
511da81b16c5
Change delete-by-moving-to-trash so Lisp calls explicitly request trashing.
Chong Yidong <cyd@stupidchicken.com>
parents:
108377
diff
changeset
|
349 (delete-file filename))))) |
108244
2ee48fcc701c
Add FORCE argument to `delete-file'.
Michael Albinus <michael.albinus@gmx.de>
parents:
107820
diff
changeset
|
350 |
105892
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
351 ;; RECURSIVE has been introduced with Emacs 23.2. |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
352 (defun tramp-compat-delete-directory (directory &optional recursive) |
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
353 "Like `delete-directory' for Tramp files (compat function)." |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
354 (if (null recursive) |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
355 (delete-directory directory) |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
356 (condition-case nil |
108377
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
357 (tramp-compat-funcall 'delete-directory directory recursive) |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
358 ;; This Emacs version does not support the RECURSIVE flag. We |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
359 ;; use the implementation from Emacs 23.2. |
108269
96984953f99e
* net/tramp.el (top, with-progress-reporter): Use
Michael Albinus <michael.albinus@gmx.de>
parents:
108244
diff
changeset
|
360 (wrong-number-of-arguments |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
361 (setq directory (directory-file-name (expand-file-name directory))) |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
362 (if (not (file-symlink-p directory)) |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
363 (mapc (lambda (file) |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
364 (if (eq t (car (file-attributes file))) |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
365 (tramp-compat-delete-directory file recursive) |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
366 (delete-file file))) |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
367 (directory-files |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
368 directory 'full "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*"))) |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
369 (delete-directory directory))))) |
105892
ac069dcbfe75
* net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents:
105493
diff
changeset
|
370 |
107820
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
371 ;; `number-sequence' does not exist in XEmacs. Implementation is |
e97568b31550
Synchronize with Tramp repository.
Michael Albinus <albinus@detlef>
parents:
107320
diff
changeset
|
372 ;; taken from Emacs 23. |
104808
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
373 (defun tramp-compat-number-sequence (from &optional to inc) |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
374 "Return a sequence of numbers from FROM to TO as a list (compat function)." |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
375 (if (or (subrp 'number-sequence) (symbol-file 'number-sequence)) |
108377
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
376 (tramp-compat-funcall 'number-sequence from to inc) |
104808
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
377 (if (or (not to) (= from to)) |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
378 (list from) |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
379 (or inc (setq inc 1)) |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
380 (when (zerop inc) (error "The increment can not be zero")) |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
381 (let (seq (n 0) (next from)) |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
382 (if (> inc 0) |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
383 (while (<= next to) |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
384 (setq seq (cons next seq) |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
385 n (1+ n) |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
386 next (+ from (* n inc)))) |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
387 (while (>= next to) |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
388 (setq seq (cons next seq) |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
389 n (1+ n) |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
390 next (+ from (* n inc))))) |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
391 (nreverse seq))))) |
90ec0abf1017
* net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents:
103529
diff
changeset
|
392 |
103529
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
393 (defun tramp-compat-split-string (string pattern) |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
394 "Like `split-string' but omit empty strings. |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
395 In Emacs, (split-string \"/foo/bar\" \"/\") returns (\"foo\" \"bar\"). |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
396 This is, the first, empty, element is omitted. In XEmacs, the first |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
397 element is not omitted." |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
398 (delete "" (split-string string pattern))) |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
399 |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
400 (defun tramp-compat-process-running-p (process-name) |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
401 "Returns `t' if system process PROCESS-NAME is running for `user-login-name'." |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
402 (when (stringp process-name) |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
403 (cond |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
404 ;; GNU Emacs 22 on w32. |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
405 ((fboundp 'w32-window-exists-p) |
108377
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
406 (tramp-compat-funcall 'w32-window-exists-p process-name process-name)) |
103529
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
407 |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
408 ;; GNU Emacs 23. |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
409 ((and (fboundp 'list-system-processes) (fboundp 'process-attributes)) |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
410 (let (result) |
108377
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
411 (dolist (pid (tramp-compat-funcall 'list-system-processes) result) |
7827d5a5c826
* net/tramp-compat.el (byte-compile-not-obsolete-vars): Define if
Michael Albinus <albinus@detlef>
parents:
108269
diff
changeset
|
412 (let ((attributes (tramp-compat-funcall 'process-attributes pid))) |
105493
c8d4e5f3f0c8
(tramp-compat-process-running-p): Check that
Sam Steingold <sds@gnu.org>
parents:
105044
diff
changeset
|
413 (when (and (string-equal |
c8d4e5f3f0c8
(tramp-compat-process-running-p): Check that
Sam Steingold <sds@gnu.org>
parents:
105044
diff
changeset
|
414 (cdr (assoc 'user attributes)) (user-login-name)) |
c8d4e5f3f0c8
(tramp-compat-process-running-p): Check that
Sam Steingold <sds@gnu.org>
parents:
105044
diff
changeset
|
415 (let ((comm (cdr (assoc 'comm attributes)))) |
c8d4e5f3f0c8
(tramp-compat-process-running-p): Check that
Sam Steingold <sds@gnu.org>
parents:
105044
diff
changeset
|
416 ;; The returned command name could be truncated |
c8d4e5f3f0c8
(tramp-compat-process-running-p): Check that
Sam Steingold <sds@gnu.org>
parents:
105044
diff
changeset
|
417 ;; to 15 characters. Therefore, we cannot check |
c8d4e5f3f0c8
(tramp-compat-process-running-p): Check that
Sam Steingold <sds@gnu.org>
parents:
105044
diff
changeset
|
418 ;; for `string-equal'. |
c8d4e5f3f0c8
(tramp-compat-process-running-p): Check that
Sam Steingold <sds@gnu.org>
parents:
105044
diff
changeset
|
419 (and comm (string-match |
c8d4e5f3f0c8
(tramp-compat-process-running-p): Check that
Sam Steingold <sds@gnu.org>
parents:
105044
diff
changeset
|
420 (concat "^" (regexp-quote comm)) |
c8d4e5f3f0c8
(tramp-compat-process-running-p): Check that
Sam Steingold <sds@gnu.org>
parents:
105044
diff
changeset
|
421 process-name)))) |
103529
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
422 (setq result t)))))) |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
423 |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
424 ;; Fallback, if there is no Lisp support yet. |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
425 (t (let ((default-directory |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
426 (if (file-remote-p default-directory) |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
427 (tramp-compat-temporary-file-directory) |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
428 default-directory)) |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
429 (unix95 (getenv "UNIX95")) |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
430 result) |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
431 (setenv "UNIX95" "1") |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
432 (when (member |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
433 (user-login-name) |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
434 (tramp-compat-split-string |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
435 (shell-command-to-string |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
436 (format "ps -C %s -o user=" process-name)) |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
437 "[ \f\t\n\r\v]+")) |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
438 (setq result t)) |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
439 (setenv "UNIX95" unix95) |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
440 result))))) |
83914fa17916
* net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents:
100908
diff
changeset
|
441 |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
442 (provide 'tramp-compat) |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
443 |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
444 ;;; TODO: |
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
445 |
84992 | 446 ;; arch-tag: 0e724b18-6699-4f87-ad96-640b272e5c85 |
84985
f7642749252b
* net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff
changeset
|
447 ;;; tramp-compat.el ends here |