From: Michael Albinus <michael.albinus@gmx.de>
Date: Fri, 18 Dec 2015 16:32:52 +0000 (+0100)
Subject: Make tramp a built-in package
X-Git-Tag: emacs-25.0.90~447
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=dfc850ba4ce229136b2f183574c030120d320d19;p=emacs.git

Make tramp a built-in package

* lisp/finder.el (finder-compile-keywords): Update
`package--builtins' also when Version: keyword is available.

* lisp/net/trampver.el: Add Version: keyword.
(tramp-version): Change it to "2.2.13.25.1", in order to be
compatible with `version-to-list'.
---

diff --git a/lisp/finder.el b/lisp/finder.el
index 715dd9499fa..c40e04a9147 100644
--- a/lisp/finder.el
+++ b/lisp/finder.el
@@ -238,7 +238,7 @@ from; the default is `load-path'."
 		    ;; The idea here is that eg calc.el gets to define
 		    ;; the description of the calc package.
 		    ;; This does not work for eg nxml-mode.el.
-		    ((eq base-name package)
+		    ((or (eq base-name package) version)
 		     (setq desc (cdr entry))
 		     (aset desc 0 version)
 		     (aset desc 2 summary)))
diff --git a/lisp/net/trampver.el b/lisp/net/trampver.el
index 04046c5ee7d..77ee8aebd61 100644
--- 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,7 +32,7 @@
 ;; should be changed only there.
 
 ;;;###tramp-autoload
-(defconst tramp-version "2.2.13-25.1"
+(defconst tramp-version "2.2.13.25.1"
   "This version of Tramp.")
 
 ;;;###tramp-autoload