diff options
| author | Kenichi Handa | 2010-05-28 15:45:43 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2010-05-28 15:45:43 +0900 |
| commit | 0ad1627dbeb2c525a78252de500cb92ac367d8e2 (patch) | |
| tree | 9f66c2446d818199288ec6424ecc88c51418bca7 /lisp/diff.el | |
| parent | 7d56b2ddfe092d1c25b6faf3f5688bb85fb46549 (diff) | |
| parent | 3d338b4613c47aecc773093f92cf48f279ed95d1 (diff) | |
| download | emacs-0ad1627dbeb2c525a78252de500cb92ac367d8e2.tar.gz emacs-0ad1627dbeb2c525a78252de500cb92ac367d8e2.zip | |
merge trunk
Diffstat (limited to 'lisp/diff.el')
| -rw-r--r-- | lisp/diff.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/diff.el b/lisp/diff.el index d7fc993ec33..0206c17e770 100644 --- a/lisp/diff.el +++ b/lisp/diff.el | |||
| @@ -64,8 +64,8 @@ | |||
| 64 | "Code run when the diff process exits. | 64 | "Code run when the diff process exits. |
| 65 | CODE is the exit code of the process. It should be 0 only if no diffs | 65 | CODE is the exit code of the process. It should be 0 only if no diffs |
| 66 | were found." | 66 | were found." |
| 67 | (if diff-old-temp-file (delete-file diff-old-temp-file t)) | 67 | (if diff-old-temp-file (delete-file diff-old-temp-file)) |
| 68 | (if diff-new-temp-file (delete-file diff-new-temp-file t)) | 68 | (if diff-new-temp-file (delete-file diff-new-temp-file)) |
| 69 | (save-excursion | 69 | (save-excursion |
| 70 | (goto-char (point-max)) | 70 | (goto-char (point-max)) |
| 71 | (let ((inhibit-read-only t)) | 71 | (let ((inhibit-read-only t)) |