From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Michael Albinus Newsgroups: gmane.emacs.bugs Subject: bug#64124: 29.0.91; Loading =?UTF-8?Q?=E2=80=98tramp=E2=80=99?= unconditionally loads =?UTF-8?Q?=E2=80=98ls-lisp=E2=80=99?= Date: Sat, 17 Jun 2023 16:14:41 +0200 Message-ID: <87o7lejhv2.fsf@gmx.de> References: <87legixw49.fsf@whxvd.name> <87sfaqjssc.fsf@gmx.de> <87wn02nspc.fsf@whxvd.name> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="32531"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 64124@debbugs.gnu.org To: Sebastian Miele Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sat Jun 17 16:15:20 2023 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1qAWhz-0008J6-Qq for geb-bug-gnu-emacs@m.gmane-mx.org; Sat, 17 Jun 2023 16:15:19 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qAWhk-0008Br-LA; Sat, 17 Jun 2023 10:15:04 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qAWhj-0008Bb-2h for bug-gnu-emacs@gnu.org; Sat, 17 Jun 2023 10:15:03 -0400 Original-Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qAWhi-0004Ax-GZ for bug-gnu-emacs@gnu.org; Sat, 17 Jun 2023 10:15:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qAWhi-0004XG-D1 for bug-gnu-emacs@gnu.org; Sat, 17 Jun 2023 10:15:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Michael Albinus Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sat, 17 Jun 2023 14:15:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 64124 X-GNU-PR-Package: emacs Original-Received: via spool by 64124-submit@debbugs.gnu.org id=B64124.168701129117388 (code B ref 64124); Sat, 17 Jun 2023 14:15:02 +0000 Original-Received: (at 64124) by debbugs.gnu.org; 17 Jun 2023 14:14:51 +0000 Original-Received: from localhost ([127.0.0.1]:52235 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAWhW-0004WO-Gt for submit@debbugs.gnu.org; Sat, 17 Jun 2023 10:14:50 -0400 Original-Received: from mout.gmx.net ([212.227.17.22]:49565) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qAWhU-0004W7-Lc for 64124@debbugs.gnu.org; Sat, 17 Jun 2023 10:14:49 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1687011282; x=1687616082; i=michael.albinus@gmx.de; bh=x4LKjtUOylPmvXCmsREYUMzuGq1AjvvSjUJDxOXTi+g=; h=X-UI-Sender-Class:From:To:Cc:Subject:In-Reply-To:References:Date; b=LU6GkN9yPcfDtACk8cbWHGrlEHV6cONcDmLoG4F8z/te9bE5LnSxzw1/CDq86VDRLXL7f5y SJc8LgPh83MCLihBN2uNdC6qE6KGQlyQZFPAWHhQRoriSVQMCq5jC8y0n/I3vpIfDk1dZkf3k L32mgtXWlyMPxgjmd4hTwWb4AjCAdzXTYTINXlXgBgpvF2gRxfyHpX14LTLGCO4Ibd2TPkRgR lm58O3OzH+gUsrb/l5oodJuoj9vt4tEJKkq2yUkCbMNaX4kkITfxJ+JyWBFRXjAkR5qgIkaMj obgqSn5lb3Gorao9I1WYzAO4c9ZWgLNj9QMEIhrY4ytxhBj6msFA== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Original-Received: from gandalf.gmx.de ([185.89.39.13]) by mail.gmx.net (mrgmx104 [212.227.17.168]) with ESMTPSA (Nemesis) id 1N9MpY-1q4tx024Oa-015KzK; Sat, 17 Jun 2023 16:14:42 +0200 In-Reply-To: <87wn02nspc.fsf@whxvd.name> (Sebastian Miele's message of "Sat, 17 Jun 2023 14:37:15 +0200") X-Provags-ID: V03:K1:u2PoVW6EDwUCiUDmCCfa2iCT8HLg5oP5nrqy9PQTxi0a6vEHgtP n9f+cGa7GY5rbwdl6ep3JgjtESTS6PEi3l5ntaOxOze/kbX+TCNAEEIj6MrPL01BudYVDs8 6UMELAul6HizlizRWej5C59k+/J96KqoU1BysiG7DFfaeEWDatfoarmHvZySrpjZPsc/rvF bf2o2ODXgh+pb0isSH9Mg== UI-OutboundReport: notjunk:1;M01:P0:2Pxe9PkAauk=;wSKnJ98mgr2q/mJ3O9Dg1+/ZvJb MbuqmBc7EE21+H3a+KMkvEJEOnEEzzXFnWXXzQjWJyCqVduELPdER4j+0m71+vZLlsQBtaw+G +HGzQSBrl4zpJznJYv7DjaezP2VhrJMWMDv2AImcUItvT5jXop9MTwKm3fH838Xgb2l2QpMXv LUFu32HqommoOVOMZmlLqHVdVtux4VCNEVMTbxJXdgvUNRGvW+5LufnajHtPzGMkF7dNQ8RUU I0yG4KeDoJFfKtrKFxpqsVNqIRZnRUP55YefSkIINaHmZycnUgYyEMeAbNM4TXDRvlYEmlYrW pwnQwJfFVxYNY7kh3yr6MkuIXBgU102T8zfmZkK9ruSLU3yAhYt/+D88ZTp55axwNE8DsHemg vgz3jKrGOPmu0Jok8aKGnOHlxYbffDH111rgakaMficiwF92ep9Qg6h1kTePeplmhlA9eXtgd VzIg4Aczk3mNFqYoEaKBM1fAly8+y4dnjXGCXoLKmQsG+ow/sYQxShy9/e2cs6+mAKpSUh/nU TIbhe8/jLq2bwK1dQ9ZrxwwOICeU7Pn3fllrnktr3sYBNBrcupz8ti06dbRqegtRh08lNEjiR ULKQsyCj6p7QH+4gQsoamDQs9Z4JgIKJVBO4VjgUupGwwdkMbUI5az9CJTeVphBZgZ8+kDtis IuvxCFNE7ZP7mqrW9HVrROsDtQOMZtJkarXDK1lnPPUOMJb+BEUTHFRp5cEEzNYmnRWTJbM90 QrzV3VeGStHsK1el5FjUUHCT/1Khl4cewtBzOO+Q2VoABTn7SDMvf0jl364icTYSqYRy3dLT X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:263543 Archived-At: --=-=-= Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable Sebastian Miele writes: > Hi Micheal, Hi Sebastian, > the patch does not apply to my Emacs=C2=A029 checkout. I suspect that the > patch is relative to another repository (probably a/the Tramp repository > outside of Emacs). The patch was based on the tramp-2-6-stable branch of the Tramp git repostory. Appended is the same patch, but now based on the emacs-29 branch of the Emacs git repository. Best regards, Michael. --=-=-= Content-Type: text/x-patch Content-Disposition: attachment Content-Transfer-Encoding: quoted-printable diff --git a/lisp/net/tramp-compat.el b/lisp/net/tramp-compat.el index f176476a73a..3d3ba7a4f43 100644 =2D-- a/lisp/net/tramp-compat.el +++ b/lisp/net/tramp-compat.el @@ -31,11 +31,13 @@ (require 'auth-source) (require 'format-spec) -(require 'ls-lisp) ;; Due to `tramp-handle-insert-directory'. (require 'parse-time) (require 'shell) (require 'subr-x) +(when (memq system-type '(ms-dos windows-nt)) + (require 'ls-lisp)) ;; Due to `tramp-handle-insert-directory'. + (declare-function tramp-compat-rx "tramp") (declare-function tramp-error "tramp") (declare-function tramp-file-name-handler "tramp") diff --git a/lisp/net/tramp-sh.el b/lisp/net/tramp-sh.el index 392a654df21..48ba3d09e3e 100644 =2D-- a/lisp/net/tramp-sh.el +++ b/lisp/net/tramp-sh.el @@ -38,6 +38,7 @@ (declare-function dired-compress-file "dired-aux") (declare-function dired-remove-file "dired-aux") (defvar dired-compress-file-suffixes) +(defvar ls-lisp-use-insert-directory-program) ;; Added in Emacs 28.1. (defvar process-file-return-signal-string) (defvar vc-handled-backends) @@ -2659,7 +2660,7 @@ tramp-sh-handle-insert-directory (access-file filename "Reading directory")) (with-parsed-tramp-file-name (expand-file-name filename) nil (if (and (featurep 'ls-lisp) - (not (symbol-value 'ls-lisp-use-insert-directory-program))) + (not ls-lisp-use-insert-directory-program)) (tramp-handle-insert-directory filename switches wildcard full-directory-p) (when (stringp switches) diff --git a/lisp/net/tramp.el b/lisp/net/tramp.el index 7df455954d8..b46eeb8e374 100644 =2D-- a/lisp/net/tramp.el +++ b/lisp/net/tramp.el @@ -63,6 +63,7 @@ (declare-function file-notify-rm-watch "filenotify") (declare-function netrc-parse "netrc") (defvar auto-save-file-name-transforms) +(defvar ls-lisp-use-insert-directory-program) ;; Reload `tramp-compat' when we reload `tramp-autoloads' of the GNU ;; ELPA package. @@ -4181,6 +4182,7 @@ tramp-handle-find-backup-file-name (defun tramp-handle-insert-directory (filename switches &optional wildcard full-directory-p) "Like `insert-directory' for Tramp files." + (require 'ls-lisp) (unless switches (setq switches "")) ;; Mark trailing "/". (when (and (directory-name-p filename) @@ -4193,7 +4195,6 @@ tramp-handle-insert-directory (with-tramp-progress-reporter v 0 (format "Opening directory %s" file= name) (let (ls-lisp-use-insert-directory-program start) ;; Silence byte compiler. - (ignore ls-lisp-use-insert-directory-program) (tramp-run-real-handler #'insert-directory (list filename switches wildcard full-directory-p)) --=-=-=--