Changeset 194

Timestamp:

11/03/02 20:30:02 (21 years ago)

Author:

piso

Message:

killBuffer(): unsplit window if dot and mark are the same in both editors.

File:

• trunk/j/src/org/armedbear/j/Editor.java (modified) (2 diffs)

trunk/j/src/org/armedbear/j/Editor.java

@@ -3 +3 @@
  *
  * Copyright (C) 1998-2002 Peter Graves
- * $Id: Editor.java,v 1.14 2002-11-02 23:12:32 piso Exp $
+ * $Id: Editor.java,v 1.15 2002-11-03 20:30:02 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -5652 +5652 @@
                 Editor s = frame.getSecondaryEditor();
                 boolean unsplit = false;
-                if (p.getDisplay().getTopLine() == s.getDisplay().getTopLine()) {
-                    if (p.getDot() != null && p.getDot().equals(s.getDot())) {
-                        if (p.getMark() == null && s.getMark() == null)
-                            unsplit = true;
-                        else if (p.getMark() != null && p.getMark().equals(s.getMark()))
-                            unsplit = true;
-                    }
+                if (p.getDot() != null && p.getDot().equals(s.getDot())) {
+                    if (p.getMark() == null && s.getMark() == null)
+                        unsplit = true;
+                    else if (p.getMark() != null && p.getMark().equals(s.getMark()))
+                        unsplit = true;
                 }
                 if (unsplit)