From: Michael Albinus Date: Sat, 10 Nov 2018 14:55:23 +0000 (+0100) Subject: * lisp/net/tramp.el (tramp-get-local-gid): Use `group-name' if available. X-Git-Tag: emacs-27.0.90~4191 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=55f3f21b39389263d707b091d7e1b45d295a149c;p=emacs.git * lisp/net/tramp.el (tramp-get-local-gid): Use `group-name' if available. --- diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 4ee69d71986..44d66404f15 100644 --- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -4193,10 +4193,14 @@ ID-FORMAT valid values are `string' and `integer'." (defun tramp-get-local-gid (id-format) "The gid of the local user, in ID-FORMAT. ID-FORMAT valid values are `string' and `integer'." - ;; `group-gid' has been introduced with Emacs 24.4. - (if (and (fboundp 'group-gid) (equal id-format 'integer)) - (tramp-compat-funcall 'group-gid) - (tramp-compat-file-attribute-group-id (file-attributes "~/" id-format)))) + (cond + ;; `group-gid' has been introduced with Emacs 24.4. + ((and (fboundp 'group-gid) (equal id-format 'integer)) + (tramp-compat-funcall 'group-gid)) + ;; `group-name' has been introduced with Emacs 27.1. + ((and (fboundp 'group-name) (equal id-format 'string)) + (tramp-compat-funcall 'group-name (tramp-compat-funcall 'group-gid))) + ((tramp-compat-file-attribute-group-id (file-attributes "~/" id-format))))) (defun tramp-get-local-locale (&optional vec) "Determine locale, supporting UTF8 if possible.