diff options
| author | Michael Kifer <kifer@cs.stonybrook.edu> | 1997-11-25 02:10:08 +0000 |
|---|---|---|
| committer | Michael Kifer <kifer@cs.stonybrook.edu> | 1997-11-25 02:10:08 +0000 |
| commit | c004db972f6954c6aaf9690045b1d2fdf8396472 (patch) | |
| tree | c0d07d8e1a33e6888c74ed2189b359e61455fabe /lisp/ediff-mult.el | |
| parent | a16f6b1688d52126befff3d12838b8e0d41ed19c (diff) | |
| download | emacs-c004db972f6954c6aaf9690045b1d2fdf8396472.tar.gz | |
new version
Diffstat (limited to 'lisp/ediff-mult.el')
| -rw-r--r-- | lisp/ediff-mult.el | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el index 230938ee8e4..c5d4e61d670 100644 --- a/lisp/ediff-mult.el +++ b/lisp/ediff-mult.el @@ -1456,7 +1456,7 @@ all marked sessions must be active." ;; ediff-get-meta-info gives error if meta-buf or pos are invalid (info (ediff-get-meta-info meta-buf pos)) (session-buf (ediff-get-session-buffer info)) - (session-number (ediff-get-session-number-at-pos pos)) + (session-number (ediff-get-session-number-at-pos pos meta-buf)) merge-autostore-dir file1 file2 file3 regexp) (setq file1 (ediff-get-session-objA-name info) @@ -1897,9 +1897,13 @@ If this is a session registry buffer then just bury it." overl (car overl-list))) overl))) -(defsubst ediff-get-session-number-at-pos (point) - (ediff-overlay-get - (ediff-get-meta-overlay-at-pos point) 'ediff-meta-session-number)) +(defsubst ediff-get-session-number-at-pos (point &optional meta-buffer) + (setq meta-buffer (if (ediff-buffer-live-p meta-buffer) + meta-buffer + (current-buffer))) + (ediff-with-current-buffer meta-buffer + (ediff-overlay-get + (ediff-get-meta-overlay-at-pos point) 'ediff-meta-session-number))) ;; Return location of the next meta overlay after point |