From: Stefan Kangas <stefankangas@gmail.com>
Date: Mon, 23 Jan 2023 00:34:43 +0000 (+0100)
Subject: Merge from origin/emacs-29
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=080595682f73a920b9c9bf3eba10548ccc652e79;p=emacs.git

Merge from origin/emacs-29

b875c9bf67e Fix file-regular-p in Tramp
63fa225d443 Merge branch 'emacs-29' of git.savannah.gnu.org:/srv/git/...
9f5d6c541e5 ; * doc/emacs/custom.texi (Init Rebinding): Fix wording i...
a91b435d0d5 ; Reword user documentation on binding keys in Lisp
0400de6a7de Fix typo in c-ts-mode (bug#60932)
---

080595682f73a920b9c9bf3eba10548ccc652e79
diff --cc test/lisp/net/tramp-tests.el
index 0932a53f4b1,ff0fc56043e..60545e7270f
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@@ -4084,9 -4088,11 +4097,10 @@@ This tests also `make-symbolic-link', `
  		       "/[penguin/motd]" "/penguin:motd:")))
  	      (delete-file tmp-name2)
  	      (make-symbolic-link
 -	       (funcall
 -		(if quoted #'tramp-compat-file-name-unquote #'identity) penguin)
 +	       (funcall (if quoted #'file-name-unquote #'identity) penguin)
  	       tmp-name2)
  	      (should (file-symlink-p tmp-name2))
+ 	      (should-not (file-regular-p tmp-name2))
  	      (should
  	       (string-equal
  		(file-truename tmp-name2)