[Emacs-diffs] Changes to emacs/lisp/net/tramp.el

[Miles Bader]

Index: emacs/lisp/net/tramp.el
diff -c emacs/lisp/net/tramp.el:1.33 emacs/lisp/net/tramp.el:1.34
*** emacs/lisp/net/tramp.el:1.33        Fri Feb 28 13:28:47 2003
--- emacs/lisp/net/tramp.el     Sat Mar 29 10:16:57 2003
***************
*** 1,8 ****
! ;;; tramp.el --- Transparent Remote Access, Multiple Protocol -*- coding: 
iso-8859-1; -*-
  
  ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, 
Inc.
  
! ;; Author: address@hidden 
  ;; Keywords: comm, processes
  
  ;; This file is part of GNU Emacs.
--- 1,9 ----
! ;;; -*- mode: Emacs-Lisp; coding: iso-8859-1; -*-
! ;;; tramp.el --- Transparent Remote Access, Multiple Protocol
  
  ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003 Free Software Foundation, 
Inc.
  
! ;; Author: address@hidden
  ;; Keywords: comm, processes
  
  ;; This file is part of GNU Emacs.
***************
*** 29,36 ****
  ;; the local and the remote host, whereas tramp.el uses a combination
  ;; of rsh and rcp or other work-alike programs, such as ssh/scp.
  ;;
! ;; For more detailed instructions, please see the info file, which is
! ;; included in the file `tramp.tar.gz' mentioned below.
  ;;
  ;; Notes:
  ;; -----
--- 30,36 ----
  ;; the local and the remote host, whereas tramp.el uses a combination
  ;; of rsh and rcp or other work-alike programs, such as ssh/scp.
  ;;
! ;; For more detailed instructions, please see the info file.
  ;;
  ;; Notes:
  ;; -----
***************
*** 46,58 ****
  ;;
  ;; Also see the todo list at the bottom of this file.
  ;;
! ;; The current version of tramp.el can be retrieved from the following
! ;; URL:  ftp://ls6-ftp.cs.uni-dortmund.de/pub/src/emacs/tramp.tar.gz
! ;; For your convenience, the *.el file is available separately from
! ;; the same directory.
  ;;
  ;; There's a mailing list for this, as well.  Its name is:
! ;;                address@hidden
  ;; Send a mail with `help' in the subject (!) to the administration
  ;; address for instructions on joining the list.  The administration
  ;; address is:
--- 46,56 ----
  ;;
  ;; Also see the todo list at the bottom of this file.
  ;;
! ;; The current version of Tramp can be retrieved from the following URL:
! ;;            http://savannah.nongnu.org/download/tramp/
  ;;
  ;; There's a mailing list for this, as well.  Its name is:
