From: Shawn Betts <sabetts@gmail.com>
Date: Tue, 4 Dec 2007 10:17:44 +0000 (-0800)
Subject: get it building again
X-Git-Url: https://repo.or.cz/w/lice.git/commitdiff_plain/a09f46cedfe40d3935c552d46cf44eb059f93010

get it building again
---

diff --git a/src/Makefile.in b/src/Makefile.in
index 0aa10f1..8ade5ae 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -8,7 +8,7 @@ LISP_OPTS= $(@LISP@_OPTS)
 
 # This is copied from the .asd file. It'd be nice to have the list in
 # one place, but oh well.
-FILES=package.lisp wrappers.lisp global.lisp custom.lisp commands.lisp data-types.lisp keymap.lisp casefiddle.lisp subprocesses.lisp buffer-local.lisp buffer.lisp intervals.lisp textprop.lisp search.lisp frame.lisp window.lisp render.lisp wm.lisp insdel.lisp cmds.lisp editfns.lisp undo.lisp syntax.lisp major-mode.lisp keyboard.lisp debugger.lisp recursive-edit.lisp minibuffer.lisp files.lisp help.lisp debug.lisp tty-render.lisp clisp-render.lisp main.lisp lisp/subr.lisp lisp/simple.lisp indent.lisp lisp/lisp-mode.lisp lisp/lisp-indent.lisp lisp/paragraphs.lisp textmodes/text-mode.lisp play/doctor.lisp play/hanoi.lisp
+FILES=package.lisp wrappers.lisp global.lisp custom.lisp commands.lisp data-types.lisp keymap.lisp casefiddle.lisp subprocesses.lisp buffer-local.lisp buffer.lisp intervals.lisp textprop.lisp search.lisp frame.lisp window.lisp render.lisp wm.lisp insdel.lisp cmds.lisp editfns.lisp undo.lisp syntax.lisp major-mode.lisp keyboard.lisp debugger.lisp recursive-edit.lisp minibuffer.lisp files.lisp help.lisp debug.lisp tty-render.lisp clisp-render.lisp main.lisp lisp/subr.lisp lisp/simple.lisp indent.lisp emacs-lisp/lisp-mode.lisp lisp/lisp-indent.lisp lisp/paragraphs.lisp textmodes/text-mode.lisp play/doctor.lisp play/hanoi.lisp
 
 all: lice
 
diff --git a/src/callint.lisp b/src/callint.lisp
index d40ce24..19ec6aa 100644
--- a/src/callint.lisp
+++ b/src/callint.lisp
@@ -1,5 +1,7 @@
 ;;; Call a Lisp function interactively.
 
+(in-package #:lice)
+
 (defvar *prefix-arg* nil
   "The value of the prefix argument for the next editing command.
 It may be a number, or the symbol `-' for just a minus sign as arg,
@@ -42,7 +44,7 @@ Optional third arg KEYS, if given, specifies the sequence of events to
 supply, as a vector, if the command inquires which events were used to
 invoke it.  If KEYS is omitted or nil, the return value of
 `*this-command-keys-vector*' is used."
-  (setf function (lookup-command function))
+  ;;(setf function (lookup-command function))
   (check-type function command)
 
   (let ((args (mapcar (lambda (a)
diff --git a/src/keyboard.lisp b/src/keyboard.lisp
index 8a7d90f..302d860 100644
--- a/src/keyboard.lisp
+++ b/src/keyboard.lisp
@@ -181,21 +181,21 @@ events that invoked the current command."
              ;; Make sure the current window's buffer is selected.
              (unless (eq *current-buffer* (window-buffer (selected-window)))
                (setf *current-buffer* (window-buffer (selected-window))))))
-  (setf *prefix-arg* nil
-        *last-prefix-arg* nil)
-  (loop 
-     (ensure-current-buffer)
-     (setf deactivate-mark nil)
+    (setf *prefix-arg* nil
+	  *last-prefix-arg* nil)
+    (loop 
+       (ensure-current-buffer)
+       (setf deactivate-mark nil)
 
-     (frame-render (selected-frame))
+       (frame-render (selected-frame))
 
-     ;; execute command
-     (catch :unbound-key
-       (next-event))
-     ;; A filter may have run while we were reading the input.
-     (ensure-current-buffer)
+       ;; execute command
+       (catch :unbound-key
+	 (next-event))
+       ;; A filter may have run while we were reading the input.
+       (ensure-current-buffer)
 
-))
+       )))
 
 ;;; Key bindings
 
diff --git a/src/lice.asd b/src/lice.asd
index 7ea8277..ae8ac88 100644
--- a/src/lice.asd
+++ b/src/lice.asd
@@ -63,7 +63,8 @@
                                        (:file "lisp-indent")
                                        (:file "paragraphs")
                                        (:file "bindings")
-                                       (:file "paren")))
+                                       ;; (:file "paren")
+				       ))
 
                  (:module textmodes
                           :serial t