aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ediff-mult.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/ediff-mult.el b/lisp/ediff-mult.el
index d3710258d24..3616bb267ce 100644
--- a/lisp/ediff-mult.el
+++ b/lisp/ediff-mult.el
@@ -106,7 +106,7 @@
106(provide 'ediff-mult) 106(provide 'ediff-mult)
107 107
108(defgroup ediff-mult nil 108(defgroup ediff-mult nil
109 "Multi-file and multi-buffer processing in Ediff" 109 "Multi-file and multi-buffer processing in Ediff."
110 :prefix "ediff-" 110 :prefix "ediff-"
111 :group 'ediff) 111 :group 'ediff)
112 112
@@ -857,7 +857,7 @@ behavior."
857 (session-info (ediff-overlay-get overl 'ediff-meta-info)) 857 (session-info (ediff-overlay-get overl 'ediff-meta-info))
858 (activity-marker (ediff-get-session-activity-marker session-info)) 858 (activity-marker (ediff-get-session-activity-marker session-info))
859 buffer-read-only) 859 buffer-read-only)
860 (or new-marker activity-marker (setq new-marker ?\ )) 860 (or new-marker activity-marker (setq new-marker ?\s))
861 (goto-char (ediff-overlay-start overl)) 861 (goto-char (ediff-overlay-start overl))
862 (if (eq (char-after (point)) new-marker) 862 (if (eq (char-after (point)) new-marker)
863 () ; if marker shown in buffer is the same as new-marker, do nothing 863 () ; if marker shown in buffer is the same as new-marker, do nothing
@@ -872,7 +872,7 @@ behavior."
872 (session-info (ediff-overlay-get overl 'ediff-meta-info)) 872 (session-info (ediff-overlay-get overl 'ediff-meta-info))
873 (status (ediff-get-session-status session-info)) 873 (status (ediff-get-session-status session-info))
874 buffer-read-only) 874 buffer-read-only)
875 (setq new-status (or new-status status ?\ )) 875 (setq new-status (or new-status status ?\s))
876 (goto-char (ediff-overlay-start overl)) 876 (goto-char (ediff-overlay-start overl))
877 (forward-char 1) ; status is the second char in session record 877 (forward-char 1) ; status is the second char in session record
878 (if (eq (char-after (point)) new-status) 878 (if (eq (char-after (point)) new-status)