diff options
| -rw-r--r-- | lisp/ChangeLog | 2 | ||||
| -rw-r--r-- | lisp/hilit-chg.el | 8 |
2 files changed, 6 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index b681fb05b85..5de5380925b 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,7 @@ | |||
| 1 | 2010-10-06 Glenn Morris <rgm@gnu.org> | 1 | 2010-10-06 Glenn Morris <rgm@gnu.org> |
| 2 | 2 | ||
| 3 | * hilit-chg.el (hilit-chg-get-diff-list-hk): Declare `e' for compiler. | ||
| 4 | |||
| 3 | * emacs-lisp/cl.el: No longer provide cl-19. | 5 | * emacs-lisp/cl.el: No longer provide cl-19. |
| 4 | 6 | ||
| 5 | 2010-10-05 Michael Albinus <michael.albinus@gmx.de> | 7 | 2010-10-05 Michael Albinus <michael.albinus@gmx.de> |
diff --git a/lisp/hilit-chg.el b/lisp/hilit-chg.el index ec9c88fd6ec..22012986be5 100644 --- a/lisp/hilit-chg.el +++ b/lisp/hilit-chg.el | |||
| @@ -921,7 +921,7 @@ changes are made, so \\[highlight-changes-next-change] and | |||
| 921 | 921 | ||
| 922 | 922 | ||
| 923 | (defun hilit-chg-get-diff-info (buf-a file-a buf-b file-b) | 923 | (defun hilit-chg-get-diff-info (buf-a file-a buf-b file-b) |
| 924 | (let ((e nil) x y) ;; e is set by function hilit-chg-get-diff-list-hk | 924 | (let (e x y) ; e,x,y are set by function hilit-chg-get-diff-list-hk |
| 925 | (ediff-setup buf-a file-a buf-b file-b | 925 | (ediff-setup buf-a file-a buf-b file-b |
| 926 | nil nil ; buf-c file-C | 926 | nil nil ; buf-c file-C |
| 927 | 'hilit-chg-get-diff-list-hk | 927 | 'hilit-chg-get-diff-list-hk |
| @@ -932,10 +932,11 @@ changes are made, so \\[highlight-changes-next-change] and | |||
| 932 | 932 | ||
| 933 | 933 | ||
| 934 | (defun hilit-chg-get-diff-list-hk () | 934 | (defun hilit-chg-get-diff-list-hk () |
| 935 | ;; x and y are dynamically bound by hilit-chg-get-diff-info | 935 | ;; e, x and y are dynamically bound by hilit-chg-get-diff-info |
| 936 | ;; which calls this function as a hook | 936 | ;; which calls this function as a hook |
| 937 | (defvar x) ;; placate the byte-compiler | 937 | (defvar x) ; placate the byte-compiler |
| 938 | (defvar y) | 938 | (defvar y) |
| 939 | (defvar e) | ||
| 939 | (setq e (current-buffer)) | 940 | (setq e (current-buffer)) |
| 940 | (let ((n 0) extent p va vb a b) | 941 | (let ((n 0) extent p va vb a b) |
| 941 | (setq x nil y nil) ;; x and y are bound by hilit-chg-get-diff-info | 942 | (setq x nil y nil) ;; x and y are bound by hilit-chg-get-diff-info |
| @@ -1035,5 +1036,4 @@ This is called when `global-highlight-changes-mode' is turned on." | |||
| 1035 | 1036 | ||
| 1036 | (provide 'hilit-chg) | 1037 | (provide 'hilit-chg) |
| 1037 | 1038 | ||
| 1038 | ;; arch-tag: de00301d-5bad-44da-aa82-e0e010b0c463 | ||
| 1039 | ;;; hilit-chg.el ends here | 1039 | ;;; hilit-chg.el ends here |