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 715dd9499fa4852e3786d41d1f377a1082d75c42..c40e04a914741aabc00b9427e1fa2c6b75854335 100644 (file)
--- 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 04046c5ee7de181f59f71e19f72d0153e2a70450..77ee8aebd61689f4c990284d05c8a7f06130d98c 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,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