Merge branch 'emacs-25-merge'

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

diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 70092d21207362f269ede01297d4d4a8e6418cfb..f93cfc4e8aeb448c11f906ea5142d9e1c332c32c 100644 (file)
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -6,6 +6,7 @@
 ;; Author: Kai Großjohann <kai.grossjohann@gmx.net>
 ;; Keywords: comm, processes
 ;; Package: tramp
+;; Version: 2.2.13.25.1
 
 ;; This file is part of GNU Emacs.
 
@@ -31,20 +32,38 @@
 ;; should be changed only there.
 
 ;;;###tramp-autoload
-(defconst tramp-version "2.2.11-24.5"
+(defconst tramp-version "2.2.13.25.1"
   "This version of Tramp.")
 
 ;;;###tramp-autoload
 (defconst tramp-bug-report-address "tramp-devel@gnu.org"
   "Email address to send bug reports to.")
 
+;; `locate-dominating-file' does not exist in XEmacs. But it is not used here.
+(autoload 'locate-dominating-file "files")
+(autoload 'tramp-compat-replace-regexp-in-string "tramp-compat")
+
+(defun tramp-repository-get-version ()
+  "Try to return as a string the repository revision of the Tramp sources."
+  (unless (featurep 'xemacs)
+    (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)))
+                (tramp-compat-replace-regexp-in-string
+                 "\n" "" (buffer-string)))))))))
+
 ;; 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-24.5 is not fit for %s"
+          (format "Tramp 2.2.13.25.1 is not fit for %s"
                   (when (string-match "^.*$" (emacs-version))
                     (match-string 0 (emacs-version)))))))
   (unless (string-match "\\`ok\\'" x) (error "%s" x)))