Mercurial > emacs
diff lisp/net/tramp-ftp.el @ 90996:f55f9811f5d7
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 824-831)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 70-74)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-238
author | Miles Bader <miles@gnu.org> |
---|---|
date | Fri, 27 Jul 2007 10:52:18 +0000 |
parents | a66921565bcb 9077ada922e0 |
children | 539530fa389c |
line wrap: on
line diff
--- a/lisp/net/tramp-ftp.el Thu Jul 26 11:44:52 2007 +0000 +++ b/lisp/net/tramp-ftp.el Fri Jul 27 10:52:18 2007 +0000 @@ -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 -*- coding: iso-8859-1; -*- ;; Copyright (C) 2002, 2003, 2004, 2005, 2006, ;; 2007 Free Software Foundation, Inc. @@ -10,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