Index: emacs/lisp/ediff-mult.el
diff -c emacs/lisp/ediff-mult.el:1.38 emacs/lisp/ediff-mult.el:1.39
*** emacs/lisp/ediff-mult.el:1.38 Mon Jun 13 11:58:35 2005
--- emacs/lisp/ediff-mult.el Mon Jul 4 02:01:39 2005
***************
*** 106,112 ****
(provide 'ediff-mult)
(defgroup ediff-mult nil
! "Multi-file and multi-buffer processing in Ediff"
:prefix "ediff-"
:group 'ediff)
--- 106,112 ----
(provide 'ediff-mult)
(defgroup ediff-mult nil
! "Multi-file and multi-buffer processing in Ediff."
:prefix "ediff-"
:group 'ediff)
***************
*** 857,863 ****
(session-info (ediff-overlay-get overl 'ediff-meta-info))
(activity-marker (ediff-get-session-activity-marker session-info))
buffer-read-only)
! (or new-marker activity-marker (setq new-marker ?\ ))
(goto-char (ediff-overlay-start overl))
(if (eq (char-after (point)) new-marker)
() ; if marker shown in buffer is the same as new-marker, do nothing
--- 857,863 ----
(session-info (ediff-overlay-get overl 'ediff-meta-info))
(activity-marker (ediff-get-session-activity-marker session-info))
buffer-read-only)
! (or new-marker activity-marker (setq new-marker ?\s))
(goto-char (ediff-overlay-start overl))
(if (eq (char-after (point)) new-marker)
() ; if marker shown in buffer is the same as new-marker, do nothing
***************
*** 872,878 ****
(session-info (ediff-overlay-get overl 'ediff-meta-info))
(status (ediff-get-session-status session-info))
buffer-read-only)
! (setq new-status (or new-status status ?\ ))
(goto-char (ediff-overlay-start overl))
(forward-char 1) ; status is the second char in session record
(if (eq (char-after (point)) new-status)
--- 872,878 ----
(session-info (ediff-overlay-get overl 'ediff-meta-info))
(status (ediff-get-session-status session-info))
buffer-read-only)
! (setq new-status (or new-status status ?\s))
(goto-char (ediff-overlay-start overl))
(forward-char 1) ; status is the second char in session record
(if (eq (char-after (point)) new-status)
_______________________________________________
Emacs-diffs mailing list
[email protected]
http://lists.gnu.org/mailman/listinfo/emacs-diffs
