From a4c5e64b110edd344da270c521a9f485860acfcd Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Fri, 28 Nov 2025 08:45:02 +0200 Subject: [PATCH] ; Rename a variable. --- lisp/misearch.el | 6 +++--- lisp/vc/diff.el | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lisp/misearch.el b/lisp/misearch.el index 72e544ebf0e..4cf749da7ea 100644 --- a/lisp/misearch.el +++ b/lisp/misearch.el @@ -406,7 +406,7 @@ modified buffer to be able to use unsaved changes." (declare-function diff-setup-whitespace "diff-mode" ()) (declare-function diff-setup-buffer-type "diff-mode" ()) -(defvar coding-system--for-buffer-diff) ; from diff.el +(defvar diff--coding-system-for-buffer) ; from diff.el ;;;###autoload (defun multi-file-replace-as-diff (files from-string replacements regexp-flag delimited-flag) @@ -445,7 +445,7 @@ as in `perform-replace'." ;; Make sure any supported characters can be written to a ;; file without asking the user to select a safe ;; coding-system. - (coding-system--for-buffer-diff 'utf-8-emacs)) + (diff--coding-system-for-buffer 'utf-8-emacs)) (when non-file-buffer (setq file-name (buffer-name file-name))) (when (or file-exists file-buffer) (with-temp-buffer @@ -548,7 +548,7 @@ specify labels to use for file names." " "))) (with-current-buffer buf (let ((inhibit-read-only t) - (coding-system-for-read (or coding-system--for-buffer-diff + (coding-system-for-read (or diff--coding-system-for-buffer coding-system-for-read))) (insert command "\n") (call-process shell-file-name nil buf nil diff --git a/lisp/vc/diff.el b/lisp/vc/diff.el index e2148328ad9..d85b4487508 100644 --- a/lisp/vc/diff.el +++ b/lisp/vc/diff.el @@ -118,7 +118,7 @@ Non-interactively, OLD and NEW may each be a file or a buffer." (display-buffer (diff-no-select old new switches no-async))) -(defvar coding-system--for-buffer-diff nil +(defvar diff--coding-system-for-buffer nil "Used to pass buffer text encoding from `multi-file-diff-no-select'.") (defun diff-file-local-copy (file-or-buf) @@ -128,7 +128,7 @@ temporary file with the buffer's contents." (if (bufferp file-or-buf) (with-current-buffer file-or-buf (let ((tempfile (make-temp-file "buffer-content-")) - (coding-system-for-write (or coding-system--for-buffer-diff + (coding-system-for-write (or diff--coding-system-for-buffer coding-system-for-write))) (if diff-entire-buffers (write-region nil nil tempfile nil 'nomessage)