summaryrefslogtreecommitdiff
path: root/lisp
diff options
context:
space:
mode:
authorMichael Albinus <michael.albinus@gmx.de>2015-12-18 17:32:52 +0100
committerMichael Albinus <michael.albinus@gmx.de>2015-12-18 17:32:52 +0100
commitdfc850ba4ce229136b2f183574c030120d320d19 (patch)
tree29f16cd4a01236a58d01835d7b1e8a291519d595 /lisp
parentdf336700e9e3e24fafc47f19f2128fa0f7e6c846 (diff)
downloademacs-dfc850ba4ce229136b2f183574c030120d320d19.tar.gz
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'.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/finder.el2
-rw-r--r--lisp/net/trampver.el3
2 files changed, 3 insertions, 2 deletions
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