[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] emacs-25 dfc850b: Make tramp a built-in package
From: |
Michael Albinus |
Subject: |
[Emacs-diffs] emacs-25 dfc850b: Make tramp a built-in package |
Date: |
Fri, 18 Dec 2015 16:33:06 +0000 |
branch: emacs-25
commit dfc850ba4ce229136b2f183574c030120d320d19
Author: Michael Albinus <address@hidden>
Commit: Michael Albinus <address@hidden>
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'.
---
lisp/finder.el | 2 +-
lisp/net/trampver.el | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lisp/finder.el b/lisp/finder.el
index 715dd94..c40e04a 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 04046c5..77ee8ae 100644
--- a/lisp/net/trampver.el
+++ b/lisp/net/trampver.el
@@ -6,6 +6,7 @@
;; Author: Kai Großjohann <address@hidden>
;; 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
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] emacs-25 dfc850b: Make tramp a built-in package,
Michael Albinus <=