diff options
| author | Tino Calancha | 2016-06-25 00:26:09 +0900 |
|---|---|---|
| committer | Tino Calancha | 2016-06-25 00:26:09 +0900 |
| commit | 974a53bfbe5a19326d2473012996ffd81ec91630 (patch) | |
| tree | 225ae1d2df13ace840385a2f104e17d2713c6d3b | |
| parent | a4750b39560a8a182cf95dd4494f79ab6466e9b2 (diff) | |
| download | emacs-974a53bfbe5a19326d2473012996ffd81ec91630.tar.gz emacs-974a53bfbe5a19326d2473012996ffd81ec91630.zip | |
Fix caller to ediff-setup
* lisp/hilit-chg.el (hilit-chg-get-diff-info): #Bug23820.
| -rw-r--r-- | lisp/hilit-chg.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el index 263b5ab3bb5..6420b8c68b3 100644 --- a/lisp/hilit-chg.el +++ b/lisp/hilit-chg.el | |||
| @@ -908,7 +908,7 @@ changes are made, so \\[highlight-changes-next-change] and | |||
| 908 | (let (hilit-e hilit-x hilit-y) | 908 | (let (hilit-e hilit-x hilit-y) |
| 909 | (ediff-setup buf-a file-a buf-b file-b | 909 | (ediff-setup buf-a file-a buf-b file-b |
| 910 | nil nil ; buf-c file-C | 910 | nil nil ; buf-c file-C |
| 911 | 'hilit-chg-get-diff-list-hk | 911 | '(hilit-chg-get-diff-list-hk) |
| 912 | (list (cons 'ediff-job-name 'something)) | 912 | (list (cons 'ediff-job-name 'something)) |
| 913 | ) | 913 | ) |
| 914 | (ediff-with-current-buffer hilit-e (ediff-really-quit nil)) | 914 | (ediff-with-current-buffer hilit-e (ediff-really-quit nil)) |