mirror/emacs
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/emacs.git synced 2024-12-23 10:34:07 +00:00
Code Issues Releases Activity

(diff-apply-hunk-to-backup-file): New var.

Browse Source 
(diff-apply-hunk): Use it to ask for confirmation.
This commit is contained in:
Stefan Monnier 2006-09-11 18:11:19 +00:00
parent f489fc2519
commit cb9a30c8e1
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lisp/ChangeLog
View File

@ -1,3 +1,8 @@
2006-09-11 Stefan Monnier <monnier@iro.umontreal.ca>
* diff-mode.el (diff-apply-hunk-to-backup-file): New var.
(diff-apply-hunk): Use it to ask for confirmation.
2006-09-11 Reiner Steib <Reiner.Steib@gmx.de>
* emacs-lisp/cl.el (pushnew): Add missing `,'.

12
lisp/diff-mode.el
View File

@ -1259,6 +1259,7 @@ SWITCHED is non-nil if the patch is already applied."
(t "Hunk %s at offset %d lines"))
msg line-offset)))
(defvar diff-apply-hunk-to-backup-file nil)
(defun diff-apply-hunk (&optional reverse)
"Apply the current hunk to the source file and go to the next.
@ -1275,6 +1276,17 @@ With a prefix argument, REVERSE the hunk."
(cond
((null line-offset)
(error "Can't find the text to patch"))
((with-current-buffer buf
(and buffer-file-name
(backup-file-name-p buffer-file-name)
(not diff-apply-hunk-to-backup-file)
(not (set (make-local-variable 'diff-apply-hunk-to-backup-file)
(yes-or-no-p (format "Really apply this hunk to %s? "
(file-name-nondirectory
buffer-file-name)))))))
(error (substitute-command-keys
(format "Use %s\\[diff-apply-hunk] to apply it to the other file"
(if (not reverse) "\\[universal-argument] ")))))
((and switched
;; A reversed patch was detected, perhaps apply it in reverse.
(not (save-window-excursion