mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-30 04:10:54 -08:00
Code Issues Projects Releases Wiki Activity

Fix Bug#33394

Browse source 
* lisp/net/trampver.el (tramp-repository-branch)
(tramp-repository-version): Handle out-of-tree builds.  (Bug#33394)
This commit is contained in:
Michael Albinus 2018-11-15 13:55:23 +01:00
parent 35a88c809e
commit ce915653df
1 changed files with 14 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

22
lisp/net/trampver.el
View file

@ -40,20 +40,26 @@
(defconst tramp-repository-branch
(ignore-errors
;; Suppress message from `emacs-repository-get-branch'.
(let ((inhibit-message t))
;; Suppress message from `emacs-repository-get-branch'. We must
;; also handle out-of-tree builds.
(let ((inhibit-message t)
(dir (or (locate-dominating-file (locate-library "tramp") ".git")
source-directory)))
;; `emacs-repository-get-branch' has been introduced with Emacs 27.1.
(with-no-warnings
(emacs-repository-get-branch
(locate-dominating-file (locate-library "tramp") ".git")))))
(and (stringp dir) (file-directory-p dir)
(emacs-repository-get-branch dir)))))
"The repository branch of the Tramp sources.")
(defconst tramp-repository-version
(ignore-errors
;; Suppress message from `emacs-repository-get-version'.
(let ((inhibit-message t))
(emacs-repository-get-version
(locate-dominating-file (locate-library "tramp") ".git"))))
;; Suppress message from `emacs-repository-get-version'. We must
;; also handle out-of-tree builds.
(let ((inhibit-message t)
(dir (or (locate-dominating-file (locate-library "tramp") ".git")
source-directory)))
(and (stringp dir) (file-directory-p dir)
(emacs-repository-get-version dir))))
"The repository revision of the Tramp sources.")
;; Check for Emacs version.