! ;;            address@hidden
  ;; Send a mail with `help' in the subject (!) to the administration
  ;; address for instructions on joining the list.  The administration
  ;; address is:
***************
*** 69,82 ****
  
  ;;; Code:
  
! ;; In the Tramp CVS repository, the version numer is auto-frobbed from
! ;; the Makefile, so you should edit the top-level Makefile to change
! ;; the version number.
! (defconst tramp-version "2.0.30"
!   "This version of tramp.")
! 
! (defconst tramp-bug-report-address "address@hidden"
!   "Email address to send bug reports to.")
  
  (require 'timer)
  (require 'format-spec)                  ;from Gnus 5.8, also in tar ball
--- 67,74 ----
  
  ;;; Code:
  
! ;; The Tramp version number and bug report address, as prepared by configure.
! (require 'trampver)
  
  (require 'timer)
  (require 'format-spec)                  ;from Gnus 5.8, also in tar ball
***************
*** 1275,1281 ****
  Please raise a bug report via \"M-x tramp-bug\" if your system needs
  this variable to be set as well."
    :group 'tramp
!   :type 'integer)
  
  ;;; Internal Variables:
  
--- 1267,1273 ----
  Please raise a bug report via \"M-x tramp-bug\" if your system needs
  this variable to be set as well."
    :group 'tramp
!   :type '(choice (const nil) integer))
  
  ;;; Internal Variables:
  
***************
*** 2831,2836 ****
--- 2823,2832 ----
                   (file-name-nondirectory localname)))))
        (sit-for 1)                     ;needed for rsh but not ssh?
        (tramp-wait-for-output))
+     ;; The following let-binding is used by code that's commented
+     ;; out.  Let's leave the let-binding in for a while to see
+     ;; that the commented-out code is really not needed.  Commenting-out
+     ;; happened on 2003-03-13.
      (let ((old-pos (point)))
        (insert-buffer-substring
         (tramp-get-buffer multi-method method user host))
***************
*** 2843,2855 ****
        (save-excursion
        (tramp-send-command multi-method method user host "cd")
        (tramp-wait-for-output))
!       ;; Another XEmacs specialty follows.  What's the right way to do
!       ;; it?
!       (when (and (featurep 'xemacs)
!                (eq major-mode 'dired-mode))
!       (save-excursion
!         (require 'dired)
!         (dired-insert-set-properties old-pos (point)))))))
  
  ;; Continuation of kluge to pacify byte-compiler.
  ;;(eval-when-compile
--- 2839,2854 ----
        (save-excursion
        (tramp-send-command multi-method method user host "cd")
        (tramp-wait-for-output))
!       ;; For the time being, the XEmacs kludge is commented out.
!       ;; Please test it on various XEmacs versions to see if it works.
! ;;       ;; Another XEmacs specialty follows.  What's the right way to do
! ;;       ;; it?
! ;;       (when (and (featurep 'xemacs)
! ;;             (eq major-mode 'dired-mode))
! ;;    (save-excursion
! ;;      (require 'dired)
! ;;      (dired-insert-set-properties old-pos (point))))
!       )))
  
  ;; Continuation of kluge to pacify byte-compiler.
  ;;(eval-when-compile
***************
*** 2917,2936 ****
            (setq uname (buffer-substring (point) (tramp-line-end-position)))
            (setq localname (concat uname fname))
            (erase-buffer)))
!       ;; Look if localname starts with "/../" construct.  If this is
!       ;; the case, then we return a local name instead of a remote name.
!       (if (string-match "^/\\.\\./" localname)
!           (expand-file-name (substring localname 3))
!         ;; No tilde characters in file name, do normal
!         ;; expand-file-name (this does "/./" and "/../").  We bind
!         ;; directory-sep-char here for XEmacs on Windows, which
!         ;; would otherwise use backslash.
!         (let ((directory-sep-char ?/))
!           (tramp-make-tramp-file-name
!            multi-method method user host
!            (tramp-drop-volume-letter
!             (tramp-run-real-handler 'expand-file-name
!                                     (list localname))))))))))
  
  ;; Remote commands.
  
--- 2916,2948 ----
            (setq uname (buffer-substring (point) (tramp-line-end-position)))
            (setq localname (concat uname fname))
            (erase-buffer)))
!       ;; No tilde characters in file name, do normal
!       ;; expand-file-name (this does "/./" and "/../").  We bind
!       ;; directory-sep-char here for XEmacs on Windows, which
!       ;; would otherwise use backslash.
!       (let ((directory-sep-char ?/))
!         (tramp-make-tramp-file-name
!          multi-method method user host
!          (tramp-drop-volume-letter
!           (tramp-run-real-handler 'expand-file-name
!                                   (list localname)))))))))
! 
! ;; old version follows.  it uses ".." to cross file handler
! ;; boundaries.
! ;;    ;; Look if localname starts with "/../" construct.  If this is
! ;;    ;; the case, then we return a local name instead of a remote name.
! ;;    (if (string-match "^/\\.\\./" localname)
! ;;        (expand-file-name (substring localname 3))
! ;;      ;; No tilde characters in file name, do normal
! ;;      ;; expand-file-name (this does "/./" and "/../").  We bind
! ;;      ;; directory-sep-char here for XEmacs on Windows, which
! ;;      ;; would otherwise use backslash.
! ;;      (let ((directory-sep-char ?/))
! ;;        (tramp-make-tramp-file-name
! ;;         multi-method method user host
! ;;         (tramp-drop-volume-letter
! ;;          (tramp-run-real-handler 'expand-file-name
! ;;                                  (list localname))))))))))
  
  ;; Remote commands.