annotate lisp/net/tramp-compat.el @ 111602:f44b93254721

Fix some ls-lisp oddness. * lisp/ls-lisp.el (ls-lisp-dired-ignore-case): Make it an obsolete alias.
author Glenn Morris <rgm@gnu.org>
date Wed, 10 Nov 2010 19:48:46 -0800
parents 5a6b4fafaa52
children 376148b31b5e
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
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
1d1d5d9bd884 Add 2010 to copyright years.
Glenn Morris <rgm@gnu.org>
parents: 106613
diff changeset
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
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
7
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
8 ;; This file is part of GNU Emacs.
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
9
94677
91e5880a36c1 Switch to recommended form of GPLv3 permissions notice.
Glenn Morris <rgm@gnu.org>
parents: 94402
diff changeset
10 ;; 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
11 ;; 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
12 ;; 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
13 ;; (at your option) any later version.
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
14
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
15 ;; 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
16 ;; 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
17 ;; 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
18 ;; GNU General Public License for more details.
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
19
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
20 ;; 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
21 ;; 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
22
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
23 ;;; Commentary:
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
24
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
25 ;; Tramp's main Emacs version for development is GNU Emacs 24. This
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
26 ;; package provides compatibility functions for GNU Emacs 22, GNU
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
27 ;; Emacs 23 and XEmacs 21.4+.
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
28
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
29 ;;; Code:
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
30
87322
e99e230d7eb3 * files.el (cd-absolute): Set `list-buffers-directory' in order to
Michael Albinus <michael.albinus@gmx.de>
parents: 85067
diff changeset
31 (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
32
e99e230d7eb3 * files.el (cd-absolute): Set `list-buffers-directory' in order to
Michael Albinus <michael.albinus@gmx.de>
parents: 85067
diff changeset
33 ;; 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
34 (require 'cl))
e99e230d7eb3 * files.el (cd-absolute): Set `list-buffers-directory' in order to
Michael Albinus <michael.albinus@gmx.de>
parents: 85067
diff changeset
35
85024
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84992
diff changeset
36 (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
37
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84992
diff changeset
38 (require 'custom)
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84992
diff changeset
39
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84992
diff changeset
40 ;; 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
41 (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
42 (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
43 (require 'timer))
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
44
104808
90ec0abf1017 * net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents: 103529
diff changeset
45 (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
46 (autoload 'tramp-file-name-handler "tramp")
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
47
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
48 ;; We check whether `start-file-process' is bound.
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
49 (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
50
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
51 ;; tramp-util offers integration into other (X)Emacs packages like
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
52 ;; 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
53 (eval-after-load "tramp"
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
54 '(progn
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
55 (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
56 (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
57 '(lambda ()
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
58 (when (featurep 'tramp-util)
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
59 (unload-feature 'tramp-util 'force))))))
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
60
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
61 ;; Make sure that we get integration with the VC package. When it
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
62 ;; is loaded, we need to pull in the integration module. Not
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
63 ;; necessary in Emacs 23.
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
64 (eval-after-load "vc"
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
65 (eval-after-load "tramp"
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
66 '(progn
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
67 (require 'tramp-vc)
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
68 (add-hook 'tramp-unload-hook
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
69 '(lambda ()
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
70 (when (featurep 'tramp-vc)
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
71 (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
72
85024
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84992
diff changeset
73 ;; 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
74 ;; 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
75 (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
76 (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
77 (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
78 (delq 'unused-vars byte-compile-default-warnings))
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
79
85024
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84992
diff changeset
80 ;; `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
81 (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
82 (defvar last-coding-system-used nil))
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
83
85024
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84992
diff changeset
84 ;; `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
85 ;; 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
86 ;; needed to pacify Emacs byte-compiler.
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
87 (unless (boundp 'byte-compile-not-obsolete-var)
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
88 (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
89 (setq byte-compile-not-obsolete-var 'directory-sep-char)
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
90 ;; Emacs 23.2.
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
91 (unless (boundp 'byte-compile-not-obsolete-vars)
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
92 (defvar byte-compile-not-obsolete-vars nil))
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
93 (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
94
85024
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84992
diff changeset
95 ;; `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
96 (condition-case nil
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
97 (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
98 (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
99
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
100 ;; For not existing functions, or functions with a changed argument
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
101 ;; list, there are compiler warnings. We want to avoid them in
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
102 ;; cases we know what we do.
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
103 (defmacro tramp-compat-funcall (function &rest arguments)
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
104 (if (featurep 'xemacs)
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
105 `(funcall (symbol-function ,function) ,@arguments)
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
106 `(when (or (subrp ,function) (functionp ,function))
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
107 (with-no-warnings (funcall ,function ,@arguments)))))
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
108
85024
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84992
diff changeset
109 ;; `set-buffer-multibyte' comes from Emacs Leim.
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
110 (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
111 (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
112
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84992
diff changeset
113 ;; `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
114 (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
115 (defalias 'font-lock-add-keywords 'ignore))
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
116
104808
90ec0abf1017 * net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents: 103529
diff changeset
117 ;; 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
118 ;; `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
119 ;; mechanism.
90ec0abf1017 * net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents: 103529
diff changeset
120
85024
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84992
diff changeset
121 ;; `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
122 ;; 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
123 ;; 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
124 ;; function exists.
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84992
diff changeset
125 (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
126 (defalias 'file-remote-p
90ec0abf1017 * net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents: 103529
diff changeset
127 (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
128 (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
129 (tramp-file-name-handler
90ec0abf1017 * net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents: 103529
diff changeset
130 '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
131
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
132 ;; `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
133 (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
134 (defalias 'process-file
90ec0abf1017 * net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents: 103529
diff changeset
135 (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
136 (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
137 (apply
90ec0abf1017 * net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents: 103529
diff changeset
138 'tramp-file-name-handler
90ec0abf1017 * net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents: 103529
diff changeset
139 '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
140
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84992
diff changeset
141 ;; `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
142 (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
143 (defalias 'start-file-process
90ec0abf1017 * net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents: 103529
diff changeset
144 (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
145 (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
146 (apply
90ec0abf1017 * net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents: 103529
diff changeset
147 'tramp-file-name-handler
90ec0abf1017 * net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents: 103529
diff changeset
148 '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
149
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84992
diff changeset
150 ;; `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
151 (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
152 (defalias 'set-file-times
90ec0abf1017 * net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents: 103529
diff changeset
153 (lambda (filename &optional time)
90ec0abf1017 * net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents: 103529
diff changeset
154 (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
155 (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
156 '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
157
291ea018e478 * files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents: 105892
diff changeset
158 ;; 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
159 ;; 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
160 ;; 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
161 ;; 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
162 ;; 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
163 ;; 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
164 ;; 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
165 ;; It is not needed anymore since GNU Emacs 23.2.
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
166 (unless (or (featurep 'xemacs)
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
167 ;; `featurep' has only one argument in XEmacs.
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
168 (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
169 (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
170 (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
171 (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
172 ;; 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
173 ;; at all.
291ea018e478 * files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents: 105892
diff changeset
174 (if (and
291ea018e478 * files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents: 105892
diff changeset
175 (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
176 (not (string-match
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
177 "[[*?]" (tramp-compat-funcall
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
178 '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
179 (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
180 ;; 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
181 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
182 (add-hook
291ea018e478 * files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents: 105892
diff changeset
183 '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
184 (lambda ()
291ea018e478 * files.el (file-expand-wildcards): In case of remote files, check
Michael Albinus <michael.albinus@gmx.de>
parents: 105892
diff changeset
185 (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
186 '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
187 (ad-activate 'file-expand-wildcards)))))
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
188
104851
5e1bd0e3a13b * net/tramp-compat.el (tramp-compat-line-beginning-position): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104808
diff changeset
189 (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
190 "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
191 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
192 own implementation."
5e1bd0e3a13b * net/tramp-compat.el (tramp-compat-line-beginning-position): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104808
diff changeset
193 (cond
5e1bd0e3a13b * net/tramp-compat.el (tramp-compat-line-beginning-position): New defun.
Michael Albinus <michael.albinus@gmx.de>
parents: 104808
diff changeset
194 ((fboundp 'line-beginning-position)
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
195 (tramp-compat-funcall 'line-beginning-position))
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
196 ((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
197 (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
198
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
199 (defsubst tramp-compat-line-end-position ()
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
200 "Return point at end of line (compat function).
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
201 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
202 own implementation."
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
203 (cond
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
204 ((fboundp 'line-end-position) (tramp-compat-funcall 'line-end-position))
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
205 ((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
206 (t (save-excursion (end-of-line) (point)))))
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
207
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
208 (defsubst tramp-compat-temporary-file-directory ()
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
209 "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
210 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
211 this is the function `temp-directory'."
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
212 (cond
85024
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84992
diff changeset
213 ((boundp 'temporary-file-directory) (symbol-value 'temporary-file-directory))
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
214 ((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
215 ((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
216 (file-name-as-directory (getenv "TEMP")))
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
217 ((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
218 (file-name-as-directory (getenv "TMP")))
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
219 ((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
220 (file-name-as-directory (getenv "TMPDIR")))
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
221 ((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
222 (t (message (concat "Neither `temporary-file-directory' nor "
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
223 "`temp-directory' is defined -- using /tmp."))
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
224 (file-name-as-directory "/tmp"))))
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
225
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
226 ;; `make-temp-file' exists in Emacs only. On XEmacs, we use our own
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
227 ;; implementation with `make-temp-name', creating the temporary file
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
228 ;; 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
229 (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
230 "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
231 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
232 (let* (file-name-handler-alist
2faa99de7eef * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 92981
diff changeset
233 (prefix (expand-file-name
2faa99de7eef * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 92981
diff changeset
234 (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
235 (tramp-compat-temporary-file-directory)))
2faa99de7eef * net/tramp.el (tramp-handle-make-symbolic-link)
Michael Albinus <michael.albinus@gmx.de>
parents: 92981
diff changeset
236 (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
237 result)
85041
a42b8750a992 * net/tramp.el (tramp-make-temp-file): Move to tramp-compat.el.
Michael Albinus <michael.albinus@gmx.de>
parents: 85024
diff changeset
238 (condition-case nil
a42b8750a992 * net/tramp.el (tramp-make-temp-file): Move to tramp-compat.el.
Michael Albinus <michael.albinus@gmx.de>
parents: 85024
diff changeset
239 (setq result
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
240 (tramp-compat-funcall 'make-temp-file prefix dir-flag extension))
85041
a42b8750a992 * net/tramp.el (tramp-make-temp-file): Move to tramp-compat.el.
Michael Albinus <michael.albinus@gmx.de>
parents: 85024
diff changeset
241 (error
a42b8750a992 * net/tramp.el (tramp-make-temp-file): Move to tramp-compat.el.
Michael Albinus <michael.albinus@gmx.de>
parents: 85024
diff changeset
242 ;; We use our own implementation, taken from files.el.
a42b8750a992 * net/tramp.el (tramp-make-temp-file): Move to tramp-compat.el.
Michael Albinus <michael.albinus@gmx.de>
parents: 85024
diff changeset
243 (while
a42b8750a992 * net/tramp.el (tramp-make-temp-file): Move to tramp-compat.el.
Michael Albinus <michael.albinus@gmx.de>
parents: 85024
diff changeset
244 (condition-case ()
a42b8750a992 * net/tramp.el (tramp-make-temp-file): Move to tramp-compat.el.
Michael Albinus <michael.albinus@gmx.de>
parents: 85024
diff changeset
245 (progn
a42b8750a992 * net/tramp.el (tramp-make-temp-file): Move to tramp-compat.el.
Michael Albinus <michael.albinus@gmx.de>
parents: 85024
diff changeset
246 (setq result (concat (make-temp-name prefix) extension))
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
247 (if dir-flag
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
248 (make-directory result)
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
249 (write-region "" nil result nil 'silent))
85041
a42b8750a992 * net/tramp.el (tramp-make-temp-file): Move to tramp-compat.el.
Michael Albinus <michael.albinus@gmx.de>
parents: 85024
diff changeset
250 nil)
a42b8750a992 * net/tramp.el (tramp-make-temp-file): Move to tramp-compat.el.
Michael Albinus <michael.albinus@gmx.de>
parents: 85024
diff changeset
251 (file-already-exists t))
a42b8750a992 * net/tramp.el (tramp-make-temp-file): Move to tramp-compat.el.
Michael Albinus <michael.albinus@gmx.de>
parents: 85024
diff changeset
252 ;; The file was somehow created by someone else between
a42b8750a992 * net/tramp.el (tramp-make-temp-file): Move to tramp-compat.el.
Michael Albinus <michael.albinus@gmx.de>
parents: 85024
diff changeset
253 ;; `make-temp-name' and `write-region', let's try again.
a42b8750a992 * net/tramp.el (tramp-make-temp-file): Move to tramp-compat.el.
Michael Albinus <michael.albinus@gmx.de>
parents: 85024
diff changeset
254 nil)))
a42b8750a992 * net/tramp.el (tramp-make-temp-file): Move to tramp-compat.el.
Michael Albinus <michael.albinus@gmx.de>
parents: 85024
diff changeset
255 result))
a42b8750a992 * net/tramp.el (tramp-make-temp-file): Move to tramp-compat.el.
Michael Albinus <michael.albinus@gmx.de>
parents: 85024
diff changeset
256
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
257 ;; `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
258 (defsubst tramp-compat-most-positive-fixnum ()
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
259 "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
260 (cond
ef71cdab0d5c * net/tramp.el (top): Add tramp-compat to `tramp-unload-hook'.
Michael Albinus <michael.albinus@gmx.de>
parents: 84992
diff changeset
261 ((boundp 'most-positive-fixnum) (symbol-value 'most-positive-fixnum))
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
262 ;; 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
263 (t 134217727)))
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
264
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
265 ;; ID-FORMAT does not exists in XEmacs.
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
266 (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
267 "Like `file-attributes' for Tramp files (compat function)."
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
268 (cond
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
269 ((or (null id-format) (eq id-format 'integer))
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
270 (file-attributes filename))
104808
90ec0abf1017 * net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents: 103529
diff changeset
271 ((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
272 (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
273 (t (condition-case nil
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
274 (tramp-compat-funcall 'file-attributes filename id-format)
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
275 (wrong-number-of-arguments (file-attributes filename))))))
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
276
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
277 ;; 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
278 ;; hurt to ignore it for other (X)Emacs versions.
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
279 ;; 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
280 (defun tramp-compat-copy-file
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
281 (filename newname &optional ok-if-already-exists keep-date
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
282 preserve-uid-gid preserve-selinux-context)
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
283 "Like `copy-file' for Tramp files (compat function)."
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
284 (cond
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
285 (preserve-selinux-context
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
286 (tramp-compat-funcall
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
287 'copy-file filename newname ok-if-already-exists keep-date
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
288 preserve-uid-gid preserve-selinux-context))
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
289 (preserve-uid-gid
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
290 (tramp-compat-funcall
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
291 'copy-file filename newname ok-if-already-exists keep-date
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
292 preserve-uid-gid))
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
293 (t
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
294 (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
295
105892
ac069dcbfe75 * net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents: 105493
diff changeset
296 ;; `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
297 ;; is taken from there.
ac069dcbfe75 * net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents: 105493
diff changeset
298 (defun tramp-compat-copy-directory
ac069dcbfe75 * net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents: 105493
diff changeset
299 (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
300 "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
301 (if (fboundp 'copy-directory)
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
302 (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
303
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
304 ;; If `default-directory' is a remote directory, make sure we find
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
305 ;; its `copy-directory' handler.
105892
ac069dcbfe75 * net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents: 105493
diff changeset
306 (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
307 (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
308 (if handler
ac069dcbfe75 * net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents: 105493
diff changeset
309 (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
310
ac069dcbfe75 * net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents: 105493
diff changeset
311 ;; Compute target name.
ac069dcbfe75 * net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents: 105493
diff changeset
312 (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
313 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
314 (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
315 (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
316 (file-name-nondirectory newname))))
ac069dcbfe75 * net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents: 105493
diff changeset
317 (setq newname
ac069dcbfe75 * net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents: 105493
diff changeset
318 (expand-file-name
ac069dcbfe75 * net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents: 105493
diff changeset
319 (file-name-nondirectory directory) newname)))
ac069dcbfe75 * net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents: 105493
diff changeset
320 (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
321
ac069dcbfe75 * net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents: 105493
diff changeset
322 ;; Copy recursively.
ac069dcbfe75 * net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents: 105493
diff changeset
323 (mapc
ac069dcbfe75 * net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents: 105493
diff changeset
324 (lambda (file)
ac069dcbfe75 * net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents: 105493
diff changeset
325 (if (file-directory-p file)
ac069dcbfe75 * net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents: 105493
diff changeset
326 (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
327 (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
328 ;; 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
329 (directory-files
ac069dcbfe75 * net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents: 105493
diff changeset
330 directory 'full "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*"))
ac069dcbfe75 * net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents: 105493
diff changeset
331
ac069dcbfe75 * net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents: 105493
diff changeset
332 ;; Set directory attributes.
ac069dcbfe75 * net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents: 105493
diff changeset
333 (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
334 (if keep-time
ac069dcbfe75 * net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents: 105493
diff changeset
335 (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
336
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
337 ;; TRASH has been introduced with Emacs 24.1.
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
338 (defun tramp-compat-delete-file (filename &optional trash)
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
339 "Like `delete-file' for Tramp files (compat function)."
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
340 (condition-case nil
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
341 (tramp-compat-funcall 'delete-file filename trash)
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
342 ;; This Emacs version does not support the TRASH flag.
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
343 (wrong-number-of-arguments
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
344 (let ((delete-by-moving-to-trash
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
345 (and (boundp 'delete-by-moving-to-trash)
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
346 (symbol-value 'delete-by-moving-to-trash)
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
347 trash)))
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
348 (delete-file filename)))))
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
349
105892
ac069dcbfe75 * net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents: 105493
diff changeset
350 ;; 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
351 (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
352 "Like `delete-directory' for Tramp files (compat function)."
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
353 (if (null recursive)
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
354 (delete-directory directory)
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
355 (condition-case nil
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
356 (tramp-compat-funcall 'delete-directory directory recursive)
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
357 ;; This Emacs version does not support the RECURSIVE flag. We
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
358 ;; use the implementation from Emacs 23.2.
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
359 (wrong-number-of-arguments
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
360 (setq directory (directory-file-name (expand-file-name directory)))
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
361 (if (not (file-symlink-p directory))
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
362 (mapc (lambda (file)
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
363 (if (eq t (car (file-attributes file)))
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
364 (tramp-compat-delete-directory file recursive)
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
365 (delete-file file)))
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
366 (directory-files
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
367 directory 'full "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*")))
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
368 (delete-directory directory)))))
105892
ac069dcbfe75 * net/tramp-compat.el (tramp-compat-copy-directory)
Michael Albinus <michael.albinus@gmx.de>
parents: 105493
diff changeset
369
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
370 ;; `number-sequence' does not exist in XEmacs. Implementation is
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
371 ;; 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
372 (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
373 "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
374 (if (or (subrp 'number-sequence) (symbol-file 'number-sequence))
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
375 (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
376 (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
377 (list from)
90ec0abf1017 * net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents: 103529
diff changeset
378 (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
379 (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
380 (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
381 (if (> inc 0)
90ec0abf1017 * net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents: 103529
diff changeset
382 (while (<= next to)
90ec0abf1017 * net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents: 103529
diff changeset
383 (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
384 n (1+ n)
90ec0abf1017 * net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents: 103529
diff changeset
385 next (+ from (* n inc))))
90ec0abf1017 * net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents: 103529
diff changeset
386 (while (>= next to)
90ec0abf1017 * net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents: 103529
diff changeset
387 (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
388 n (1+ n)
90ec0abf1017 * net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents: 103529
diff changeset
389 next (+ from (* n inc)))))
90ec0abf1017 * net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents: 103529
diff changeset
390 (nreverse seq)))))
90ec0abf1017 * net/tramp-compat.el (top): Autoload used functions from
Michael Albinus <michael.albinus@gmx.de>
parents: 103529
diff changeset
391
103529
83914fa17916 * net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents: 100908
diff changeset
392 (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
393 "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
394 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
395 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
396 element is not omitted."
83914fa17916 * net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents: 100908
diff changeset
397 (delete "" (split-string string pattern)))
83914fa17916 * net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents: 100908
diff changeset
398
83914fa17916 * net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents: 100908
diff changeset
399 (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
400 "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
401 (when (stringp process-name)
83914fa17916 * net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents: 100908
diff changeset
402 (cond
83914fa17916 * net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents: 100908
diff changeset
403 ;; GNU Emacs 22 on w32.
83914fa17916 * net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents: 100908
diff changeset
404 ((fboundp 'w32-window-exists-p)
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
405 (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
406
83914fa17916 * net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents: 100908
diff changeset
407 ;; GNU Emacs 23.
83914fa17916 * net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents: 100908
diff changeset
408 ((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
409 (let (result)
110121
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
410 (dolist (pid (tramp-compat-funcall 'list-system-processes) result)
5a6b4fafaa52 Sync with Tramp 2.1.19.
Michael Albinus <michael.albinus@gmx.de>
parents: 107320
diff changeset
411 (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
412 (when (and (string-equal
c8d4e5f3f0c8 (tramp-compat-process-running-p): Check that
Sam Steingold <sds@gnu.org>
parents: 105044
diff changeset
413 (cdr (assoc 'user attributes)) (user-login-name))
c8d4e5f3f0c8 (tramp-compat-process-running-p): Check that
Sam Steingold <sds@gnu.org>
parents: 105044
diff changeset
414 (let ((comm (cdr (assoc 'comm attributes))))
c8d4e5f3f0c8 (tramp-compat-process-running-p): Check that
Sam Steingold <sds@gnu.org>
parents: 105044
diff changeset
415 ;; The returned command name could be truncated
c8d4e5f3f0c8 (tramp-compat-process-running-p): Check that
Sam Steingold <sds@gnu.org>
parents: 105044
diff changeset
416 ;; to 15 characters. Therefore, we cannot check
c8d4e5f3f0c8 (tramp-compat-process-running-p): Check that
Sam Steingold <sds@gnu.org>
parents: 105044
diff changeset
417 ;; for `string-equal'.
c8d4e5f3f0c8 (tramp-compat-process-running-p): Check that
Sam Steingold <sds@gnu.org>
parents: 105044
diff changeset
418 (and comm (string-match
c8d4e5f3f0c8 (tramp-compat-process-running-p): Check that
Sam Steingold <sds@gnu.org>
parents: 105044
diff changeset
419 (concat "^" (regexp-quote comm))
c8d4e5f3f0c8 (tramp-compat-process-running-p): Check that
Sam Steingold <sds@gnu.org>
parents: 105044
diff changeset
420 process-name))))
103529
83914fa17916 * net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents: 100908
diff changeset
421 (setq result t))))))
83914fa17916 * net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents: 100908
diff changeset
422
83914fa17916 * net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents: 100908
diff changeset
423 ;; 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
424 (t (let ((default-directory
83914fa17916 * net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents: 100908
diff changeset
425 (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
426 (tramp-compat-temporary-file-directory)
83914fa17916 * net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents: 100908
diff changeset
427 default-directory))
83914fa17916 * net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents: 100908
diff changeset
428 (unix95 (getenv "UNIX95"))
83914fa17916 * net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents: 100908
diff changeset
429 result)
83914fa17916 * net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents: 100908
diff changeset
430 (setenv "UNIX95" "1")
83914fa17916 * net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents: 100908
diff changeset
431 (when (member
83914fa17916 * net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents: 100908
diff changeset
432 (user-login-name)
83914fa17916 * net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents: 100908
diff changeset
433 (tramp-compat-split-string
83914fa17916 * net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents: 100908
diff changeset
434 (shell-command-to-string
83914fa17916 * net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents: 100908
diff changeset
435 (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
436 "[ \f\t\n\r\v]+"))
83914fa17916 * net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents: 100908
diff changeset
437 (setq result t))
83914fa17916 * net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents: 100908
diff changeset
438 (setenv "UNIX95" unix95)
83914fa17916 * net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents: 100908
diff changeset
439 result)))))
83914fa17916 * net/tramp-compat.el (tramp-compat-split-string)
Michael Albinus <michael.albinus@gmx.de>
parents: 100908
diff changeset
440
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
441 (provide 'tramp-compat)
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
442
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
443 ;;; TODO:
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
444
84992
5a1966aded2d Add arch tagline
Miles Bader <miles@gnu.org>
parents: 84985
diff changeset
445 ;; arch-tag: 0e724b18-6699-4f87-ad96-640b272e5c85
84985
f7642749252b * net/tramp-compat.el: New file.
Michael Albinus <michael.albinus@gmx.de>
parents:
diff changeset
446 ;;; tramp-compat.el ends here