[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/ediff-mult.el
From: |
Michael Kifer |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/ediff-mult.el |
Date: |
Sun, 19 Feb 2006 03:16:47 +0000 |
Index: emacs/lisp/ediff-mult.el
diff -u emacs/lisp/ediff-mult.el:1.46 emacs/lisp/ediff-mult.el:1.47
--- emacs/lisp/ediff-mult.el:1.46 Mon Feb 6 14:33:33 2006
+++ emacs/lisp/ediff-mult.el Sun Feb 19 03:16:44 2006
@@ -104,7 +104,6 @@
;;; Code:
-(provide 'ediff-mult)
(defgroup ediff-mult nil
"Multi-file and multi-buffer processing in Ediff."
@@ -123,7 +122,6 @@
;; end pacifier
(require 'ediff-init)
-(require 'ediff-util)
;; meta-buffer
(ediff-defvar-local ediff-meta-buffer nil "")
@@ -1473,6 +1471,7 @@
(ediff-overlay-put overl 'highlight t))
(ediff-overlay-put overl 'ediff-meta-info prop)
(ediff-overlay-put overl 'invisible hidden)
+ (ediff-overlay-put overl 'follow-link t)
(if (numberp session-number)
(ediff-overlay-put overl 'ediff-meta-session-number session-number))))
@@ -2384,6 +2383,8 @@
))
+(provide 'ediff-mult)
+
;;; Local Variables:
;;; eval: (put 'ediff-defvar-local 'lisp-indent-hook 'defun)