Changeset 4166 for trunk/lisp/diff-mode.el

Timestamp:

09/18/06 20:48:14 (2 years ago)

Author:

miyoshi

Message:

Sync up with Emacs CVS HEAD.

Files:

• trunk/lisp/diff-mode.el (modified) (2 diffs)

trunk/lisp/diff-mode.el

@@ -1260 +1260 @@
-             msg line-offset)))
-
+(defvar diff-apply-hunk-to-backup-file nil)
-
-(defun diff-apply-hunk (&optional reverse)
@@ -1276 +1277 @@
-     ((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.