Mercurial > emacs
view lisp/net/tramp-compat.el @ 110352:7c4d14415111
Fix bug#6999.
* lisp/calendar/diary-lib.el (diary-included-files): New variable.
(diary-list-entries): Maybe initialize diary-included-files.
(diary-include-other-diary-files): Append to diary-included-files.
* lisp/calendar/appt.el (appt-update-list): Also check the members of
diary-included-files.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Tue, 14 Sep 2010 00:15:06 -0700 |
parents | 5a6b4fafaa52 |
children | 376148b31b5e |
line wrap: on
line source
;;; tramp-compat.el --- Tramp compatibility functions ;; Copyright (C) 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Michael Albinus <michael.albinus@gmx.de> ;; Keywords: comm, processes ;; This file is part of GNU Emacs. ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;; Tramp's main Emacs version for development is GNU Emacs 24. This ;; package provides compatibility functions for GNU Emacs 22, GNU ;; Emacs 23 and XEmacs 21.4+. ;;; Code: (eval-when-compile ;; Pacify byte-compiler. (require 'cl)) (eval-and-compile (require 'custom) ;; Load the appropriate timer package. (if (featurep 'xemacs) (require 'timer-funcs) (require 'timer)) (autoload 'tramp-tramp-file-p "tramp") (autoload 'tramp-file-name-handler "tramp") ;; We check whether `start-file-process' is bound. (unless (fboundp 'start-file-process) ;; tramp-util offers integration into other (X)Emacs packages like ;; compile.el, gud.el etc. Not necessary in Emacs 23. (eval-after-load "tramp" '(progn (require 'tramp-util) (add-hook 'tramp-unload-hook '(lambda () (when (featurep 'tramp-util) (unload-feature 'tramp-util 'force)))))) ;; Make sure that we get integration with the VC package. When it ;; is loaded, we need to pull in the integration module. Not ;; necessary in Emacs 23. (eval-after-load "vc" (eval-after-load "tramp" '(progn (require 'tramp-vc) (add-hook 'tramp-unload-hook '(lambda () (when (featurep 'tramp-vc) (unload-feature 'tramp-vc 'force)))))))) ;; Avoid byte-compiler warnings if the byte-compiler supports this. ;; Currently, XEmacs supports this. (when (featurep 'xemacs) (unless (boundp 'byte-compile-default-warnings) (defvar byte-compile-default-warnings nil)) (delq 'unused-vars byte-compile-default-warnings)) ;; `last-coding-system-used' is unknown in XEmacs. (unless (boundp 'last-coding-system-used) (defvar last-coding-system-used nil)) ;; `directory-sep-char' is an obsolete variable in Emacs. But it is ;; used in XEmacs, so we set it here and there. The following is ;; needed to pacify Emacs byte-compiler. (unless (boundp 'byte-compile-not-obsolete-var) (defvar byte-compile-not-obsolete-var nil)) (setq byte-compile-not-obsolete-var 'directory-sep-char) ;; Emacs 23.2. (unless (boundp 'byte-compile-not-obsolete-vars) (defvar byte-compile-not-obsolete-vars nil)) (setq byte-compile-not-obsolete-vars '(directory-sep-char)) ;; `with-temp-message' does not exists in XEmacs. (condition-case nil (with-temp-message (current-message) nil) (error (defmacro with-temp-message (message &rest body) `(progn ,@body)))) ;; For not existing functions, or functions with a changed argument ;; list, there are compiler warnings. We want to avoid them in ;; cases we know what we do. (defmacro tramp-compat-funcall (function &rest arguments) (if (featurep 'xemacs) `(funcall (symbol-function ,function) ,@arguments) `(when (or (subrp ,function) (functionp ,function)) (with-no-warnings (funcall ,function ,@arguments))))) ;; `set-buffer-multibyte' comes from Emacs Leim. (unless (fboundp 'set-buffer-multibyte) (defalias 'set-buffer-multibyte 'ignore)) ;; `font-lock-add-keywords' does not exist in XEmacs. (unless (fboundp 'font-lock-add-keywords) (defalias 'font-lock-add-keywords 'ignore)) ;; The following functions cannot be aliases of the corresponding ;; `tramp-handle-*' functions, because this would bypass the locking ;; mechanism. ;; `file-remote-p' has been introduced with Emacs 22. The version ;; of XEmacs is not a magic file name function (yet); this is ;; corrected in tramp-util.el. Here it is sufficient if the ;; function exists. (unless (fboundp 'file-remote-p) (defalias 'file-remote-p (lambda (file &optional identification connected) (when (tramp-tramp-file-p file) (tramp-file-name-handler 'file-remote-p file identification connected))))) ;; `process-file' does not exist in XEmacs. (unless (fboundp 'process-file) (defalias 'process-file (lambda (program &optional infile buffer display &rest args) (when (tramp-tramp-file-p default-directory) (apply 'tramp-file-name-handler 'process-file program infile buffer display args))))) ;; `start-file-process' is new in Emacs 23. (unless (fboundp 'start-file-process) (defalias 'start-file-process (lambda (name buffer program &rest program-args) (when (tramp-tramp-file-p default-directory) (apply 'tramp-file-name-handler 'start-file-process name buffer program program-args))))) ;; `set-file-times' is also new in Emacs 23. (unless (fboundp 'set-file-times) (defalias 'set-file-times (lambda (filename &optional time) (when (tramp-tramp-file-p filename) (tramp-file-name-handler 'set-file-times filename time))))) ;; We currently use "[" and "]" in the filename format for IPv6 ;; hosts of GNU Emacs. This means, that Emacs wants to expand ;; wildcards if `find-file-wildcards' is non-nil, and then barfs ;; because no expansion could be found. We detect this situation ;; and do something really awful: we have `file-expand-wildcards' ;; return the original filename if it can't expand anything. Let's ;; just hope that this doesn't break anything else. ;; It is not needed anymore since GNU Emacs 23.2. (unless (or (featurep 'xemacs) ;; `featurep' has only one argument in XEmacs. (funcall 'featurep 'files 'remote-wildcards)) (defadvice file-expand-wildcards (around tramp-advice-file-expand-wildcards activate) (let ((name (ad-get-arg 0))) ;; If it's a Tramp file, look if wildcards need to be expanded ;; at all. (if (and (tramp-tramp-file-p name) (not (string-match "[[*?]" (tramp-compat-funcall 'file-remote-p name 'localname)))) (setq ad-return-value (list name)) ;; Otherwise, just run the original function. ad-do-it))) (add-hook 'tramp-unload-hook (lambda () (ad-remove-advice 'file-expand-wildcards 'around 'tramp-advice-file-expand-wildcards) (ad-activate 'file-expand-wildcards))))) (defsubst tramp-compat-line-beginning-position () "Return point at beginning of line (compat function). Calls `line-beginning-position' or `point-at-bol' if defined, else own implementation." (cond ((fboundp 'line-beginning-position) (tramp-compat-funcall 'line-beginning-position)) ((fboundp 'point-at-bol) (tramp-compat-funcall 'point-at-bol)) (t (save-excursion (beginning-of-line) (point))))) (defsubst tramp-compat-line-end-position () "Return point at end of line (compat function). Calls `line-end-position' or `point-at-eol' if defined, else own implementation." (cond ((fboundp 'line-end-position) (tramp-compat-funcall 'line-end-position)) ((fboundp 'point-at-eol) (tramp-compat-funcall 'point-at-eol)) (t (save-excursion (end-of-line) (point))))) (defsubst tramp-compat-temporary-file-directory () "Return name of directory for temporary files (compat function). For Emacs, this is the variable `temporary-file-directory', for XEmacs this is the function `temp-directory'." (cond ((boundp 'temporary-file-directory) (symbol-value 'temporary-file-directory)) ((fboundp 'temp-directory) (tramp-compat-funcall 'temp-directory)) ((let ((d (getenv "TEMP"))) (and d (file-directory-p d))) (file-name-as-directory (getenv "TEMP"))) ((let ((d (getenv "TMP"))) (and d (file-directory-p d))) (file-name-as-directory (getenv "TMP"))) ((let ((d (getenv "TMPDIR"))) (and d (file-directory-p d))) (file-name-as-directory (getenv "TMPDIR"))) ((file-exists-p "c:/temp") (file-name-as-directory "c:/temp")) (t (message (concat "Neither `temporary-file-directory' nor " "`temp-directory' is defined -- using /tmp.")) (file-name-as-directory "/tmp")))) ;; `make-temp-file' exists in Emacs only. On XEmacs, we use our own ;; implementation with `make-temp-name', creating the temporary file ;; immediately in order to avoid a security hole. (defsubst tramp-compat-make-temp-file (filename &optional dir-flag) "Create a temporary file (compat function). Add the extension of FILENAME, if existing." (let* (file-name-handler-alist (prefix (expand-file-name (symbol-value 'tramp-temp-name-prefix) (tramp-compat-temporary-file-directory))) (extension (file-name-extension filename t)) result) (condition-case nil (setq result (tramp-compat-funcall 'make-temp-file prefix dir-flag extension)) (error ;; We use our own implementation, taken from files.el. (while (condition-case () (progn (setq result (concat (make-temp-name prefix) extension)) (if dir-flag (make-directory result) (write-region "" nil result nil 'silent)) nil) (file-already-exists t)) ;; The file was somehow created by someone else between ;; `make-temp-name' and `write-region', let's try again. nil))) result)) ;; `most-positive-fixnum' does not exist in XEmacs. (defsubst tramp-compat-most-positive-fixnum () "Return largest positive integer value (compat function)." (cond ((boundp 'most-positive-fixnum) (symbol-value 'most-positive-fixnum)) ;; Default value in XEmacs. (t 134217727))) ;; ID-FORMAT does not exists in XEmacs. (defun tramp-compat-file-attributes (filename &optional id-format) "Like `file-attributes' for Tramp files (compat function)." (cond ((or (null id-format) (eq id-format 'integer)) (file-attributes filename)) ((tramp-tramp-file-p filename) (tramp-file-name-handler 'file-attributes filename id-format)) (t (condition-case nil (tramp-compat-funcall 'file-attributes filename id-format) (wrong-number-of-arguments (file-attributes filename)))))) ;; PRESERVE-UID-GID has been introduced with Emacs 23. It does not ;; hurt to ignore it for other (X)Emacs versions. ;; PRESERVE-SELINUX-CONTEXT has been introduced with Emacs 24. (defun tramp-compat-copy-file (filename newname &optional ok-if-already-exists keep-date preserve-uid-gid preserve-selinux-context) "Like `copy-file' for Tramp files (compat function)." (cond (preserve-selinux-context (tramp-compat-funcall 'copy-file filename newname ok-if-already-exists keep-date preserve-uid-gid preserve-selinux-context)) (preserve-uid-gid (tramp-compat-funcall 'copy-file filename newname ok-if-already-exists keep-date preserve-uid-gid)) (t (copy-file filename newname ok-if-already-exists keep-date)))) ;; `copy-directory' is a new function in Emacs 23.2. Implementation ;; is taken from there. (defun tramp-compat-copy-directory (directory newname &optional keep-time parents) "Make a copy of DIRECTORY (compat function)." (if (fboundp 'copy-directory) (tramp-compat-funcall 'copy-directory directory newname keep-time parents) ;; If `default-directory' is a remote directory, make sure we find ;; its `copy-directory' handler. (let ((handler (or (find-file-name-handler directory 'copy-directory) (find-file-name-handler newname 'copy-directory)))) (if handler (funcall handler 'copy-directory directory newname keep-time parents) ;; Compute target name. (setq directory (directory-file-name (expand-file-name directory)) newname (directory-file-name (expand-file-name newname))) (if (and (file-directory-p newname) (not (string-equal (file-name-nondirectory directory) (file-name-nondirectory newname)))) (setq newname (expand-file-name (file-name-nondirectory directory) newname))) (if (not (file-directory-p newname)) (make-directory newname parents)) ;; Copy recursively. (mapc (lambda (file) (if (file-directory-p file) (tramp-compat-copy-directory file newname keep-time parents) (copy-file file newname t keep-time))) ;; We do not want to delete "." and "..". (directory-files directory 'full "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*")) ;; Set directory attributes. (set-file-modes newname (file-modes directory)) (if keep-time (set-file-times newname (nth 5 (file-attributes directory)))))))) ;; TRASH has been introduced with Emacs 24.1. (defun tramp-compat-delete-file (filename &optional trash) "Like `delete-file' for Tramp files (compat function)." (condition-case nil (tramp-compat-funcall 'delete-file filename trash) ;; This Emacs version does not support the TRASH flag. (wrong-number-of-arguments (let ((delete-by-moving-to-trash (and (boundp 'delete-by-moving-to-trash) (symbol-value 'delete-by-moving-to-trash) trash))) (delete-file filename))))) ;; RECURSIVE has been introduced with Emacs 23.2. (defun tramp-compat-delete-directory (directory &optional recursive) "Like `delete-directory' for Tramp files (compat function)." (if (null recursive) (delete-directory directory) (condition-case nil (tramp-compat-funcall 'delete-directory directory recursive) ;; This Emacs version does not support the RECURSIVE flag. We ;; use the implementation from Emacs 23.2. (wrong-number-of-arguments (setq directory (directory-file-name (expand-file-name directory))) (if (not (file-symlink-p directory)) (mapc (lambda (file) (if (eq t (car (file-attributes file))) (tramp-compat-delete-directory file recursive) (delete-file file))) (directory-files directory 'full "^\\([^.]\\|\\.\\([^.]\\|\\..\\)\\).*"))) (delete-directory directory))))) ;; `number-sequence' does not exist in XEmacs. Implementation is ;; taken from Emacs 23. (defun tramp-compat-number-sequence (from &optional to inc) "Return a sequence of numbers from FROM to TO as a list (compat function)." (if (or (subrp 'number-sequence) (symbol-file 'number-sequence)) (tramp-compat-funcall 'number-sequence from to inc) (if (or (not to) (= from to)) (list from) (or inc (setq inc 1)) (when (zerop inc) (error "The increment can not be zero")) (let (seq (n 0) (next from)) (if (> inc 0) (while (<= next to) (setq seq (cons next seq) n (1+ n) next (+ from (* n inc)))) (while (>= next to) (setq seq (cons next seq) n (1+ n) next (+ from (* n inc))))) (nreverse seq))))) (defun tramp-compat-split-string (string pattern) "Like `split-string' but omit empty strings. In Emacs, (split-string \"/foo/bar\" \"/\") returns (\"foo\" \"bar\"). This is, the first, empty, element is omitted. In XEmacs, the first element is not omitted." (delete "" (split-string string pattern))) (defun tramp-compat-process-running-p (process-name) "Returns `t' if system process PROCESS-NAME is running for `user-login-name'." (when (stringp process-name) (cond ;; GNU Emacs 22 on w32. ((fboundp 'w32-window-exists-p) (tramp-compat-funcall 'w32-window-exists-p process-name process-name)) ;; GNU Emacs 23. ((and (fboundp 'list-system-processes) (fboundp 'process-attributes)) (let (result) (dolist (pid (tramp-compat-funcall 'list-system-processes) result) (let ((attributes (tramp-compat-funcall 'process-attributes pid))) (when (and (string-equal (cdr (assoc 'user attributes)) (user-login-name)) (let ((comm (cdr (assoc 'comm attributes)))) ;; The returned command name could be truncated ;; to 15 characters. Therefore, we cannot check ;; for `string-equal'. (and comm (string-match (concat "^" (regexp-quote comm)) process-name)))) (setq result t)))))) ;; Fallback, if there is no Lisp support yet. (t (let ((default-directory (if (file-remote-p default-directory) (tramp-compat-temporary-file-directory) default-directory)) (unix95 (getenv "UNIX95")) result) (setenv "UNIX95" "1") (when (member (user-login-name) (tramp-compat-split-string (shell-command-to-string (format "ps -C %s -o user=" process-name)) "[ \f\t\n\r\v]+")) (setq result t)) (setenv "UNIX95" unix95) result))))) (provide 'tramp-compat) ;;; TODO: ;; arch-tag: 0e724b18-6699-4f87-ad96-640b272e5c85 ;;; tramp-compat.el ends here