From fe45d875a45557a85b0b5f0ba808feeab6a516f7 Mon Sep 17 00:00:00 2001 From: Michael Albinus Date: Thu, 11 Jun 2026 14:52:55 +0200 Subject: [PATCH 1/2] ; Fix last Tramp change --- test/lisp/net/tramp-tests.el | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/lisp/net/tramp-tests.el b/test/lisp/net/tramp-tests.el index 0aaf7d36dfa..8edbb4ffe23 100644 --- a/test/lisp/net/tramp-tests.el +++ b/test/lisp/net/tramp-tests.el @@ -9082,7 +9082,7 @@ process sentinels. They shall not disturb each other." (string-equal (tramp--test-operation tramp-test-vec) (tramp--handle-test-operation tramp-test-vec))) (let ((vec (copy-tramp-file-name tramp-test-vec))) - (setf (tramp-file-name-method vec) (if (tramp--test-sh-p) "sftp" "sudo")) + (setf (tramp-file-name-method vec) (if (tramp--test-sh-p) "rclone" "sudo")) (should-not (string-equal (tramp--test-operation vec) (tramp--handle-test-operation vec)))) From ffa25543a149e1d9674878832f6100c6f67a2e77 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Thu, 11 Jun 2026 14:23:28 +0100 Subject: [PATCH 2/2] vc-hg-trunk-or-topic-p, vc-hg-topic-outgoing-base: Fix ret vals * lisp/vc/vc-hg.el (vc-hg-trunk-or-topic-p) (vc-hg-topic-outgoing-base): Fix return values. --- lisp/vc/vc-hg.el | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lisp/vc/vc-hg.el b/lisp/vc/vc-hg.el index af143a4b1da..02db4b134fe 100644 --- a/lisp/vc/vc-hg.el +++ b/lisp/vc/vc-hg.el @@ -1999,9 +1999,9 @@ The return value is always a string." "Return `topic' or nil for BRANCH or the currently active bookmark. If BRANCH names a bookmark, or BRANCH is nil but there is a currently active bookmark, return `topic'. Otherwise return nil." - (if branch - (member branch (vc-hg--bookmarks)) - (and (assq 'bookmark (vc-hg--working-branch)) 'topic))) + (and (if branch (member branch (vc-hg--bookmarks)) + (assq 'bookmark (vc-hg--working-branch))) + 'topic)) (defun vc-hg-topic-outgoing-base () "Return outgoing base for current commit considered as a topic branch. @@ -2012,7 +2012,7 @@ This is based on the following assumptions: (i) if there is an active bookmark, it will eventually be merged into whatever the remote head is (ii) there is only one remote head for the current branch." - (assq 'branch (vc-hg--working-branch))) + (cdr (assq 'branch (vc-hg--working-branch)))) (provide 'vc-hg)