Merge from origin/emacs-26

6e6bf60 Don't let delete_frame select a tooltip frame (Bug#27647)
e9dd580 Filter obtrusive events in help-read-key-sequence.
90075e8 Fix symlink flag in tramp-gvfs-handle-file-attributes
c355529 Fix bug in tramp-handle-file-truename
4c21d04 Fix a typo in doc string of electric-indent-functions-without...
319c2de Avoid assertion violations in echo_area_display
63c7733 ; * lisp/ido.el (ido-find-alternate-file): Doc fix.  (Bug#29278)
cbd319a Fix case-folding in Occur
29520b0 Fix quick-calc in C mode with hex values
3e80124 Improve documentation of dired-next/prev-marked-file
90add18 Prevent aborts in line-move-visual
648c128 More fixes in src/.gdbinit
104f3e5 Document how to enter whitespace when using grep-read-files

1 files changed, 10 insertions, 1 deletions

diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el
index a5bce172c94..bfc62049ccd 100644
--- a/test/lisp/net/tramp-tests.el
+++ b/test/lisp/net/tramp-tests.el
@@ -2671,7 +2671,7 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
             (should-error
              (make-symbolic-link tmp-name1 tmp-name2)
              :type 'file-already-exists)
-            ;; number means interactive case.
+            ;; A number means interactive case.
             (cl-letf (((symbol-function 'yes-or-no-p) 'ignore))
               (should-error
                (make-symbolic-link tmp-name1 tmp-name2 0)
@@ -2783,6 +2783,15 @@ This tests also `make-symbolic-link', `file-truename' and `add-name-to-file'."
             (should
              (string-equal (file-truename tmp-name1) (file-truename tmp-name2)))
             (should (file-equal-p tmp-name1 tmp-name2))
+            ;; Check relative symlink file name.
+            (delete-file tmp-name2)
+            (let ((default-directory tramp-test-temporary-file-directory))
+              (make-symbolic-link (file-name-nondirectory tmp-name1) tmp-name2))
+            (should (file-symlink-p tmp-name2))
+            (should-not (string-equal tmp-name2 (file-truename tmp-name2)))
+            (should
+             (string-equal (file-truename tmp-name1) (file-truename tmp-name2)))
+            (should (file-equal-p tmp-name1 tmp-name2))
             ;; Symbolic links could look like a remote file name.
             ;; They must be quoted then.
             (delete-file tmp-name2)