aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Albinus2008-01-14 19:42:14 +0000
committerMichael Albinus2008-01-14 19:42:14 +0000
commitc440aa2f4de31512ec4f593431d468e1ebda5a33 (patch)
tree900f7e7bb20f468803c705147d16848645ac9339
parentc992abdbc6e85052afa3ed7d4e6840eac1ca1ed2 (diff)
downloademacs-c440aa2f4de31512ec4f593431d468e1ebda5a33.tar.gz
emacs-c440aa2f4de31512ec4f593431d468e1ebda5a33.zip
* net/trampver.el: Update release number.
-rw-r--r--doc/misc/tramp.texi2
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/net/trampver.el7
3 files changed, 12 insertions, 4 deletions
diff --git a/doc/misc/tramp.texi b/doc/misc/tramp.texi
index d1acafefa03..87164bfce31 100644
--- a/doc/misc/tramp.texi
+++ b/doc/misc/tramp.texi
@@ -39,7 +39,7 @@
39 39
40@copying 40@copying
41Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 41Copyright @copyright{} 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
422007 Free Software Foundation, Inc. 422007, 2008 Free Software Foundation, Inc.
43 43
44@quotation 44@quotation
45Permission is granted to copy, distribute and/or modify this document 45Permission is granted to copy, distribute and/or modify this document
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 55679706eff..fc0b5e4d634 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,10 @@
12008-01-14 Michael Albinus <michael.albinus@gmx.de>
2
3 * net/tramp.el (tramp-local-host-p): Use `tramp-file-name-host'
4 instead of `tramp-file-name-real-host'.
5
6 * net/trampver.el: Update release number.
7
12008-01-14 Alan Mackenzie <acm@muc.de> 82008-01-14 Alan Mackenzie <acm@muc.de>
2 9
3 * progmodes/cc-engine.el (c-guess-basic-syntax): prevent a macro 10 * progmodes/cc-engine.el (c-guess-basic-syntax): prevent a macro
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 689987faff4..4a5525bd0fa 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -2,7 +2,8 @@
2;;; -*- mode: Emacs-Lisp; coding: utf-8; -*- 2;;; -*- mode: Emacs-Lisp; coding: utf-8; -*-
3;;; lisp/trampver.el. Generated from trampver.el.in by configure. 3;;; lisp/trampver.el. Generated from trampver.el.in by configure.
4 4
5;; Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. 5;; Copyright (C) 2003, 2004, 2005, 2006, 2007,
6;; 2008 Free Software Foundation, Inc.
6 7
7;; Author: Kai Großjohann <kai.grossjohann@gmx.net> 8;; Author: Kai Großjohann <kai.grossjohann@gmx.net>
8;; Keywords: comm, processes 9;; Keywords: comm, processes
@@ -30,14 +31,14 @@
30;; "autoconf && ./configure" to change them. (X)Emacs version check is defined 31;; "autoconf && ./configure" to change them. (X)Emacs version check is defined
31;; in macro AC_EMACS_INFO of aclocal.m4; should be changed only there. 32;; in macro AC_EMACS_INFO of aclocal.m4; should be changed only there.
32 33
33(defconst tramp-version "2.1.12" 34(defconst tramp-version "2.1.13-pre"
34 "This version of Tramp.") 35 "This version of Tramp.")
35 36
36(defconst tramp-bug-report-address "tramp-devel@gnu.org" 37(defconst tramp-bug-report-address "tramp-devel@gnu.org"
37 "Email address to send bug reports to.") 38 "Email address to send bug reports to.")
38 39
39;; Check for (X)Emacs version. 40;; Check for (X)Emacs version.
40(let ((x (if (or (< emacs-major-version 21) (and (featurep 'xemacs) (< emacs-minor-version 4))) (format "Tramp 2.1.12 is not fit for %s" (when (string-match "^.*$" (emacs-version)) (match-string 0 (emacs-version)))) "ok"))) 41(let ((x (if (or (< emacs-major-version 21) (and (featurep 'xemacs) (< emacs-minor-version 4))) (format "Tramp 2.1.13-pre is not fit for %s" (when (string-match "^.*$" (emacs-version)) (match-string 0 (emacs-version)))) "ok")))
41 (unless (string-match "\\`ok\\'" x) (error "%s" x))) 42 (unless (string-match "\\`ok\\'" x) (error "%s" x)))
42 43
43(provide 'trampver) 44(provide 'trampver)