procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Use a persistent directory as default directory in diff

Browse source 
* lisp/vc/diff.el (diff-no-select): Use `temporary-file-directory'
as default directory.  Set default file permissions temporarily to
#o600.  (Bug#69606)
This commit is contained in:
Michael Albinus 2025-02-21 14:47:15 +01:00
parent 840be8a7d8
commit ae439cc1b9
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
lisp/vc/diff.el
View file

@ -187,8 +187,7 @@ returns the buffer used."
(prin1-to-string new))))
(list (or old-alt old)
(or new-alt new)))))
" "))
(thisdir default-directory))
" ")))
(with-current-buffer buf
(setq buffer-read-only t)
(buffer-disable-undo (current-buffer))
@ -199,25 +198,26 @@ returns the buffer used."
(setq-local revert-buffer-function
(lambda (_ignore-auto _noconfirm)
(diff-no-select old new switches no-async (current-buffer))))
(setq default-directory thisdir)
(setq default-directory temporary-file-directory)
(setq diff-default-directory default-directory)
(let ((inhibit-read-only t))
(insert command "\n"))
(if (and (not no-async) (fboundp 'make-process))
(let ((proc (start-process "Diff" buf shell-file-name
shell-command-switch command)))
(set-process-filter proc #'diff-process-filter)
(set-process-sentinel
proc (lambda (proc _msg)
(with-current-buffer (process-buffer proc)
(diff-sentinel (process-exit-status proc)
old-alt new-alt)))))
;; Async processes aren't available.
(let ((inhibit-read-only t))
(diff-sentinel
(call-process shell-file-name nil buf nil
shell-command-switch command)
old-alt new-alt))))
(with-file-modes #o600
(if (and (not no-async) (fboundp 'make-process))
(let ((proc (start-process "Diff" buf shell-file-name
shell-command-switch command)))
(set-process-filter proc #'diff-process-filter)
(set-process-sentinel
proc (lambda (proc _msg)
(with-current-buffer (process-buffer proc)
(diff-sentinel (process-exit-status proc)
old-alt new-alt)))))
;; Async processes aren't available.
(let ((inhibit-read-only t))
(diff-sentinel
(call-process shell-file-name nil buf nil
shell-command-switch command)
old-alt new-alt)))))
buf))
(defun diff-process-filter (proc string)