X-Loop: help-debbugs@HIDDEN
Subject: bug#74352: 29.4; emerge-files with tramp + local file fails
Resent-From: =?UTF-8?Q?J=C3=B6rg?= Sommer <joerg@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Thu, 14 Nov 2024 04:53:02 +0000
Resent-Message-ID: <handler.74352.B.173155995027086 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: report 74352
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords:
To: 74352 <at> debbugs.gnu.org
X-Debbugs-Original-To: bug-gnu-emacs@HIDDEN
Received: via spool by submit <at> debbugs.gnu.org id=B.173155995027086
(code B ref -1); Thu, 14 Nov 2024 04:53:02 +0000
Received: (at submit) by debbugs.gnu.org; 14 Nov 2024 04:52:30 +0000
Received: from localhost ([127.0.0.1]:44551 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tBRqH-00072m-0p
for submit <at> debbugs.gnu.org; Wed, 13 Nov 2024 23:52:30 -0500
Received: from lists.gnu.org ([209.51.188.17]:42386)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <joerg@HIDDEN>) id 1tBIls-0006Qg-6y
for submit <at> debbugs.gnu.org; Wed, 13 Nov 2024 14:11:21 -0500
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 <joerg@HIDDEN>) id 1tBIlr-0000rK-Kp
for bug-gnu-emacs@HIDDEN; Wed, 13 Nov 2024 14:11:19 -0500
Received: from jo-so.de ([2a03:4000:8:213::1] helo=s1.jo-so.de)
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <joerg@HIDDEN>) id 1tBIlo-0007lf-K1
for bug-gnu-emacs@HIDDEN; Wed, 13 Nov 2024 14:11:19 -0500
Received: from mail-relay (helo=jo-so.de)
by s1.jo-so.de with local-bsmtp (Exim 4.96)
(envelope-from <joerg@HIDDEN>) id 1tBIlj-001FRf-1l
for bug-gnu-emacs@HIDDEN; Wed, 13 Nov 2024 20:11:11 +0100
Received: from joerg by zenbook.jo-so.de with local (Exim 4.98)
(envelope-from <joerg@HIDDEN>) id 1tBIli-00000001Pul-3c2a
for bug-gnu-emacs@HIDDEN; Wed, 13 Nov 2024 20:11:10 +0100
Date: Wed, 13 Nov 2024 20:11:10 +0100
From: =?UTF-8?Q?J=C3=B6rg?= Sommer <joerg@HIDDEN>
Message-ID: <w5zz6k6sizr36ypz4i74w2ynuujtda3oxkkhsykmllycgb4nkq@crohp7hnsmhb>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
protocol="application/pgp-signature"; boundary="7enjzd4icq7izajr"
Content-Disposition: inline
Received-SPF: pass client-ip=2a03:4000:8:213::1; envelope-from=joerg@HIDDEN;
helo=s1.jo-so.de
X-Spam_score_int: -18
X-Spam_score: -1.9
X-Spam_bar: -
X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, SPF_HELO_NONE=0.001,
SPF_PASS=-0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-Spam-Score: -1.4 (-)
X-Mailman-Approved-At: Wed, 13 Nov 2024 23:52:27 -0500
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.4 (--)
--7enjzd4icq7izajr
Content-Type: text/plain; charset=iso-8859-1; protected-headers=v1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Subject: 29.4; emerge-files with tramp + local file fails
MIME-Version: 1.0
Hi,
when running `emerge-files` with `/ssh:remote:file` and `~/local-file` I get
the buffer `*emerge-diff-errors*` with:
```
diff: /tmp/tramp.wlcRNL: No such file or directory
diff: /home/joerg/local-file: No such file or directory
```
This change solves the problem:
```diff
diff --git lisp/vc/emerge.el lisp/vc/emerge.el
index ca48f2f3c7b..562041e4232 100644
--- lisp/vc/emerge.el
+++ lisp/vc/emerge.el
@@ -581,6 +581,7 @@ emerge-make-diff-list
(setq emerge-diff-buffer (get-buffer-create "*emerge-diff*"))
(with-current-buffer
emerge-diff-buffer
+ (setq default-directory (file-name-directory file-A))
(erase-buffer)
(shell-command
(format "%s %s %s %s"
```
Regards J=F6rg
In GNU Emacs 29.4 (build 2, x86_64-pc-linux-gnu, GTK+ Version 3.24.42, cairo
version 1.18.0) of 2024-06-30, modified by Debian built on sbuild
System Description: Debian GNU/Linux trixie/sid
Configured using:
'configure --build x86_64-linux-gnu --prefix=3D/usr --sharedstatedir=3D/va=
r/lib
--libexecdir=3D/usr/libexec --localstatedir=3D/var/lib
--infodir=3D/usr/share/info --mandir=3D/usr/share/man --with-libsystemd
--with-pop=3Dyes
--enable-locallisppath=3D/etc/emacs:/usr/local/share/emacs/29.4/site-lisp:=
/usr/local/share/emacs/site-lisp:/usr/share/emacs/29.4/site-lisp:/usr/share=
/emacs/site-lisp
--with-sound=3Dalsa --without-gconf --with-mailutils
--with-native-compilation --build x86_64-linux-gnu --prefix=3D/usr
--sharedstatedir=3D/var/lib --libexecdir=3D/usr/libexec
--localstatedir=3D/var/lib --infodir=3D/usr/share/info --mandir=3D/usr/sha=
re/man
--with-libsystemd --with-pop=3Dyes
--enable-locallisppath=3D/etc/emacs:/usr/local/share/emacs/29.4/site-lisp:=
/usr/local/share/emacs/site-lisp:/usr/share/emacs/29.4/site-lisp:/usr/share=
/emacs/site-lisp
--with-sound=3Dalsa --without-gconf --with-mailutils
--with-native-compilation --with-pgtk 'CFLAGS=3D-g -O2
-Werror=3Dimplicit-function-declaration
-ffile-prefix-map=3D/build/reproducible-path/emacs-29.4+1=3D.
-fstack-protector-strong -fstack-clash-protection -Wformat
-Werror=3Dformat-security -fcf-protection -Wall' 'CPPFLAGS=3D-Wdate-time
-D_FORTIFY_SOURCE=3D2' LDFLAGS=3D-Wl,-z,relro'
Configured features:
ACL CAIRO DBUS FREETYPE GIF GLIB GMP GNUTLS GPM GSETTINGS HARFBUZZ JPEG JSON
LCMS2 LIBOTF LIBSELINUX LIBSYSTEMD LIBXML2 MODULES NATIVE_COMP NOTIFY
INOTIFY PDUMPER PGTK PNG RSVG SECCOMP SOUND SQLITE3 THREADS TIFF
TOOLKIT_SCROLL_BARS TREE_SITTER WEBP XIM GTK3 ZLIB
Important settings:
value of $LANG: de_DE.UTF-8
value of $XMODIFIERS: @im=3Dibus
locale-coding-system: utf-8-unix
Major mode: Shell-script
Minor modes in effect:
async-bytecomp-package-mode: t
sh-electric-here-document-mode: t
treemacs-filewatch-mode: t
treemacs-follow-mode: t
treemacs-git-mode: t
treemacs-fringe-indicator-mode: t
desktop-save-mode: t
global-whitespace-mode: t
which-key-mode: t
recentf-mode: t
global-git-commit-mode: t
shell-dirtrack-mode: t
server-mode: t
global-hl-todo-mode: t
hl-todo-mode: t
override-global-mode: t
company-statistics-mode: t
yas-global-mode: t
yas-minor-mode: t
TeX-PDF-mode: t
tooltip-mode: t
global-eldoc-mode: t
show-paren-mode: t
electric-indent-mode: t
mouse-wheel-mode: t
file-name-shadow-mode: t
global-font-lock-mode: t
font-lock-mode: t
blink-cursor-mode: t
size-indication-mode: t
column-number-mode: t
line-number-mode: t
auto-fill-function: #[128 \304\300\301=03#\207 [yas--auto-fill #[128 \301=
\302\300!=02"\207 [auto-fill-function apply default-value] 4=20
(fn &rest ARGS)] :around nil apply] 5 advice]
transient-mark-mode: t
auto-composition-mode: t
auto-encryption-mode: t
auto-compression-mode: t
abbrev-mode: t
Load-path shadows:
/usr/share/emacs/site-lisp/elpa/devscripts-40/pbuilder-mode hides /usr/shar=
e/emacs/site-lisp/elpa-src/devscripts-40/pbuilder-mode
/usr/share/emacs/site-lisp/elpa/devscripts-40/devscripts hides /usr/share/e=
macs/site-lisp/elpa-src/devscripts-40/devscripts
/usr/share/emacs/site-lisp/elpa/devscripts-40/devscripts-autoloads hides /u=
sr/share/emacs/site-lisp/elpa-src/devscripts-40/devscripts-autoloads
/usr/share/emacs/site-lisp/elpa/devscripts-40/devscripts-pkg hides /usr/sha=
re/emacs/site-lisp/elpa-src/devscripts-40/devscripts-pkg
/usr/share/emacs/site-lisp/elpa/devscripts-40/pbuilder-log-view-mode hides =
/usr/share/emacs/site-lisp/elpa-src/devscripts-40/pbuilder-log-view-mode
/usr/share/emacs/site-lisp/elpa/mutt-alias-1.4/mutt-alias-autoloads hides /=
usr/share/emacs/site-lisp/elpa-src/mutt-alias-1.4/mutt-alias-autoloads
/usr/share/emacs/site-lisp/elpa/mutt-alias-1.4/mutt-alias-pkg hides /usr/sh=
are/emacs/site-lisp/elpa-src/mutt-alias-1.4/mutt-alias-pkg
/usr/share/emacs/site-lisp/elpa/mutt-alias-1.4/mutt-alias hides /usr/share/=
emacs/site-lisp/elpa-src/mutt-alias-1.4/mutt-alias
/usr/share/emacs/site-lisp/elpa/muttrc-mode-1.2.1/muttrc-mode-autoloads hid=
es /usr/share/emacs/site-lisp/elpa-src/muttrc-mode-1.2.1/muttrc-mode-autolo=
ads
/usr/share/emacs/site-lisp/elpa/muttrc-mode-1.2.1/muttrc-mode-pkg hides /us=
r/share/emacs/site-lisp/elpa-src/muttrc-mode-1.2.1/muttrc-mode-pkg
/usr/share/emacs/site-lisp/elpa/muttrc-mode-1.2.1/muttrc-mode hides /usr/sh=
are/emacs/site-lisp/elpa-src/muttrc-mode-1.2.1/muttrc-mode
/usr/share/emacs/site-lisp/elpa/pod-mode-1.3/pod-mode-pkg hides /usr/share/=
emacs/site-lisp/elpa-src/pod-mode-1.3/pod-mode-pkg
/usr/share/emacs/site-lisp/elpa/pod-mode-1.3/pod-mode hides /usr/share/emac=
s/site-lisp/elpa-src/pod-mode-1.3/pod-mode
/usr/share/emacs/site-lisp/elpa/pod-mode-1.3/pod-mode-autoloads hides /usr/=
share/emacs/site-lisp/elpa-src/pod-mode-1.3/pod-mode-autoloads
/home/joerg/.config/emacs/elpa/transient-20240918.1138/transient hides /usr=
/share/emacs/29.4/lisp/transient
/home/joerg/.config/emacs/elpa/csharp-mode-20221126.2005/csharp-mode hides =
/usr/share/emacs/29.4/lisp/progmodes/csharp-mode
/home/joerg/.config/emacs/elpa/project-0.11.1/project hides /usr/share/emac=
s/29.4/lisp/progmodes/project
/home/joerg/.config/emacs/elpa/xref-1.7.0/xref hides /usr/share/emacs/29.4/=
lisp/progmodes/xref
Features:
(shadow sort mail-extr emacsbug ibuffer ibuffer-loaddefs apropos mule-util
helpful cc-langs trace info-look elisp-refs bug-reference emerge help-fns
radix-tree cl-print expand-region text-mode-expansions cc-mode-expansions
python-el-fgallina-expansions latex-mode-expansions js2-mode-expansions
js-mode-expansions html-mode-expansions css-mode-expansions
er-basic-expansions expand-region-core expand-region-custom misearch
multi-isearch helm-x-files helm-for-files helm-bookmark helm-adaptive
treemacs-bookmarks treemacs-tags magit-bookmark bookmark pp helm-external
helm-net css-mode sgml-mode facemenu eww url-queue shr pixel-fill kinsoku
url-file svg mm-url gnus nnheader range winner minibuffer-complete-cycle
tramp-archive tramp-gvfs helm-command helm-elisp helm-eval edebug debug
backtrace helm-info helm-mode helm-misc helm-files image-dired
image-dired-tags image-dired-external image-dired-util xdg image-mode exif
helm-buffers helm-occur helm-tags helm-locate helm-grep helm-regexp
helm-utils helm-types helm-help helm helm-global-bindings helm-easymenu
helm-core async-bytecomp helm-source helm-multi-match helm-lib async systemd
conf-mode make-mode view lsp-zig lsp-yang lsp-yaml lsp-xml lsp-wgsl
lsp-volar lsp-vimscript lsp-vhdl lsp-vetur lsp-html lsp-verilog lsp-vala
lsp-v lsp-typeprof lsp-ttcn3 lsp-trunk lsp-toml lsp-tilt lsp-tex
lsp-terraform lsp-svelte lsp-steep lsp-sqls lsp-sql lsp-sorbet lsp-solidity
lsp-solargraph lsp-semgrep lsp-rust lsp-ruff lsp-ruby-syntax-tree
lsp-ruby-lsp lsp-rubocop lsp-roslyn lsp-rf lsp-remark lsp-racket lsp-r
lsp-qml lsp-pylsp lsp-pyls lsp-pwsh lsp-purescript lsp-pls lsp-php
lsp-perlnavigator lsp-perl lsp-openscad lsp-ocaml lsp-nushell lsp-nix
lsp-nim lsp-nginx lsp-move lsp-mojo lsp-mint lsp-meson lsp-mdx lsp-marksman
lsp-markdown lsp-magik lsp-lua lsp-lisp lsp-kotlin lsp-json lsp-jq
lsp-javascript lsp-idris lsp-haxe lsp-hack lsp-groovy lsp-graphql
lsp-golangci-lint lsp-glsl lsp-gleam lsp-gdscript lsp-fsharp lsp-fortran
lsp-eslint lsp-erlang lsp-emmet lsp-elm lsp-elixir lsp-earthly
lsp-dockerfile lsp-dhall lsp-d lsp-cypher lsp-cucumber lsp-css lsp-csharp
gnutls lsp-crystal lsp-credo lsp-cobol lsp-cmake lsp-clojure lsp-clangd
lsp-bufls lsp-go lsp-beancount lsp-bash lsp-awk lsp-autotools lsp-astro
lsp-asm lsp-ansible lsp-angular lsp-ada lsp-semantic-tokens lsp-actionscript
python sh-script smie executable lsp-treemacs lsp-treemacs-generic
lsp-treemacs-themes treemacs-treelib treemacs treemacs-header-line
treemacs-compatibility treemacs-mode treemacs-interface treemacs-persistence
treemacs-filewatch-mode treemacs-follow-mode treemacs-rendering
treemacs-annotations treemacs-async treemacs-workspaces treemacs-dom
treemacs-visuals treemacs-fringe-indicator pulse treemacs-faces
treemacs-icons treemacs-scope treemacs-themes treemacs-core-utils pfuture
hl-line treemacs-logging treemacs-customization treemacs-macros lsp-ui
lsp-ui-flycheck lsp-ui-imenu lsp-ui-peek lsp-ui-sideline lsp-ui-doc
goto-addr lsp-ui-util face-remap lsp-modeline lsp-headerline lsp-icons
lsp-diagnostics flycheck lsp-completion lsp-origami origami origami-parsers
lsp-mode lsp-protocol spinner network-stream nsm lv inline ht f ewoc
js2-mode js c-ts-common treesit cc-mode cc-fonts cc-guess cc-menus cc-cmds
jka-compr company-emoji company-emoji-list company-math math-symbol-lists
company-oddmuse company-keywords company-etags etags fileloop generator xref
company-gtags company-dabbrev-code company-dabbrev company-files
company-clang company-capf company-cmake company-semantic company-template
company-bbdb guess-language find-func flyspell ispell typo markdown-mode
color noutline outline desktop frameset disp-table whitespace diminish
which-key use-package-diminish dom tramp-cache time-stamp tramp-sh tramp
tramp-loaddefs trampver tramp-integration files-x tramp-compat parse-time
iso8601 recentf tree-widget wid-edit MRU-yank randomsig cl magit-submodule
magit-blame magit-stash magit-reflog magit-bisect magit-push magit-pull
magit-fetch magit-clone magit-remote magit-commit magit-sequence magit-notes
magit-worktree magit-tag magit-merge magit-branch magit-reset magit-files
magit-refs magit-status magit magit-repos magit-apply magit-wip magit-log
which-func imenu magit-diff smerge-mode diff git-commit log-edit message
sendmail yank-media puny rfc822 mml mml-sec epa epg rfc6068 epg-config
gnus-util time-date mm-decode mm-bodies mm-encode mail-parse rfc2231 rfc2047
rfc2045 mm-util ietf-drums mail-prsvr mailabbrev mail-utils gmm-utils
mailheader pcvs-util add-log magit-core magit-autorevert autorevert
filenotify magit-margin magit-transient magit-process with-editor comp
comp-cstr shell pcomplete server magit-mode transient benchmark magit-git
magit-base magit-section format-spec cursor-sensor hl-todo compat compat-30
compat-macs dokuwiki-mode derived diff-mode use-package-bind-key bind-key
company-statistics company-auctex react-snippets yasnippet-snippets
yasnippet company latex easy-mmode edmacro kmacro latex-flymake flymake-proc
flymake project compile text-property-search warnings icons thingatpt
tex-ispell tex-style tex dbus xml crm texmathp cc-styles cc-align cc-engine
cc-vars cc-defs bitbake dash s mmm-mode mmm-univ mmm-class mmm-region
mmm-auto mmm-vars mmm-utils mmm-compat comint ansi-osc ring ansi-color
cl-extra help-mode use-package-core tty-dark-theme finder-inf advice
bitbake-autoloads cmake-font-lock-autoloads cmake-mode-autoloads
color-theme-modern-autoloads auctex-autoloads tex-site
company-emoji-autoloads company-fuzzy-autoloads company-autoloads
csv-mode-autoloads dpkg-dev-el-autoloads debian-el-autoloads debian-el dired
dired-loaddefs expand-region-autoloads flycheck-rust-autoloads
go-guru-autoloads go-mode-autoloads guess-language-autoloads
helm-c-yasnippet-autoloads helm-autoloads helm-core-autoloads
async-autoloads helpful-autoloads elisp-refs-autoloads hl-todo-autoloads
jenkinsfile-mode-autoloads groovy-mode-autoloads jq-mode-autoloads
jq-ts-mode-autoloads json-mode-autoloads kconfig-mode-autoloads
know-your-http-well-autoloads lsp-origami-autoloads lsp-treemacs-autoloads
lsp-ui-autoloads lsp-mode-autoloads lua-mode-autoloads magit-autoloads pcase
magit-section-autoloads mmm-mode-autoloads move-text-autoloads
multiple-cursors-autoloads nginx-mode-autoloads php-mode-autoloads
po-mode-autoloads restclient-test-autoloads restclient-autoloads
js2-mode-autoloads rustic-autoloads flycheck-autoloads project-autoloads
markdown-mode-autoloads f-autoloads rust-mode-autoloads
smartparens-autoloads rx test-simple-autoloads transient-autoloads
treemacs-autoloads posframe-autoloads dash-autoloads
visual-fill-column-autoloads wfnames-autoloads which-key-autoloads
with-editor-autoloads info compat-autoloads xref-autoloads
yaml-mode-autoloads yasnippet-snippets-autoloads yasnippet-autoloads
devscripts-autoloads mutt-alias-autoloads muttrc-mode-autoloads
pod-mode-autoloads package browse-url url url-proxy url-privacy url-expand
url-methods url-history url-cookie generate-lisp-file url-domsuf url-util
mailcap url-handlers url-parse auth-source cl-seq eieio eieio-core cl-macs
password-cache json subr-x map byte-opt gv bytecomp byte-compile url-vars
cl-loaddefs cl-lib rmc iso-transl tooltip cconv eldoc paren electric
uniquify ediff-hook vc-hooks lisp-float-type elisp-mode mwheel term/pgtk-win
pgtk-win term/common-win pgtk-dnd tool-bar dnd fontset image regexp-opt
fringe tabulated-list replace newcomment text-mode lisp-mode prog-mode
register page tab-bar menu-bar rfn-eshadow isearch easymenu timer select
scroll-bar mouse jit-lock font-lock syntax font-core term/tty-colors frame
minibuffer nadvice seq simple cl-generic indonesian philippine cham georgian
utf-8-lang misc-lang vietnamese tibetan thai tai-viet lao korean japanese
eucjp-ms cp51932 hebrew greek romanian slovak czech european ethiopic indian
cyrillic chinese composite emoji-zwj charscript charprop case-table epa-hook
jka-cmpr-hook help abbrev obarray oclosure cl-preloaded button loaddefs
theme-loaddefs faces cus-face macroexp files window text-properties overlay
sha1 md5 base64 format env code-pages mule custom widget keymap
hashtable-print-readable backquote threads dbusbind inotify dynamic-setting
system-font-setting font-render-setting cairo gtk pgtk lcms2 multi-tty
make-network-process native-compile emacs)
Memory information:
((conses 16 1166425 809726)
(symbols 48 69186 1)
(strings 32 377226 108544)
(string-bytes 1 11859790)
(vectors 16 151735)
(vector-slots 8 3622097 737749)
(floats 8 922 3217)
(intervals 56 223573 4049)
(buffers 984 62))
--=20
H=FCgelsch=E4fer's Law (http://www.bruhaha.de/laws.html):
Beitr=E4ge werden dort gepostet, wo sie den gr=F6=DFten Widerstand hervorru=
fen.
--7enjzd4icq7izajr
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iHUEABEIAB0WIQS1pYxd0T/67YejVyF9LJoj0a6jdQUCZzT5xQAKCRB9LJoj0a6j
dV5eAP9bQbINSnjDs/hPh5XJgLXgIN/HMwpPwYqcjzMS4KxirQEArtW7Cs35kq1K
0yB2UNEYzAnEIRex9dHPdnE8p+oRi7U=
=q+eN
-----END PGP SIGNATURE-----
--7enjzd4icq7izajr--
Content-Disposition: inline Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-Mailer: MIME-tools 5.505 (Entity 5.505) Content-Type: text/plain; charset=utf-8 X-Loop: help-debbugs@HIDDEN From: help-debbugs@HIDDEN (GNU bug Tracking System) To: =?UTF-8?Q?J=C3=B6rg?= Sommer <joerg@HIDDEN> Subject: bug#74352: Acknowledgement (29.4; emerge-files with tramp + local file fails) Message-ID: <handler.74352.B.173155995027086.ack <at> debbugs.gnu.org> References: <w5zz6k6sizr36ypz4i74w2ynuujtda3oxkkhsykmllycgb4nkq@crohp7hnsmhb> X-Gnu-PR-Message: ack 74352 X-Gnu-PR-Package: emacs Reply-To: 74352 <at> debbugs.gnu.org Date: Thu, 14 Nov 2024 04:53:02 +0000 Thank you for filing a new bug report with debbugs.gnu.org. This is an automatically generated reply to let you know your message has been received. Your message is being forwarded to the package maintainers and other interested parties for their attention; they will reply in due course. Your message has been sent to the package maintainer(s): bug-gnu-emacs@HIDDEN If you wish to submit further information on this problem, please send it to 74352 <at> debbugs.gnu.org. Please do not send mail to help-debbugs@HIDDEN unless you wish to report a problem with the Bug-tracking system. --=20 74352: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=3D74352 GNU Bug Tracking System Contact help-debbugs@HIDDEN with problems
X-Loop: help-debbugs@HIDDEN
Subject: bug#74352: 29.4; emerge-files with tramp + local file fails
Resent-From: Eli Zaretskii <eliz@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Thu, 14 Nov 2024 07:06:01 +0000
Resent-Message-ID: <handler.74352.B74352.173156792920838 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 74352
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords:
To: =?UTF-8?Q?J=C3=B6rg?= Sommer <joerg@HIDDEN>
Cc: 74352 <at> debbugs.gnu.org
Received: via spool by 74352-submit <at> debbugs.gnu.org id=B74352.173156792920838
(code B ref 74352); Thu, 14 Nov 2024 07:06:01 +0000
Received: (at 74352) by debbugs.gnu.org; 14 Nov 2024 07:05:29 +0000
Received: from localhost ([127.0.0.1]:44718 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tBTuy-0005Q2-Hh
for submit <at> debbugs.gnu.org; Thu, 14 Nov 2024 02:05:28 -0500
Received: from eggs.gnu.org ([209.51.188.92]:53076)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <eliz@HIDDEN>) id 1tBTuw-0005Po-11
for 74352 <at> debbugs.gnu.org; Thu, 14 Nov 2024 02:05:27 -0500
Received: from fencepost.gnu.org ([2001:470:142:3::e])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <eliz@HIDDEN>)
id 1tBTuq-0000PE-73; Thu, 14 Nov 2024 02:05:20 -0500
DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org;
s=fencepost-gnu-org; h=MIME-version:References:Subject:In-Reply-To:To:From:
Date; bh=SwZLQURXqvGuXTCRHBnl3XaUsLtO1JzykEIGY1EBqW0=; b=jj1WTSJbPk1J/vRjDXCW
6laC+Dle2ibRwGMltPrd0II57JuCc3PdbFFf4ugpcaeUtkgueSBm2x8AftRePKlR15s9mTV+jALmS
RK8+tJusWDunj8Tu04PIzurFsCGRSmSG06kMpnVyatj5Spwd6IIPXH9gWmNDHN4vGhouf0UaKZJyG
tAciqwvj18aGj7sIH1havuvFWNjaQWzeQxBz1w1PsFFUOuiC2OWAOXMo/BNNIpOS8dgv4O1puAwz8
M546hy8WdsqvwjMH4jdQ796/cFCKL7NMWi1kOH9uVSo09onWMepmLUJBFhYNVQ5KF/EQ4x7W6WmIR
FvqQf29R6IeVdw==;
Date: Thu, 14 Nov 2024 09:05:16 +0200
Message-Id: <86frnul2hf.fsf@HIDDEN>
From: Eli Zaretskii <eliz@HIDDEN>
In-Reply-To: <w5zz6k6sizr36ypz4i74w2ynuujtda3oxkkhsykmllycgb4nkq@crohp7hnsmhb>
(message from =?UTF-8?Q?J=C3=B6rg?= Sommer on Wed, 13 Nov 2024 20:11:10
+0100)
References: <w5zz6k6sizr36ypz4i74w2ynuujtda3oxkkhsykmllycgb4nkq@crohp7hnsmhb>
MIME-version: 1.0
Content-type: text/plain; charset=iso-8859-1
Content-Transfer-Encoding: 8bit
X-Spam-Score: -2.3 (--)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -3.3 (---)
> Date: Wed, 13 Nov 2024 20:11:10 +0100
> From: Jörg Sommer <joerg@HIDDEN>
>
> when running `emerge-files` with `/ssh:remote:file` and `~/local-file` I get
> the buffer `*emerge-diff-errors*` with:
>
> ```
> diff: /tmp/tramp.wlcRNL: No such file or directory
> diff: /home/joerg/local-file: No such file or directory
> ```
>
> This change solves the problem:
>
> ```diff
> diff --git lisp/vc/emerge.el lisp/vc/emerge.el
> index ca48f2f3c7b..562041e4232 100644
> --- lisp/vc/emerge.el
> +++ lisp/vc/emerge.el
> @@ -581,6 +581,7 @@ emerge-make-diff-list
> (setq emerge-diff-buffer (get-buffer-create "*emerge-diff*"))
> (with-current-buffer
> emerge-diff-buffer
> + (setq default-directory (file-name-directory file-A))
Thanks, but why file-A? Isn't the problem symmetric wrt the two
files? Or what am I missing?
Received: (at control) by debbugs.gnu.org; 14 Nov 2024 08:00:48 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 14 03:00:47 2024 Received: from localhost ([127.0.0.1]:44863 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tBUmV-00084Y-Ko for submit <at> debbugs.gnu.org; Thu, 14 Nov 2024 03:00:47 -0500 Received: from mout.gmx.net ([212.227.15.19]:41641) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <michael.albinus@HIDDEN>) id 1tBUmT-00084J-FE for control <at> debbugs.gnu.org; Thu, 14 Nov 2024 03:00:46 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.de; s=s31663417; t=1731571239; x=1732176039; i=michael.albinus@HIDDEN; bh=/0/68EfTO04w6hZ3JBOt1dNSMQG00NFdEdbEYJVjkEo=; h=X-UI-Sender-Class:Date:Message-Id:To:From:Subject:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=SNYLkY+M4ULAIU9ifkM4huMyBt3kfhgEhjKgsP/596imcMZ83R7Qxk6f2abIltdU dWDMLR/rShxtQVWRCy1BEsqQmoWBElKCSxjIQ7c0qGnLJZRFWthvC6VcBgGl3QynL XZds2077mUQQvpP7FcYS21dYpu2AzDKoEWm9stqhRoUGQVAgjstW3evc9BZ2eQnEf +89Ji259hUqB2VKRua+1nsVYDcqCwsLKGlkyBtDvdAyko8dvrJEnWjCA+HPUVddaI t4nT+4pYSzKF3EG5rLfq1lQkkwQGDxyPGydijhXwC7rU2EuK/4z/anf/0o3x9GErY i/9VvFoz9zJ2LJ4Fpg== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from gandalf.gmx.de ([185.89.38.155]) by mail.gmx.net (mrgmx005 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MwwZd-1u0J5Q39Nz-012ATr for <control <at> debbugs.gnu.org>; Thu, 14 Nov 2024 09:00:39 +0100 Date: Thu, 14 Nov 2024 09:00:38 +0100 Message-Id: <871pzeb5y1.fsf@HIDDEN> To: control <at> debbugs.gnu.org From: Michael Albinus <michael.albinus@HIDDEN> Subject: control message for bug #74352 X-Provags-ID: V03:K1:7sxpLdCiJeHtPCwQsj70CMDQbBdazxZyrxlAL7zkA6ifV5TjS/+ ANLh093KSToyDRKWgYiWPvxAUuImQgmSJzY7pDQsm1GEWQCJjgWKrbc8F8frtGtuCaV/KsD G2T9UtQ/wV4PMvVS2lJsmdfmjzxc4cq6b6jpahDfKPzGNnZ4Y9SxecV8p01F4BsSx6jgABh esY9izNO/sHjEUu1Yv0Pw== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:L/BA3+I6X08=;lObPaWWdMxJG0ZcwCgKF+uuzBPJ Rdk4xQQ9gvynoRYJ9fdcB39EHIMVKRQDg8jg/Qp6hUwvYg8HYWhWEP8BMZFEwiAmYSKWZt26E MSymvngAVl1HQJrfYMnCptnwru5jZrAuV+gfEyZFr95RG+gWrNI/sLxGc1t8WYgQuWcjDHKk8 15Sj79GgtuNW6FfvkEjHtLpZeGMd60e/VLML5WHIBu3vwNnWaVxmdaWxWKDX2/c6Q4vEH1T/N LzgqKnEQ7rkI5DNKNmJepG7MSx3wI6E1FzH0181q7ALjK7UBSPjnsi0RMj1oLdJddiS7YmNwb SISTSPUA5cE8CI37Z7/ztUFivEi75cFR0zm/YfPcVWWRmUlXsT9IxALIpLPCDvgW4tc01w7O1 vpS+IfFNrT1MJDm+wjudbkvZbqKHxqqcAli2dEO3+ef4eezxMGUNjoVLLTLxkeBaemSuC0tDt VBN5veZVI6OhPiUG4UUDPqVg3NO9Rex3SZqqeCqnLX/WX1Az+8qkap3BvyPaP4e0zWp9aQ9JK IEpTwv/rxRHGemtzUxloQngtOZN0oIiMHGvPN29+ANMJm8QWnQxACygd0s6PvaylV3T7tJFop QgzhvpJMt72mSmSY/zzTRmmPTDjuMLHz6dWvsy2TAIF0ZgG6i6y/QeolIjmv2oWrmJWDoshCy oj3AShkFRmHc9PF3vXGBbb+knqmpFOygS8csER7hZM/JptLoob4pHcKbBCQN/WUdO47OiZbMH uUD1g34MdX20Ua2FP4WCZjW8b3Dk4DqBmhoeZClx5Bv0E7Lic1vAXR2uC12MwG81LoFJEM0e4 OomAthwDLLearq/xrJ1srvWnLsV6QW2GoRx1i4AxLSDy2gmmWtOQyp+YIIhKN5XRr73fH+FTx eDYM3VaHD39i0K5C7bXDUgwdB6i9TiEaZsk9jhPjJIHxiqxWyfNNmgHD/ X-Spam-Score: -1.4 (-) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -2.4 (--) tags 74352 + confirmed quit
Received: (at control) by debbugs.gnu.org; 14 Nov 2024 08:01:36 +0000 From debbugs-submit-bounces <at> debbugs.gnu.org Thu Nov 14 03:01:36 2024 Received: from localhost ([127.0.0.1]:44870 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>) id 1tBUnI-00086r-0F for submit <at> debbugs.gnu.org; Thu, 14 Nov 2024 03:01:36 -0500 Received: from mout.gmx.net ([212.227.15.15]:35455) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from <michael.albinus@HIDDEN>) id 1tBUnF-00086Z-LG for control <at> debbugs.gnu.org; Thu, 14 Nov 2024 03:01:34 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.de; s=s31663417; t=1731571288; x=1732176088; i=michael.albinus@HIDDEN; bh=jJ36q11et2wtrxpv/KMFckUDBeFKtyXGDr/gRk/Enl0=; h=X-UI-Sender-Class:Date:Message-Id:To:From:Subject:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=qF6j5hRdo7ma8t7CAmxN2oqFBMPwnWoNc5hscrb6t94D43uJ7ku15BRxJ5YASDjl 5ZpapYCLtw2wpTacnjE9smvZPeasja+55hKSGXMTM0e0/uClxy73+EZD+th59Z0sN l0lkvHV6aKPtLbyp1m5jePXP5QApJ4DIELVQYBVnMM+T6IzGBzcqzsKNcWpA5ARol DZ28P3jm1uByz3XS31oahSTN8kgEuJ9ik1vTKqZxiAuGLN0ExDAdJvKWUZWXMLnbt beCVn4o4291aZxDCUkt9z/G7bU5L1ERaFIQgB6qyKtOsP0VCwAt9Dbbz5+Y6ogLSa oY4YrfTnbIW+vvotPw== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from gandalf.gmx.de ([185.89.38.155]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1M42jK-1tBUn93flI-00H5Xi for <control <at> debbugs.gnu.org>; Thu, 14 Nov 2024 09:01:28 +0100 Date: Thu, 14 Nov 2024 09:01:27 +0100 Message-Id: <87zfm29rc8.fsf@HIDDEN> To: control <at> debbugs.gnu.org From: Michael Albinus <michael.albinus@HIDDEN> Subject: control message for bug #74352 X-Provags-ID: V03:K1:zWiaT1z6k8mSmqNeLZvTbzhQrYIcb9SYTUyrXm8e3rtZSNb3H05 GX9jCJOYV016lTmHJSfssVk9M9YZdTThpJFmMFa2PTIgrX3nk1BorjEv4wwHqVj7ArldPh2 5KAYjx5RVxtVf76ZrvvQOAMbhdrxCzmxuxF50zFHp2kU/uMBZ5gGhUqkgCITJtjWr8D1pn7 sP5iPjanvz9k01n4k6rOA== X-Spam-Flag: NO UI-OutboundReport: notjunk:1;M01:P0:cxrqNA6wjaQ=;L84ZeogWbzwN9gdX01JTwwHGZjC uci5A3dRe3ajvCZ+OKVsnyNuKKtiC5lIfczPotRTpd1wgVTwa80QlXh1ZpdgFwTy+P6hoi0cs No7oem3GwWOveQogumBAFtBj75hWqmL96eyc3z85BppKFxdQDWJdKCs6c17gSZCma5QuRn8Je Qd3Pved4t7Yqy5qErqOYM/Z6X6WLre70zNNsDJxb/BS86v9Dw1LVniYdR+jRGYHBJwkQZNz/A QI7Tqt27GaScv0Lk6r7Dt7d+LQIcj1yWn/oaZO4A/vkVnu209Ph+US8n3It/k9ClN10M1Bgt6 9E4W9pN17vPZTtoQj+v+HhwBICJDPKtbohYzH0RGEdM8idqGN1sEVyyWr59zd4k3fpxeniw5e Mz7TQDjdYdDI3gX/FK/SlVhH8SzdIMOc1gbmYLF5n7SARNAnpAlZkEA54/O/TRIbrICaaiC9B mVie0DFaEhJ/bMwZKLiJ8nSi8oPJqjfAubzGGvpWSv+qHSe2tS8PFDJj8oEV5yqaJ6ipQBp0c HnRdSmRr2VgWEIyrHNg2r77mUFqe5bkrIFLIjz/+84RmgviGf60O96+3wbNBrbfIGXTrdxsRu Y0yLaYlvgo08U/yAwYOsvN1ICmupYiQiHGc6bkr9nbTxHGuinxlzH8/m7SbW5Kw4XrsIXfSAa huh5ZVfic4pzfDy7Fhf36qXEXkWG7xcxCnAPMRa7jEf3PTL5HruenCMvQkoyJhOuNElySWTRq WqelhJt8gX+ohoKz3bL6Mi/AKIyBQwd6PghwuV7WFJBtXREGJUWoHQgzIAKerXioQA+/1lrQo Z2pXCfrGJPiTmooVZK9pZa/5L+Zak5LQ4C/F0xkUEecdZlzKQiYVvh3RRp3iLvjfahvNUvN0B xuxCuwMvc/P50FCpDU8S5MCUekBCfu409t0VOBpiXSMVj2CPccRfNK6Jg X-Spam-Score: -0.7 (/) X-Debbugs-Envelope-To: control X-BeenThere: debbugs-submit <at> debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: <debbugs-submit.debbugs.gnu.org> List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe> List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/> List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org> List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help> List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>, <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe> Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org> X-Spam-Score: -1.7 (-) merge 74352 6850 quit
X-Loop: help-debbugs@HIDDEN
Subject: bug#74352: 29.4; emerge-files with tramp + local file fails
Resent-From: Michael Albinus <michael.albinus@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Thu, 14 Nov 2024 08:12:02 +0000
Resent-Message-ID: <handler.74352.B74352.1731571868485 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 74352
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: confirmed
To: =?UTF-8?Q?J=C3=B6rg?= Sommer <joerg@HIDDEN>
Cc: 74352 <at> debbugs.gnu.org
Received: via spool by 74352-submit <at> debbugs.gnu.org id=B74352.1731571868485
(code B ref 74352); Thu, 14 Nov 2024 08:12:02 +0000
Received: (at 74352) by debbugs.gnu.org; 14 Nov 2024 08:11:08 +0000
Received: from localhost ([127.0.0.1]:44882 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tBUwW-00007l-1f
for submit <at> debbugs.gnu.org; Thu, 14 Nov 2024 03:11:08 -0500
Received: from mout.gmx.net ([212.227.17.22]:35379)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <michael.albinus@HIDDEN>) id 1tBUwT-00007A-Oj
for 74352 <at> debbugs.gnu.org; Thu, 14 Nov 2024 03:11:06 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.de;
s=s31663417; t=1731571854; x=1732176654; i=michael.albinus@HIDDEN;
bh=0TNe88NdAn/mm1C8G5qKv5lMbzPIjOxMPFJVM2zm2/I=;
h=X-UI-Sender-Class:From:To:Cc:Subject:In-Reply-To:References:Date:
Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:cc:
content-transfer-encoding:content-type:date:from:message-id:
mime-version:reply-to:subject:to;
b=VF4Q9/mzP8mroAqHtyE2W10vBaDMwoGOd830JpCbGeMl1Xk5kvbJYiFIOXHAVXuk
EKsQqLSuCg9YItlIG9STGsb6Lnc7ZYLMU8c6x+PPNynhpYbjz5pCyU7fzbQhHKs5V
ZGAP+xFwdD83VT8O+CLWc33Bp2/hA3c6YXdF5V8iWgZNLalKMua3W5WIfeglIlqJG
L4fjDVY8HtXWKnI5iQ9rfzg3DFmZfR93ky33vuIPfRZx06K69VwQZewyFqq4BO1pd
rdEeyehkGZMV6TyDWL0BnP5AYalY4NldpFYrkBSt/JBxki8sW42KZzMrH/7NeJCNc
XTo8BCURzINK5rVraA==
X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a
Received: from gandalf.gmx.de ([185.89.38.155]) by mail.gmx.net (mrgmx104
[212.227.17.168]) with ESMTPSA (Nemesis) id 1Mi2O1-1tfrod27xx-00fxKg; Thu, 14
Nov 2024 09:10:54 +0100
From: Michael Albinus <michael.albinus@HIDDEN>
In-Reply-To: <w5zz6k6sizr36ypz4i74w2ynuujtda3oxkkhsykmllycgb4nkq@crohp7hnsmhb>
("=?UTF-8?Q?J=C3=B6rg?= Sommer"'s message of "Wed, 13 Nov 2024 20:11:10
+0100")
References: <w5zz6k6sizr36ypz4i74w2ynuujtda3oxkkhsykmllycgb4nkq@crohp7hnsmhb>
Date: Thu, 14 Nov 2024 09:10:53 +0100
Message-ID: <87ttca9qwi.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:2DTdip6zbBEhj9Tpjg7aJrSfJ9pLBb61F7CUmttVhR2xPS2bIzF
V2O6COavgbLzxgfA7Nydpete3yijYwFFxtq2UEZ43DoXhG0Z5c4u2+3c6/pYe4XwqBGPaaT
iyzLmhxfppc0rs9j/JfXPDcZ5aS3AsZN4r+Qa+x1vmGQpoMOWjiQSfRfbpCVFi0vF5Bn1cP
SwVckbOvOkfHLX2x9Xa9A==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:RQQxumcrnbE=;MyBgLTwl91if6veEi6v0E2E5NWI
L9UxwvJn7Ijjjhj+G+ZpEYI8fQl43v86pB4fXUtBZhb7HRlx/YxkPUI+1pXJ5oNefhsksb0eS
zWxbv1ZYFdfmnTyfoV29xh7rwxOjPTGqEP7f6YHaAxNFwIphKezqpFiIGi1+Mdb4tpXJwxpR+
Nt+Hz4Opnj60LW7ZHW0P41u8SDmZfvph8RtC9fZV0r9l3pcX/piLdu9vfhP1vy1pwcaN3s9nk
tcsBCLeFbb3/Xub8J0Czx4hOvQjsDIO3Epi7v5O9pkwTFMWa/3VDAn8YwsJJ6NdxO0yTFvHgH
6mLbf/BQWg8fhfDCDtCnr/nbMyc6K+bdBaH7RvbZ1R0KeTVzg2aZ7YFdyKJo5qHcB2oIwvCsP
r1XTDmyK1hiZaxvEzlJKxIhEN/WIqOEpIrO/f63V1sF0S2LlPNT7Ky/mheu2s9wJ1bDqnMzHN
+Hc31TE66nhU4YYw6IIgjgAqjBJY/psA2tBcKZo8qhqLqJ+RvaHh+KSSBWvI1U62erU0SLnAQ
lts23jrK/YBhOWhRniK0W3XZl3p/ss9yD3Z9UX7LKcLH5bvZiQsy0fbZ4Cs2SF7tqNLR7GZ9E
OfM4Cjx+LorO05optyyUZZPqUlcoeqQS7zYME8s6qOC8tei9j8m2CFJzkoRSFT0BV1Fl4gwoK
t11xZtOrxYuvEHuiC1cG94iFmSsRU1yKXSDYgoeGjWupLPDjlCNn3vT7rfB41JUzMSSmtcB5+
atvttbQJVgpOcUaSWi7iJVbgTXV6zm9xfWi9780xWiTL1IOwul6YvzmTbNSkZv1DUMmCQ8tkf
2LSetGWJvwfWSlIzrBw+2SRxlXYM41pyH4XMRbh5REhAO/2Vag9jF93vpdMtels7jIyLgyo+B
iH25PmXOOBCkY2rdkNDOcCndVXl0H/e0uEDe2O58aVw1QTmpNnMmbhRpp
X-Spam-Score: -1.4 (-)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.4 (--)
J=C3=B6rg Sommer <joerg@HIDDEN> writes:
> Hi,
Hi Joerg,
> when running `emerge-files` with `/ssh:remote:file` and `~/local-file` I =
get
> the buffer `*emerge-diff-errors*` with:
>
> ```
> diff: /tmp/tramp.wlcRNL: No such file or directory
> diff: /home/joerg/local-file: No such file or directory
> ```
Thanks for the report. There is also bug#6850 about the same topic, I've
merged both.
> This change solves the problem:
>
> ```diff
> diff --git lisp/vc/emerge.el lisp/vc/emerge.el
> index ca48f2f3c7b..562041e4232 100644
> --- lisp/vc/emerge.el
> +++ lisp/vc/emerge.el
> @@ -581,6 +581,7 @@ emerge-make-diff-list
> (setq emerge-diff-buffer (get-buffer-create "*emerge-diff*"))
> (with-current-buffer
> emerge-diff-buffer
> + (setq default-directory (file-name-directory file-A))
> (erase-buffer)
> (shell-command
> (format "%s %s %s %s"
> ```
Unfortunately, nobody felt comfortable to work on this over the
years. I'll take the stab, and check your patch next days. So we should
fix this after so many years.
> Regards J=C3=B6rg
Thanks for the heads-up, and best regards, Michael.
X-Loop: help-debbugs@HIDDEN
Subject: bug#74352: 29.4; emerge-files with tramp + local file fails
Resent-From: =?UTF-8?Q?J=C3=B6rg?= Sommer <joerg@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Thu, 14 Nov 2024 17:30:03 +0000
Resent-Message-ID: <handler.74352.B74352.17316053977917 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 74352
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: confirmed
To: Eli Zaretskii <eliz@HIDDEN>
Cc: 74352 <at> debbugs.gnu.org
Received: via spool by 74352-submit <at> debbugs.gnu.org id=B74352.17316053977917
(code B ref 74352); Thu, 14 Nov 2024 17:30:03 +0000
Received: (at 74352) by debbugs.gnu.org; 14 Nov 2024 17:29:57 +0000
Received: from localhost ([127.0.0.1]:47034 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tBdfJ-00023d-3B
for submit <at> debbugs.gnu.org; Thu, 14 Nov 2024 12:29:57 -0500
Received: from s1.jo-so.de ([37.221.195.157]:55731)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <joerg@HIDDEN>) id 1tBdfF-00023R-9a
for 74352 <at> debbugs.gnu.org; Thu, 14 Nov 2024 12:29:56 -0500
Received: from mail-relay (helo=jo-so.de)
by s1.jo-so.de with local-bsmtp (Exim 4.96)
(envelope-from <joerg@HIDDEN>) id 1tBdd5-001ZsY-2d;
Thu, 14 Nov 2024 18:27:39 +0100
Received: from joerg by zenbook.jo-so.de with local (Exim 4.98)
(envelope-from <joerg@HIDDEN>) id 1tBdd5-000000008mG-0IUP;
Thu, 14 Nov 2024 18:27:39 +0100
Date: Thu, 14 Nov 2024 18:27:39 +0100
From: =?UTF-8?Q?J=C3=B6rg?= Sommer <joerg@HIDDEN>
Message-ID: <b6bs5sbw6otuldskgoekzdteo5ppdtily44zh5hnm53sifen5c@xy6vzxhrqq27>
References: <w5zz6k6sizr36ypz4i74w2ynuujtda3oxkkhsykmllycgb4nkq@crohp7hnsmhb>
<86frnul2hf.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
protocol="application/pgp-signature"; boundary="rh23bxie22l3bwfq"
Content-Disposition: inline
In-Reply-To: <86frnul2hf.fsf@HIDDEN>
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--rh23bxie22l3bwfq
Content-Type: text/plain; protected-headers=v1; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Subject: Re: bug#74352: 29.4; emerge-files with tramp + local file fails
MIME-Version: 1.0
Eli Zaretskii schrieb am Do 14. Nov, 09:05 (+0200):
> > Date: Wed, 13 Nov 2024 20:11:10 +0100
> > From: J=F6rg Sommer <joerg@HIDDEN>
> >=20
> > when running `emerge-files` with `/ssh:remote:file` and `~/local-file` =
I get
> > the buffer `*emerge-diff-errors*` with:
> >=20
> > ```
> > diff: /tmp/tramp.wlcRNL: No such file or directory
> > diff: /home/joerg/local-file: No such file or directory
> > ```
> >=20
> > This change solves the problem:
> >=20
> > ```diff
> > diff --git lisp/vc/emerge.el lisp/vc/emerge.el
> > index ca48f2f3c7b..562041e4232 100644
> > --- lisp/vc/emerge.el
> > +++ lisp/vc/emerge.el
> > @@ -581,6 +581,7 @@ emerge-make-diff-list
> > (setq emerge-diff-buffer (get-buffer-create "*emerge-diff*"))
> > (with-current-buffer
> > emerge-diff-buffer
> > + (setq default-directory (file-name-directory file-A))
>=20
> Thanks, but why file-A? Isn't the problem symmetric wrt the two
> files? Or what am I missing?
In *emerge-setup* above is this code:
```
;; create the merge buffer from buffer A, so it inherits buffer A's
;; default directory, etc.
(merge-buffer (with-current-buffer
buffer-A
(get-buffer-create merge-buffer-name))))
```
But I think it doesn't matter if A or B. The problem is that
emerge-diff-buffer has the remote directory and shell command tries to
execute the command on the remote side even through file-A and file-B were
copied to local side in *emerge-files-internal*.
Kind regards, J=F6rg
--=20
Die am Lautesten reden, haben stets am wenigsten zu sagen.
--rh23bxie22l3bwfq
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iHUEABEIAB0WIQS1pYxd0T/67YejVyF9LJoj0a6jdQUCZzYzAwAKCRB9LJoj0a6j
dZThAQCOQy4ACfLi6+z36kqt9rkXh3VoSPazwxK4XdJv8DITVwD8DlLnT8AAZB30
rLstRVzUPBNf2tTDW7gikI4zrJECdYU=
=j5lr
-----END PGP SIGNATURE-----
--rh23bxie22l3bwfq--
X-Loop: help-debbugs@HIDDEN
Subject: bug#74352: 29.4; emerge-files with tramp + local file fails
Resent-From: Michael Albinus <michael.albinus@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sat, 16 Nov 2024 12:22:02 +0000
Resent-Message-ID: <handler.74352.B74352.173175970931119 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 74352
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: confirmed
To: =?UTF-8?Q?J=C3=B6rg?= Sommer <joerg@HIDDEN>
Cc: 74352 <at> debbugs.gnu.org
Received: via spool by 74352-submit <at> debbugs.gnu.org id=B74352.173175970931119
(code B ref 74352); Sat, 16 Nov 2024 12:22:02 +0000
Received: (at 74352) by debbugs.gnu.org; 16 Nov 2024 12:21:49 +0000
Received: from localhost ([127.0.0.1]:52362 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tCHoD-00085q-63
for submit <at> debbugs.gnu.org; Sat, 16 Nov 2024 07:21:49 -0500
Received: from mout.gmx.net ([212.227.17.21]:42309)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <michael.albinus@HIDDEN>) id 1tCHoA-00085b-MH
for 74352 <at> debbugs.gnu.org; Sat, 16 Nov 2024 07:21:47 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.de;
s=s31663417; t=1731759695; x=1732364495; i=michael.albinus@HIDDEN;
bh=8D/6xAgaaSjgFp6lnwRCEDSJoNDP9bHW2p7G7vBI6d8=;
h=X-UI-Sender-Class:From:To:Cc:Subject:In-Reply-To:References:Date:
Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:cc:
content-transfer-encoding:content-type:date:from:message-id:
mime-version:reply-to:subject:to;
b=CcizkOHPcqnJ5WVG/HzAq0ePj0NMrb+khmxAGliEhEPimxoC9ngrRfHqi7bLAAX9
9v2c/Dtmy5Nb2LtxXXWHZ3E7ZSaoFXkSN6vbQgv/JIKh98vdNo7cw2qvUUYndGNHn
kR4S0gXrtqwIvd+fsxUmWq87zzgbLjYGmpWtaDTaExD3b8lebR4oaynsbeZZnEbex
g7G6BiOtAouHegGMhue4G8yXaidheVY/mDr/eE0uTcsz67yFlxFyNhaTRETW1lnnk
kEjB/S1NUFtSyiB+VQ5Ylzq/L91igiht1wCZaczlEhrCLXLpcdmm1os9Mvdq2z8Fz
AbZV06OXb230iVFUww==
X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a
Received: from gandalf.gmx.de ([185.89.38.155]) by mail.gmx.net (mrgmx105
[212.227.17.168]) with ESMTPSA (Nemesis) id 1Mn2WF-1teV9k146h-00ihi4; Sat, 16
Nov 2024 13:21:35 +0100
From: Michael Albinus <michael.albinus@HIDDEN>
In-Reply-To: <w5zz6k6sizr36ypz4i74w2ynuujtda3oxkkhsykmllycgb4nkq@crohp7hnsmhb>
("=?UTF-8?Q?J=C3=B6rg?= Sommer"'s message of "Wed, 13 Nov 2024 20:11:10
+0100")
References: <w5zz6k6sizr36ypz4i74w2ynuujtda3oxkkhsykmllycgb4nkq@crohp7hnsmhb>
Date: Sat, 16 Nov 2024 13:21:32 +0100
Message-ID: <87ttc78j3n.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:WjeZYz8cFDhMVAHa93OHvfDhuXYUT+JSDZLtdS3WEmViE2TK7RQ
48Tw72R9YgBQj7q80E2wpe9Fvutm/8zsqplyJ0FiTKFZYzy4UFsjC0Xc0pqYSawnQOXINfz
dJ+1kMQ+zmb/4/aUWpdMS2eUo+6sK8+zosJmZp9FOSRrud7hakupRi9G0OYPIiof1t0vrHq
NHKJRJ31HvUg7dOw58VZg==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:i+uNplsghqc=;b2Z1Y/XGnANDlhtdZ1RjRe20p8u
wDRvWYAtE8bE1d9m5e1IEAdFMSUA0mden1QkNlpyOkR0KPd0FAH38/PSHDWh5/KlNxBfmdbcc
10wdrVXK0tY9ElOYSDi9UcECHaxinpqQq5TBtaraSOtjTePd3Xgd8BpaZek4+TKW9OVrueopz
kWR9QR8vgI3sPfHBFnAlBLNcDI57epUjr10K+3XVXTqRC6UClireIdW8FRwmptYse+Yywzqcq
TxBTKGXwrGLYGd1xZvuMbfVMo77Od3hFNGM1Xo9LrAxMlMYy0ujGG7/irtJrTWTx6HTkSv9fW
9AGSJ4RKYea+1556iwES2n4rk0Vc89kQLNyccMtazGogv8hjFaale4dKbvG52sxQd9Q3qdnag
REC5hEkOCdJ8mLxpXtWbVsFWfSJy+mp7yTqZm2NIh+Q9pkU0AimxrHgIIp8WXQK1EEtKm87kT
wU1PXIbtpZSLwrcbxVsCChLaFSi0Rv+OEdTHR4DmZWMdAJmHOr4cH5FHoGzlDvyA4wALVR4yJ
uyrjEneAu3av+fcpeNrdJqR9rwpo35LQNNyAljEjKTqQSdnv1ZW7iQoAuUsWbo6++xZ9eGoSB
gMTCGJtMe3Epm5ImtZDdxW47MOpWJInYGHL3FTiVo2L+242YA7Ndkvaa7/MwBedIzSak2rmHJ
wArfjbCfHHl3TDVlwxRbsEY6jp+Qeh4qdJEDS8L+QgAIjJNtYysBeUiR3vwREh74p77hY2Vb4
bXD6xSEMcQrtXc+AU1ZoFwmgB5NW29APO+RM0yGJN9mI2gEc6y/3d5NXlfXQtQWdDXuX+WwKg
1+xi36/ebFpsFoYbCg3LKkP9JzAlVZxYWAghpxOOROnV9fMKZHwG/b8R9jecYEzm8rMbsnvF4
46LBRTow7SbHpk6iNbE/hH0q4t+V5K2O9QIdPSQN/peTRdg1qBRJKT1Vc
X-Spam-Score: -1.4 (-)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.4 (--)
J=C3=B6rg Sommer <joerg@HIDDEN> writes:
> Hi,
Hi J=C3=B6rg,
> when running `emerge-files` with `/ssh:remote:file` and `~/local-file` I =
get
> the buffer `*emerge-diff-errors*` with:
>
> ```
> diff: /tmp/tramp.wlcRNL: No such file or directory
> diff: /home/joerg/local-file: No such file or directory
> ```
I can reproduce the problem if file-A is remote, and file-B is
local. Also, if both file-A and file-B are remote.
If both files are local, or file-A is local and file-B is remote, emerge
works as exptected.
The crucial point seems to be that file-A is a remote one.
> This change solves the problem:
>
> ```diff
> diff --git lisp/vc/emerge.el lisp/vc/emerge.el
> index ca48f2f3c7b..562041e4232 100644
> --- lisp/vc/emerge.el
> +++ lisp/vc/emerge.el
> @@ -581,6 +581,7 @@ emerge-make-diff-list
> (setq emerge-diff-buffer (get-buffer-create "*emerge-diff*"))
> (with-current-buffer
> emerge-diff-buffer
> + (setq default-directory (file-name-directory file-A))
> (erase-buffer)
> (shell-command
> (format "%s %s %s %s"
> ```
The point is, that emerge calls the 'diff' program for either the file
itself (if local), or a local copy of the file (if remote). A consistent
solution is therefore to set a local default directory, like
--8<---------------cut here---------------start------------->8---
(setq default-directory temporary-file-directory)
--8<---------------cut here---------------end--------------->8---
instead of your change. Would you like to check?
However, this won't be a complete solution. There are other places in
emerge.el, where the temporary buffer for calling 'diff' must have a
local default directory. I'm not an emerge aficionado (haven't used it
until now). Would you like to produce a complete patch, based on my
proposal above?
> Regards J=C3=B6rg
Best regards, Michael.
X-Loop: help-debbugs@HIDDEN
Subject: bug#74352: 29.4; emerge-files with tramp + local file fails
Resent-From: =?UTF-8?Q?J=C3=B6rg?= Sommer <joerg@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 17 Nov 2024 10:14:01 +0000
Resent-Message-ID: <handler.74352.B74352.17318383825401 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 74352
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: confirmed
To: Michael Albinus <michael.albinus@HIDDEN>
Cc: 74352 <at> debbugs.gnu.org
Received: via spool by 74352-submit <at> debbugs.gnu.org id=B74352.17318383825401
(code B ref 74352); Sun, 17 Nov 2024 10:14:01 +0000
Received: (at 74352) by debbugs.gnu.org; 17 Nov 2024 10:13:02 +0000
Received: from localhost ([127.0.0.1]:55978 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tCcH8-0001Ou-3Z
for submit <at> debbugs.gnu.org; Sun, 17 Nov 2024 05:13:02 -0500
Received: from s1.jo-so.de ([37.221.195.157]:45393)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <joerg@HIDDEN>) id 1tCcH6-0001Og-5L
for 74352 <at> debbugs.gnu.org; Sun, 17 Nov 2024 05:13:00 -0500
Received: from mail-relay (helo=jo-so.de)
by s1.jo-so.de with local-bsmtp (Exim 4.96)
(envelope-from <joerg@HIDDEN>) id 1tCcEx-002HOO-2m;
Sun, 17 Nov 2024 11:10:47 +0100
Received: from joerg by zenbook.jo-so.de with local (Exim 4.98)
(envelope-from <joerg@HIDDEN>) id 1tCcEx-00000000kLF-17da;
Sun, 17 Nov 2024 11:10:47 +0100
Date: Sun, 17 Nov 2024 11:10:47 +0100
From: =?UTF-8?Q?J=C3=B6rg?= Sommer <joerg@HIDDEN>
Message-ID: <h4pm6g47qm5435uptyqtwqdioka6qi4xoc6464nseydnekbpkq@p7djkog4dar7>
OpenPGP: id=7D2C9A23D1AEA375; url=https://jo-so.de/pgp-key.txt;
preference=signencrypt
References: <w5zz6k6sizr36ypz4i74w2ynuujtda3oxkkhsykmllycgb4nkq@crohp7hnsmhb>
<87ttc78j3n.fsf@HIDDEN>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
protocol="application/pgp-signature"; boundary="mvj6c54xtf7etlmq"
Content-Disposition: inline
In-Reply-To: <87ttc78j3n.fsf@HIDDEN>
X-Spam-Score: 0.0 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.0 (-)
--mvj6c54xtf7etlmq
Content-Type: text/plain; protected-headers=v1; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
Subject: Re: bug#74352: 29.4; emerge-files with tramp + local file fails
MIME-Version: 1.0
Michael Albinus schrieb am Sa 16. Nov, 13:21 (+0100):
> J=F6rg Sommer <joerg@HIDDEN> writes:
> > This change solves the problem:
> >
> > ```diff
> > diff --git lisp/vc/emerge.el lisp/vc/emerge.el
> > index ca48f2f3c7b..562041e4232 100644
> > --- lisp/vc/emerge.el
> > +++ lisp/vc/emerge.el
> > @@ -581,6 +581,7 @@ emerge-make-diff-list
> > (setq emerge-diff-buffer (get-buffer-create "*emerge-diff*"))
> > (with-current-buffer
> > emerge-diff-buffer
> > + (setq default-directory (file-name-directory file-A))
> > (erase-buffer)
> > (shell-command
> > (format "%s %s %s %s"
> > ```
>=20
> The point is, that emerge calls the 'diff' program for either the file
> itself (if local), or a local copy of the file (if remote). A consistent
> solution is therefore to set a local default directory, like
>=20
> --8<---------------cut here---------------start------------->8---
> (setq default-directory temporary-file-directory)
> --8<---------------cut here---------------end--------------->8---
>=20
> instead of your change. Would you like to check?
This works.
But in the context of *emerge-make-diff-list* it is not very apparent why
*temporary-file-directory* is used. Maybe a comment should say that
*emerge-files-internal* copied the files there by *file-local-copy*.
> However, this won't be a complete solution. There are other places in
> emerge.el, where the temporary buffer for calling 'diff' must have a
> local default directory.
Are you sure? I see only one usage of emerge-diff-program in emerge.el.
> I'm not an emerge aficionado
Out of curiosity: Is there a better tool?
--=20
"The future is here. It's just not widely distributed yet."
(William Gibson)
--mvj6c54xtf7etlmq
Content-Type: application/pgp-signature; name="signature.asc"
-----BEGIN PGP SIGNATURE-----
iHUEABEIAB0WIQS1pYxd0T/67YejVyF9LJoj0a6jdQUCZznBIgAKCRB9LJoj0a6j
de4VAQCYqJbV6E+2Lipx+Piq+O1Q6Ov3p90PyA2GcN9QpvoYtQD+P+cRrqrZU89Z
cY++KwKxwhBN5Mp550dpbpBs7ZTQPEY=
=CaM1
-----END PGP SIGNATURE-----
--mvj6c54xtf7etlmq--
X-Loop: help-debbugs@HIDDEN
Subject: bug#74352: 29.4; emerge-files with tramp + local file fails
Resent-From: Michael Albinus <michael.albinus@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Sun, 17 Nov 2024 10:33:02 +0000
Resent-Message-ID: <handler.74352.B74352.17318395378840 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 74352
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: confirmed
To: =?UTF-8?Q?J=C3=B6rg?= Sommer <joerg@HIDDEN>
Cc: 74352 <at> debbugs.gnu.org
Received: via spool by 74352-submit <at> debbugs.gnu.org id=B74352.17318395378840
(code B ref 74352); Sun, 17 Nov 2024 10:33:02 +0000
Received: (at 74352) by debbugs.gnu.org; 17 Nov 2024 10:32:17 +0000
Received: from localhost ([127.0.0.1]:56006 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tCcZk-0002IV-P7
for submit <at> debbugs.gnu.org; Sun, 17 Nov 2024 05:32:17 -0500
Received: from mout.gmx.net ([212.227.17.22]:58109)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <michael.albinus@HIDDEN>) id 1tCcZi-0002II-PQ
for 74352 <at> debbugs.gnu.org; Sun, 17 Nov 2024 05:32:16 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.de;
s=s31663417; t=1731839521; x=1732444321; i=michael.albinus@HIDDEN;
bh=j+3yz98/rdZro7Vsw6DpQCa/Jfh3WVssUftakF7vWR4=;
h=X-UI-Sender-Class:From:To:Cc:Subject:In-Reply-To:References:Date:
Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:cc:
content-transfer-encoding:content-type:date:from:message-id:
mime-version:reply-to:subject:to;
b=Kc4XgHeYwcdvBup4FJV3y9Qbd+oMzDMyESMEvslLaEHKUXLNKHAy/8ryZM7Gjl03
tUxsCUhyKlXwBBTARfOmzlL39QPnwfjVjRhFqp2U90C684Gsi8N+UMpfZHPFskgoh
yt8Rc25YuQaOyHFS8zzjPDHFE5YS1P7dp5JEAMqrlfqz9FBhkM5ovoNu7bjQjoYnX
qqoW1YilA7CKVuHCLxH5spmNmdbNr89PigTfyaLp/+qA/PjE9+xtO/kT7p4P/Bs9V
282XaAQDT23GAhWyMeCqY6+m41yAuvyzTsMU/UsUjwb2RrGYQNer/rdJcmmnJtMg+
4UIqpJxZAvZVguLGlQ==
X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a
Received: from gandalf.gmx.de ([185.89.38.155]) by mail.gmx.net (mrgmx105
[212.227.17.168]) with ESMTPSA (Nemesis) id 1M3lYB-1tCtYQ0hgh-001i5Y; Sun, 17
Nov 2024 11:32:01 +0100
From: Michael Albinus <michael.albinus@HIDDEN>
In-Reply-To: <h4pm6g47qm5435uptyqtwqdioka6qi4xoc6464nseydnekbpkq@p7djkog4dar7>
("=?UTF-8?Q?J=C3=B6rg?= Sommer"'s message of "Sun, 17 Nov 2024 11:10:47
+0100")
References: <w5zz6k6sizr36ypz4i74w2ynuujtda3oxkkhsykmllycgb4nkq@crohp7hnsmhb>
<87ttc78j3n.fsf@HIDDEN>
<h4pm6g47qm5435uptyqtwqdioka6qi4xoc6464nseydnekbpkq@p7djkog4dar7>
Date: Sun, 17 Nov 2024 11:32:00 +0100
Message-ID: <87h686882n.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: quoted-printable
X-Provags-ID: V03:K1:SYtZULA08FAIBX+DXBHu455dBAilJexqwG1SbLyqtF7w+JoTuVJ
OsaFvntv0m6HspkNmVO6+gvZV+ATG88RMXbMCKF7R3+xCz8PceAtoRKT7EwjQ6H4T0QrySi
0qM8XlbtPaEn7yiAqczIvo3hwqOKS6mxwMI+XE/3AbESUIkioeyu9L7orDS/99enDAUq6TD
V3+J6PyAOebdTlkQ8vjfA==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:3URKj3Q1XuQ=;1lV/ESDxhNIxD/d5U1hkThGqsSV
a3F5vESrjBtVE/TB4iJAbtBcXmjlszcmKUFJulZfOhWIlPfcwp28H0nZeab9jmV/K3Ct2ZZw0
mc5nsnnzax5wfmjnVdFpMx1kNnsJTfNY6QlFdZV8tGK/3tWV+/UobQ4dYoH8IETAOv0ejPi5+
lJsbVaLmqV3lFiN0+v/jQTkzFfgH/7CmZallm6h0KTLn1c/mz0HOyNpRelA/OzHAptYPXQ+1u
36CpeN9w8C6u8aGmYIXntx2wWww7qmZ8lgQvY8ADwgGykedBmCm1axIMYvR8bN13YfhqfAq0v
esP6ThtZPYQlz+BRiaeLKDYqRUFs+aqVhXZh6g2JV2RK8qvvryr+2DkBZSw6I7MejYa1AMrLe
IEI41uabfMzdGqcvZZyfy7oaYUMGXnWNL/zGShZdRvLDU1d9uLo/jPTMzBqvs332um24QcY2r
ZEXNBdSiqmxJr0q9hlb9JKWbFc5orGT2RfVJIBw1CgzIopykr8I9xZwfw5wtufTjUNqa6Qkm6
mIIH7iscU/M5LeHhfDlITSlPaahl5I1EmuMhA6qiIlfOLW16R3eEeT1n1VVToDOUx6p+eu284
DB09jJ5PY3YkH0k1k+fZSqoV1IH+eL69Ux/rGryjoPX8IAsNuK9U8DeUZwTVeI+YGX59FZEiq
OnV92IOJPbou5OhntvCmmn4I8nCU1DP6DwUgHhZEC5YYNiT0tGMqImN3qwAcL9VioGKFNXzdu
EwTU7lkADFRZXK4QeE6DCOM7eCpzKo+b57X71P4fSot3B14YTRz7rHN8psDtgB9QK5BkCzcae
CjiPJRD5ikDDhSjYC6eO8Kbo+LYys482E+aA0dt6JPCX8SD485YMDGiYqL+75NcgCB6JzkHvx
4LcQWtMwEtLuAVfh9cYtFMT3bo21KZX1UYW1FDV5OFloB3iwy3ibQy5Ua
X-Spam-Score: -1.4 (-)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -2.4 (--)
J=C3=B6rg Sommer <joerg@HIDDEN> writes:
Hi Joerg,
>> The point is, that emerge calls the 'diff' program for either the file
>> itself (if local), or a local copy of the file (if remote). A consistent
>> solution is therefore to set a local default directory, like
>>=20
>> --8<---------------cut here---------------start------------->8---
>> (setq default-directory temporary-file-directory)
>> --8<---------------cut here---------------end--------------->8---
>>=20
>> instead of your change. Would you like to check?
>
> This works.
>
> But in the context of *emerge-make-diff-list* it is not very apparent why
> *temporary-file-directory* is used. Maybe a comment should say that
> *emerge-files-internal* copied the files there by *file-local-copy*.
Sure, it doesn't hurt :-)
My patch is rather a proof of concept. It could be improved in all directio=
ns.
>> However, this won't be a complete solution. There are other places in
>> emerge.el, where the temporary buffer for calling 'diff' must have a
>> local default directory.
>
> Are you sure? I see only one usage of emerge-diff-program in emerge.el.
There is also emerge-diff3-program, used in emerge-make-diff3-list.
And there are also emerge-rcs-ci-program and emerge-rcs-co-program, used
at different places. But I don't know whether they need special care.
>> I'm not an emerge aficionado
>
> Out of curiosity: Is there a better tool?
ediff-files, ediff-directories and ediff-revision. Because I use them
all days, I've rebound some keys in my .emacs:
--8<---------------cut here---------------start------------->8---
(require 'dired)
(define-key dired-mode-map "=3D" 'ediff-files)
(define-key dired-mode-map "\M-=3D" 'ediff-directories)
(require 'vc)
(define-key vc-prefix-map "=3D" 'ediff-revision)
(setq ediff-diff-options "-a")
(add-hook 'vc-dir-mode-hook
(lambda () (define-key vc-dir-mode-map "=3D" 'ediff-revision)))
--8<---------------cut here---------------end--------------->8---
Best regards, Michael.
X-Loop: help-debbugs@HIDDEN
Subject: bug#74352: 29.4; emerge-files with tramp + local file fails
Resent-From: Michael Albinus <michael.albinus@HIDDEN>
Original-Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
Resent-CC: bug-gnu-emacs@HIDDEN
Resent-Date: Fri, 10 Jan 2025 08:15:02 +0000
Resent-Message-ID: <handler.74352.B74352.173649685713941 <at> debbugs.gnu.org>
Resent-Sender: help-debbugs@HIDDEN
X-GNU-PR-Message: followup 74352
X-GNU-PR-Package: emacs
X-GNU-PR-Keywords: confirmed
To: =?UTF-8?Q?J=C3=B6rg?= Sommer <joerg@HIDDEN>
Cc: 74352 <at> debbugs.gnu.org
Received: via spool by 74352-submit <at> debbugs.gnu.org id=B74352.173649685713941
(code B ref 74352); Fri, 10 Jan 2025 08:15:02 +0000
Received: (at 74352) by debbugs.gnu.org; 10 Jan 2025 08:14:17 +0000
Received: from localhost ([127.0.0.1]:56317 helo=debbugs.gnu.org)
by debbugs.gnu.org with esmtp (Exim 4.84_2)
(envelope-from <debbugs-submit-bounces <at> debbugs.gnu.org>)
id 1tWA9o-0003cm-Kc
for submit <at> debbugs.gnu.org; Fri, 10 Jan 2025 03:14:16 -0500
Received: from mout.gmx.net ([212.227.17.21]:37615)
by debbugs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.84_2) (envelope-from <michael.albinus@HIDDEN>)
id 1tWA9m-0003cV-1D
for 74352 <at> debbugs.gnu.org; Fri, 10 Jan 2025 03:14:14 -0500
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.de;
s=s31663417; t=1736496845; x=1737101645; i=michael.albinus@HIDDEN;
bh=KBp+FgI+9AqRQUFnbEJNzySfCl7EDmEdsHL1RL8ne6w=;
h=X-UI-Sender-Class:From:To:Cc:Subject:In-Reply-To:References:Date:
Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:cc:
content-transfer-encoding:content-type:date:from:message-id:
mime-version:reply-to:subject:to;
b=YmtlcNn3tuBkTlz/2ppH2rtXh3bRBnT8tc9YXNIcabAXYspGvm3tubpWcmQFf9T1
TR3piJyGGv7mCKHjWW0xrqpYE0clhpxyAHPVNy2Azq26Nl8maP4qDYorphv5mT8gC
NCeVO5MQWlWljw5XAbOskQ4B3R4CWFeY/I0zT0YPyl5H9UgI6gV3uuz3xeKeMgzep
lmlKKxh2EcwanqQZ6Se5bZa7KdL6wXNXm3y+gEoMFO32iS4OSqbIkmq4EPPNesq80
9o0aOKh2+wC31VK+VJ6H4eau27MXKB7g1LjutJHSPFXt/VDbm0UZJhxJfmaG1TasQ
aCqA/Ctr4V2aNeV6jA==
X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a
Received: from gandalf.gmx.de ([185.89.38.155]) by mail.gmx.net (mrgmx104
[212.227.17.168]) with ESMTPSA (Nemesis) id 1Mwwdf-1tLluY0QlH-012gPL; Fri, 10
Jan 2025 09:14:05 +0100
From: Michael Albinus <michael.albinus@HIDDEN>
In-Reply-To: <87h686882n.fsf@HIDDEN> (Michael Albinus's message of "Sun, 17
Nov 2024 11:32:00 +0100")
References: <w5zz6k6sizr36ypz4i74w2ynuujtda3oxkkhsykmllycgb4nkq@crohp7hnsmhb>
<87ttc78j3n.fsf@HIDDEN>
<h4pm6g47qm5435uptyqtwqdioka6qi4xoc6464nseydnekbpkq@p7djkog4dar7>
<87h686882n.fsf@HIDDEN>
Date: Fri, 10 Jan 2025 09:14:03 +0100
Message-ID: <87jzb384s4.fsf@HIDDEN>
User-Agent: Gnus/5.13 (Gnus v5.13)
MIME-Version: 1.0
Content-Type: text/plain
X-Provags-ID: V03:K1:NajscvPSY9G/wCCbx/2CETiILrHZg4O7IMCg5FsQj8SAl3twvHs
bM817FqMldSNmkQ0B9REpHRwFVDyA9meH6ltr5I1sa/Giw4v/xu6ZuE3wzk74+aAgFg2pLH
w3yLx9xsFRB72UdXBe1AB699v68BvWzd17gmV6F6DFNM4F0ZntkzfxlLkFwQ4yEo+d5XDVa
l1sMzOKyHBDiHGZtv0h9g==
X-Spam-Flag: NO
UI-OutboundReport: notjunk:1;M01:P0:kuIqJYbGcX4=;M5MAltBIrRHcRA8PtHC7jIs4oHJ
Nm1kEcaRsroclZozbgNicLERX719u3omTfYgrsVr4sEAf+51IBvUpB6Z41PdL/wYh79JyVfzq
QCwalHqwD9Y/8T7U+LxF917HB9KRwkhVp84boX4bu+IfXMKLm+XDYyVRzLCYfGAjQjsOonJeP
daAotK+wrkJKlEJxQkB7gmphgq9V8nmQTRak2G4kVAVpAWRMy+YlnuGA5lyY4U8coWJKhzuTM
nbg0jNgOzOQQXLbd1ESw4NUCml8dcXjKQ1wUOLJu+XaET+O98x9z8+GYM4BV9OZwDxu4o4Bgw
sFRvVdm9aJBgwOUYILBUBgYmJ3XiEhPGZJY9an6B3K9i3v/IXEfxIWQOrI/VHm2FgG1KYDMC7
5/qU7Taq45jCm5XNp1s1izdBXqSg5e1uYLRc9/4eDverXRfM2DvgrmIVz27pIjBPA3QiEycDG
bxBsXJSxM1a27ttfgpCUbvHFUHJejvZ9GLAuI09opw6x0cqbOi/4vd66j3azxZoMszbzbIya8
T+WaNVONdQ3B5XbiGQ26k3bqX6HqSBQsYHhrUeDu/VvBPRqsnSWNxcgbvEayxYyUm7+EJub2q
TNlSHlG/vW4R6mWeVhtOeZbINMi5BEYuyEOTQNIxuubeSr6XEVUhCzBW4UJi1FqiKaEqLrzMX
DrTUyKt+c9zQ3wtpNYemO6fWe6918Lfmu9U7/CcO1e22Dqi8kwBnauIqFoHLgYvrDqtPuomqE
9Wjp4ztSfs+Fq6RiFoC6foTdt/IPA4wpp6YoLT1aQhLp+jBjcTTh/Sv9QD1NrYx23Lpie1ETw
icNvr9Y7NFadzaBbhMCN6YYeMiDWuqaAkfRTScywXTCRJ+/QOC4fBZ+LxCGUDzRjwKX0WIzr8
4HVIVp9BDc0OMDALa64HxkcJlEWMMEf+eZTq1mrZuxjk2AfxbU2gdpGPGWFHrhglYdC9qb1eG
G/No4c5MpFcflyfvWTRQ92kNW32OsMF0k7OcCb8iOxWEpVnLuWRy/EpFTn12dLmfnYcgt3EBM
gLqiEjJYqtr3Z2BrSFpG7pfMBL89CCXoXddLRcWcGLQkfuPbcPBcqKLyEk6QAjfVxyiDMhJaS
bD9pHT63X2f9+7ES1bm5yzFYHgbfUv
Content-Transfer-Encoding: quoted-printable
X-Spam-Score: -0.7 (/)
X-BeenThere: debbugs-submit <at> debbugs.gnu.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: <debbugs-submit.debbugs.gnu.org>
List-Unsubscribe: <https://debbugs.gnu.org/cgi-bin/mailman/options/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=unsubscribe>
List-Archive: <https://debbugs.gnu.org/cgi-bin/mailman/private/debbugs-submit/>
List-Post: <mailto:debbugs-submit <at> debbugs.gnu.org>
List-Help: <mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=help>
List-Subscribe: <https://debbugs.gnu.org/cgi-bin/mailman/listinfo/debbugs-submit>,
<mailto:debbugs-submit-request <at> debbugs.gnu.org?subject=subscribe>
Errors-To: debbugs-submit-bounces <at> debbugs.gnu.org
Sender: "Debbugs-submit" <debbugs-submit-bounces <at> debbugs.gnu.org>
X-Spam-Score: -1.7 (-)
Michael Albinus <michael.albinus@HIDDEN> writes:
Hi Joerg,
>>> The point is, that emerge calls the 'diff' program for either the file
>>> itself (if local), or a local copy of the file (if remote). A consiste=
nt
>>> solution is therefore to set a local default directory, like
>>>
>>> --8<---------------cut here---------------start------------->8---
>>> (setq default-directory temporary-file-directory)
>>> --8<---------------cut here---------------end--------------->8---
>>>
>>> instead of your change. Would you like to check?
>>
>> This works.
>>
>> But in the context of *emerge-make-diff-list* it is not very apparent w=
hy
>> *temporary-file-directory* is used. Maybe a comment should say that
>> *emerge-files-internal* copied the files there by *file-local-copy*.
>
> Sure, it doesn't hurt :-)
>
> My patch is rather a proof of concept. It could be improved in all direc=
tions.
>
>>> However, this won't be a complete solution. There are other places in
>>> emerge.el, where the temporary buffer for calling 'diff' must have a
>>> local default directory.
>>
>> Are you sure? I see only one usage of emerge-diff-program in emerge.el.
>
> There is also emerge-diff3-program, used in emerge-make-diff3-list.
>
> And there are also emerge-rcs-ci-program and emerge-rcs-co-program, used
> at different places. But I don't know whether they need special care.
I lost control. Are you still working on a patch?
Best regards, Michael.
GNU bug tracking system
Copyright (C) 1999 Darren O. Benham,
1997 nCipher Corporation Ltd,
1994-97 Ian Jackson.