Add a new command to switch between erc buffers

[gnu-emacs] / lisp / net / trampver.el

diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 065c3f33ebec92d93c7fd43d50a564c1b8698bca..64cc47e26a5244470581989ba4586a83e1efe94d 100644 (file)
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -1,11 +1,12 @@
 ;;; trampver.el --- Transparent Remote Access, Multiple Protocol
 ;;; lisp/trampver.el.  Generated from trampver.el.in by configure.
 
-;; Copyright (C) 2003-2014 Free Software Foundation, Inc.
+;; Copyright (C) 2003-2016 Free Software Foundation, Inc.
 
 ;; Author: Kai Großjohann <kai.grossjohann@gmx.net>
 ;; Keywords: comm, processes
 ;; Package: tramp
+;; Version: 2.3.0-pre
 
 ;; This file is part of GNU Emacs.
 
@@ -26,27 +27,36 @@
 
 ;; In the Tramp GIT repository, the version number and the bug report
 ;; address are auto-frobbed from configure.ac, so you should edit that
-;; file and run "autoconf && ./configure" to change them.  (X)Emacs
+;; file and run "autoconf && ./configure" to change them.  Emacs
 ;; version check is defined in macro AC_EMACS_INFO of aclocal.m4;
 ;; should be changed only there.
 
 ;;;###tramp-autoload
-(defconst tramp-version "2.2.11-pre"
+(defconst tramp-version "2.3.0-pre"
   "This version of Tramp.")
 
 ;;;###tramp-autoload
 (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 22)
-                (and (featurep 'xemacs)
-                     (= emacs-major-version 21)
-                     (>= emacs-minor-version 4)))
-            "ok"
-          (format "Tramp 2.2.11-pre is not fit for %s"
-                  (when (string-match "^.*$" (emacs-version))
-                    (match-string 0 (emacs-version)))))))
+(defun tramp-repository-get-version ()
+  "Try to return as a string the repository revision of the Tramp sources."
+  (let ((dir (locate-dominating-file (locate-library "tramp") ".git")))
+    (when dir
+      (with-temp-buffer
+       (let ((default-directory (file-name-as-directory dir)))
+         (and (zerop
+               (ignore-errors
+                 (call-process "git" nil '(t nil) nil "rev-parse" "HEAD")))
+              (not (zerop (buffer-size)))
+              (replace-regexp-in-string "\n" "" (buffer-string))))))))
+
+;; Check for Emacs version.
+(let ((x (if (>= emacs-major-version 23)
+    "ok"
+  (format "Tramp 2.3.0-pre is not fit for %s"
+         (when (string-match "^.*$" (emacs-version))
+           (match-string 0 (emacs-version)))))))
   (unless (string-match "\\`ok\\'" x) (error "%s" x)))
 
 (add-hook 'tramp-unload-hook