From bce04feefd5fd9afddfb772c83f80d1445f3068c Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Sun, 29 Jul 2007 15:32:56 +0000 Subject: * net/tramp.el: * net/tramp-uu.el: * net/trampver.el: Use utf-8 encoding with coding cookie. * net/tramp-cache.el: * net/tramp-fish.el: * net/tramp-ftp.el: * net/tramp-gw.el: * net/tramp-smb.el: Remove coding cookie. * net/tramp.el (tramp-handle-verify-visited-file-modtime): Flush buffer file-name's file property. (tramp-handle-file-remote-p): The first parameter is FILENAME. * net/trampver.el: Update release number. --- lisp/ChangeLog | 18 ++++++++++++++++++ lisp/net/tramp-cache.el | 5 ++--- lisp/net/tramp-fish.el | 5 ++--- lisp/net/tramp-ftp.el | 2 +- lisp/net/tramp-gw.el | 5 ++--- lisp/net/tramp-smb.el | 2 +- lisp/net/tramp-uu.el | 4 ++-- lisp/net/tramp.el | 9 +++++---- lisp/net/trampver.el | 8 ++++---- 9 files changed, 37 insertions(+), 21 deletions(-) (limited to 'lisp') diff --git a/lisp/ChangeLog b/lisp/ChangeLog index a1eb9ee103..9fd1eb92f3 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,21 @@ +2007-07-29 Michael Albinus + + * tramp.el: + * tramp-uu.el: + * trampver.el: Use utf-8 encoding with coding cookie. + + * tramp-cache.el: + * tramp-fish.el: + * tramp-ftp.el: + * tramp-gw.el: + * tramp-smb.el: Remove coding cookie. + + * tramp.el (tramp-handle-verify-visited-file-modtime): Flush + buffer file-name's file property. + (tramp-handle-file-remote-p): The first parameter is FILENAME. + + * trampver.el: Update release number. + 2007-07-29 Juri Linkov * dired.el (dired-mode-map): Bind C-x C-q to dired-toggle-read-only. diff --git a/lisp/net/tramp-cache.el b/lisp/net/tramp-cache.el index 96c4b3ecb9..79b0b53783 100644 --- a/lisp/net/tramp-cache.el +++ b/lisp/net/tramp-cache.el @@ -1,4 +1,3 @@ -;;; -*- mode: Emacs-Lisp; coding: iso-2022-7bit; -*- ;;; tramp-cache.el --- file information caching for Tramp ;; Copyright (C) 2000, 2005, 2006, 2007 by Free Software Foundation, Inc. @@ -11,8 +10,8 @@ ;; 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. +;; the Free Software Foundation; either version 3, 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 diff --git a/lisp/net/tramp-fish.el b/lisp/net/tramp-fish.el index 1752a09a28..f0db302abc 100644 --- a/lisp/net/tramp-fish.el +++ b/lisp/net/tramp-fish.el @@ -1,4 +1,3 @@ -;;; -*- coding: iso-8859-1; -*- ;;; tramp-fish.el --- Tramp access functions for FISH protocol ;; Copyright (C) 2006, 2007 Free Software Foundation, Inc. @@ -10,8 +9,8 @@ ;; 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. +;; the Free Software Foundation; either version 3, 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 diff --git a/lisp/net/tramp-ftp.el b/lisp/net/tramp-ftp.el index e9caf47018..f3d7a3aadf 100644 --- a/lisp/net/tramp-ftp.el +++ b/lisp/net/tramp-ftp.el @@ -1,4 +1,4 @@ -;;; tramp-ftp.el --- Tramp convenience functions for Ange-FTP -*- coding: iso-8859-1; -*- +;;; tramp-ftp.el --- Tramp convenience functions for Ange-FTP ;; Copyright (C) 2002, 2003, 2004, 2005, 2006, ;; 2007 Free Software Foundation, Inc. diff --git a/lisp/net/tramp-gw.el b/lisp/net/tramp-gw.el index 2cbb7ea377..3ac496d8a0 100644 --- a/lisp/net/tramp-gw.el +++ b/lisp/net/tramp-gw.el @@ -1,4 +1,3 @@ -;;; -*- coding: iso-8859-1; -*- ;;; tramp-gw.el --- Tramp utility functions for HTTP tunnels and SOCKS gateways ;; Copyright (C) 2007 Free Software Foundation, Inc. @@ -10,8 +9,8 @@ ;; 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. +;; the Free Software Foundation; either version 3, 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 diff --git a/lisp/net/tramp-smb.el b/lisp/net/tramp-smb.el index 22b6afa30e..5dbf12955d 100644 --- a/lisp/net/tramp-smb.el +++ b/lisp/net/tramp-smb.el @@ -1,4 +1,4 @@ -;;; tramp-smb.el --- Tramp access functions for SMB servers -*- coding: iso-8859-1; -*- +;;; tramp-smb.el --- Tramp access functions for SMB servers ;; Copyright (C) 2002, 2003, 2004, 2005, 2006, ;; 2007 Free Software Foundation, Inc. diff --git a/lisp/net/tramp-uu.el b/lisp/net/tramp-uu.el index 71a76dd5c0..c399a0b211 100644 --- a/lisp/net/tramp-uu.el +++ b/lisp/net/tramp-uu.el @@ -1,10 +1,10 @@ -;;; -*- coding: iso-2022-7bit; -*- +;;; -*- coding: utf-8; -*- ;;; tramp-uu.el --- uuencode in Lisp ;; Copyright (C) 2002, 2003, 2004, 2005, 2006, ;; 2007 Free Software Foundation, Inc. -;; Author: Kai Gro,A_(Bjohann +;; Author: Kai Großjohann ;; Keywords: comm, terminals ;; This file is free software; you can redistribute it and/or modify diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index fc4817dcdc..5285b87313 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -1,4 +1,4 @@ -;;; -*- mode: Emacs-Lisp; coding: iso-2022-7bit; -*- +;;; -*- mode: Emacs-Lisp; coding: utf-8; -*- ;;; tramp.el --- Transparent Remote Access, Multiple Protocol ;; Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, @@ -6,7 +6,7 @@ ;; (copyright statements below in code to be updated with the above notice) -;; Author: Kai Gro,A_(Bjohann +;; Author: Kai Großjohann ;; Michael Albinus ;; Keywords: comm, processes @@ -2448,6 +2448,7 @@ of." t (let ((f (buffer-file-name))) (with-parsed-tramp-file-name f nil + (tramp-flush-file-property v localname) (let* ((attr (file-attributes f)) (modtime (nth 5 attr)) (mt (visited-file-modtime))) @@ -3713,7 +3714,7 @@ beginning of local filename are not substituted." (run-hooks 'tramp-handle-file-local-copy-hook) tmpfil))) -(defun tramp-handle-file-remote-p (file &optional identification connected) +(defun tramp-handle-file-remote-p (filename &optional identification connected) "Like `file-remote-p' for Tramp files." (when (tramp-tramp-file-p filename) (with-parsed-tramp-file-name filename nil @@ -7358,7 +7359,7 @@ please ensure that the buffers are attached to your email.\n\n") ;; transfer method to use. (Greg Stark) ;; * Remove unneeded parameters from methods. ;; * Invoke rsync once for copying a whole directory hierarchy. -;; (Francesco Potort,Al(B) +;; (Francesco Potortì) ;; * Make it work for different encodings, and for different file name ;; encodings, too. (Daniel Pittman) ;; * Clean up unused *tramp/foo* buffers after a while. (Pete Forman) diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el index acfaca5c84..6e48c3c7f4 100644 --- a/lisp/net/trampver.el +++ b/lisp/net/trampver.el @@ -1,10 +1,10 @@ -;;; -*- mode: Emacs-Lisp; coding: iso-2022-7bit; -*- +;;; -*- mode: Emacs-Lisp; coding: utf-8; -*- ;;; trampver.el --- Transparent Remote Access, Multiple Protocol ;;; lisp/trampver.el. Generated from trampver.el.in by configure. ;; Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. -;; Author: Kai Gro,A_(Bjohann +;; Author: Kai Großjohann ;; Keywords: comm, processes ;; This file is part of GNU Emacs. @@ -30,14 +30,14 @@ ;; "autoconf && ./configure" to change them. (X)Emacs version check is defined ;; in macro AC_EMACS_INFO of aclocal.m4; should be changed only there. -(defconst tramp-version "2.1.10" +(defconst tramp-version "2.1.11-pre" "This version of Tramp.") (defconst tramp-bug-report-address "tramp-devel@gnu.org" "Email address to send bug reports to.") ;; Check for (X)Emacs version. -(let ((x (if (or (< emacs-major-version 21) (and (featurep 'xemacs) (< emacs-minor-version 4))) (format "Tramp 2.1.10 is not fit for %s" (when (string-match "^.*$" (emacs-version)) (match-string 0 (emacs-version)))) "ok"))) +(let ((x (if (or (< emacs-major-version 21) (and (featurep 'xemacs) (< emacs-minor-version 4))) (format "Tramp 2.1.11-pre is not fit for %s" (when (string-match "^.*$" (emacs-version)) (match-string 0 (emacs-version)))) "ok"))) (unless (string-match "\\`ok\\'" x) (error x))) (provide 'trampver) -- cgit v1.2.3