mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-05 22:20:24 -08:00
Code Issues Projects Releases Wiki Activity

; Rename a variable.

Browse source
This commit is contained in:
Eli Zaretskii 2025-11-28 08:45:02 +02:00
parent 9b4d9bb01e
commit a4c5e64b11
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lisp/misearch.el
View file

@ -406,7 +406,7 @@ modified buffer to be able to use unsaved changes."
(declare-function diff-setup-whitespace "diff-mode" ()) (declare-function diff-setup-whitespace "diff-mode" ())
(declare-function diff-setup-buffer-type "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 ;;;###autoload
(defun multi-file-replace-as-diff (files from-string replacements regexp-flag delimited-flag) (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 ;; Make sure any supported characters can be written to a
;; file without asking the user to select a safe ;; file without asking the user to select a safe
;; coding-system. ;; 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 non-file-buffer (setq file-name (buffer-name file-name)))
(when (or file-exists file-buffer) (when (or file-exists file-buffer)
(with-temp-buffer (with-temp-buffer
@ -548,7 +548,7 @@ specify labels to use for file names."
" "))) " ")))
(with-current-buffer buf (with-current-buffer buf
(let ((inhibit-read-only t) (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))) coding-system-for-read)))
(insert command "\n") (insert command "\n")
(call-process shell-file-name nil buf nil (call-process shell-file-name nil buf nil

4
lisp/vc/diff.el
View file

@ -118,7 +118,7 @@ Non-interactively, OLD and NEW may each be a file or a buffer."
(display-buffer (display-buffer
(diff-no-select old new switches no-async))) (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'.") "Used to pass buffer text encoding from `multi-file-diff-no-select'.")
(defun diff-file-local-copy (file-or-buf) (defun diff-file-local-copy (file-or-buf)
@ -128,7 +128,7 @@ temporary file with the buffer's contents."
(if (bufferp file-or-buf) (if (bufferp file-or-buf)
(with-current-buffer file-or-buf (with-current-buffer file-or-buf
(let ((tempfile (make-temp-file "buffer-content-")) (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))) coding-system-for-write)))
(if diff-entire-buffers (if diff-entire-buffers
(write-region nil nil tempfile nil 'nomessage) (write-region nil nil tempfile nil 'nomessage)