Hello,
Both xemacs and emacs > 21 explicitly advise against the use of
make-local-variable for making buffer-local hooks. The following patch
fix this. Best, Leo.
--- /President/lisp/site-lisp/magit.el.gz~
+++ /President/lisp/site-lisp/magit.el.gz
@@ -3213,7 +3213,6 @@
(setq magit-ediff-file file)
(make-local-variable 'magit-ediff-windows)
(setq magit-ediff-windows windows)
- (make-local-variable 'ediff-quit-hook)
(add-hook 'ediff-quit-hook
(lambda ()
(let ((buffer-A ediff-buffer-A)
@@ -3231,7 +3230,8 @@
(kill-buffer buffer-C)
(when (bufferp buffer-Ancestor) (kill-buffer
buffer-Ancestor))
(set-window-configuration windows)
- (message "Conflict resolution finished; you may save the
buffer")))))))
+ (message "Conflict resolution finished; you may save the
buffer")))
+ nil t))))
(defun magit-interactive-resolve-item ()
Diff finished. Thu Dec 24 17:57:26 2009
--
H A P P Y H O L I D A Y S!
