Changeset 177

Timestamp:

10/24/02 21:52:42 (20 years ago)

Author:

piso

Message:

enter(): don't autoindent if findContainingSexp() returns null.

File:

• trunk/j/src/org/armedbear/j/LispShellMode.java (modified) (4 diffs)

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

@@ -3 +3 @@
  *
  * Copyright (C) 2002 Peter Graves
- * $Id: LispShellMode.java,v 1.4 2002-10-19 19:46:53 piso Exp $
+ * $Id: LispShellMode.java,v 1.5 2002-10-24 21:52:42 piso Exp $
  *
  * This program is free software; you can redistribute it and/or
@@ -75 +75 @@
     public static void enter()
     {
-        CommandInterpreter.shellEnter();
-
         final Editor editor = Editor.currentEditor();
-        final Display display = editor.getDisplay();
         final Buffer buffer = editor.getBuffer();
-        final Mode mode = buffer.getMode();
-        if (mode != getMode()) {
+        if (buffer.getMode() != mode) {
             Debug.bug();
             return;
         }
+        
+        Line dotLine = editor.getDotLine();
+        Position pos = mode.findContainingSexp(
+            new Position(dotLine, editor.getDotOffset()));
+        
+        CommandInterpreter.shellEnter();
+        
+        if (pos == null)
+            return;
 
-        Line dotLine = editor.getDotLine();
+        dotLine = editor.getDotLine();
         if (dotLine.length() > 0)
             return;
@@ -99 +104 @@
         try {
             buffer.getFormatter().parseBuffer();
-            int indent = LispMode.getMode().getCorrectIndentation(dotLine, buffer);
+            int indent = mode.getCorrectIndentation(dotLine, buffer);
             if (indent != buffer.getIndentation(dotLine)) {
                 editor.addUndo(SimpleEdit.LINE_EDIT);
@@ -110 +115 @@
                 editor.moveCaretToDotCol();
             } else {
+                final Display display = editor.getDisplay();
                 display.setCaretCol(indent - display.getShift());
                 if (buffer.getBooleanProperty(Property.RESTRICT_CARET))