Changeset 259

Timestamp:

08/18/11 08:25:16 (21 months ago)

Author:

rjs

Message:

Update.

Location:

trunk/lisp/nzwei

Files:

• coms.lisp (modified) (1 diff)
• dired.lisp (modified) (1 diff)
• displa.lisp (modified) (1 diff)
• font.lisp (modified) (2 diffs)
• macros.lisp (modified) (2 diffs)
• modes.lisp (modified) (1 diff)
• mouse.lisp (modified) (1 diff)

trunk/lisp/nzwei/coms.lisp

@@ -194 +194 @@
                     (OR (ZEROP (ARRAY-LEADER STRING 0))
                         (ARRAY-POP STRING))
+                    (GO REDIS))
+                   ((= CHAR #\CLEAR-INPUT)
+                    (STORE-ARRAY-LEADER 0 STRING 0)
                     (GO REDIS))
                    ((= CHAR #/)

trunk/lisp/nzwei/dired.lisp

@@ -174 +174 @@
 
 (DEFCOM COM-DIRED-UNDELETE "Un-mark file(s) for deletion" ()
-  (DIRED-MAP-OVER-LINES (IF (AND (NOT *NUMERIC-ARG-P*) (NEQ (BP-CHAR (POINT)) #/D))
+  (DIRED-MAP-OVER-LINES (IF (AND (NOT *NUMERIC-ARG-P*)
+                                 (NOT (MEMQ (BP-CHAR (POINT)) '(#/D #/P))))
                             -1
                             *NUMERIC-ARG*)

trunk/lisp/nzwei/displa.lisp

@@ -216 +216 @@
            (TOP-INDEX (BP-INDEX START-BP))
            (LAST-BP (INTERVAL-LAST-BP INTERVAL))
-           (INITIAL-DEGREE DEGREE))
+           (INITIAL-DEGREE DEGREE)
+           ;; Bind *INTERVAL* in case we decide to call any primitives, e.g. inside the
+           ;; special-blinker which blinks matching parens.  This is an implicit argument.
+           (*INTERVAL* INTERVAL))
       ;; :POINT recentering is a conditional sort of :ABSOLUTE recentering.
       ;; So decide here whether :ABSOLUTE recentering should be done.

trunk/lisp/nzwei/font.lisp

@@ -37 +37 @@
          (TYPEIN-LINE "Font ID: ")
          (DO ((CH)) (NIL)
-             (SETQ CH (TYPEIN-LINE-ACTIVATE (FUNCALL *TYPEIN-WINDOW* ':MOUSE-OR-KBD-TYI)))
+             (SETQ CH (TYPEIN-LINE-ACTIVATE (FUNCALL STANDARD-INPUT ':MOUSE-OR-KBD-TYI)))
              (COND ((OR (= CH #/G) (= CH #/g))
                     (BARF))
@@ -390 +390 @@
     (FUNCALL ACTOR ':ADD-LINE LINE)
     (INSERT-LINE-WITH-LEADER LINE AT-LINE)))
-
+

trunk/lisp/nzwei/macros.lisp

@@ -309 +309 @@
 ;;; (DEFCOM COM-foo "Documentation." OPTIONS-LIST . BODY)
 ;;; Note: unlike EINE, there is no lambda-list.
-;;; Options are:  (M) -- This command always preserves MARK.
+;;; Options are:  (KM) -- This command always preserves MARK.
 
 (DEFMACRO DEFCOM (FN DOC OPTIONS . DEF)
@@ -362 +362 @@
   (LET ((CLEN (STRING-LENGTH COMMAND)))
     (LET ((STR (SUBSTRING COMMAND
-                          (COND ((STRING-EQUAL "COM-MOUSE-" 0 0 12 12) 12)
+                          (COND ((STRING-EQUAL "COM-MOUSE-" COMMAND 0 0 12 12) 12)
                                 ((STRING-EQUAL "COM-" COMMAND 0 0 4 4) 4)
                                 ((STRING-EQUAL "*" COMMAND 0 0 1 1) 1)

trunk/lisp/nzwei/modes.lisp

@@ -627 +627 @@
                   (SETQ CP (OR (STRING-SEARCH-CHAR #\SP LINE (1+ CHAR-POS)) LEN)
                         POS (+ POS (STRING-WIDTH LINE CHAR-POS CP SHEET)))
-                  (AND (> POS *FILL-COLUMN*)
-                       (RETURN (AND (> CHAR-POS 0) (CREATE-BP LINE CHAR-POS))))))
+                  (AND (> POS *FILL-COLUMN*) (> CHAR-POS 0)
+                       (RETURN (CREATE-BP LINE CHAR-POS)))))
        (WITH-BP (PT (POINT) ':MOVES) ;Save point
          (MOVE-BP (POINT) BP)

trunk/lisp/nzwei/mouse.lisp

@@ -292 +292 @@
              (MOVE-BP POINT LINE CHAR-POS)
              (FUNCALL (SELECTQ *MAJOR-MODE*
-                        (LISP-MODE 'LISP-MARK-THING)
+                        ((LISP-MODE ZTOP-MODE) 'LISP-MARK-THING)
                         ((TEXT-MODE FUNDAMENTAL-MODE BOLIO-MODE) 'TEXT-MARK-THING)
                         (OTHERWISE 'DEFAULT-MARK-THING))