[climacs-cvs] CVS update: climacs/gui.lisp climacs/syntax.lisp

[Robert Strandh]

Update of /project/climacs/cvsroot/climacs
In directory common-lisp.net:/tmp/cvs-serv21776

Modified Files:
	gui.lisp syntax.lisp 
Log Message:
Patch for C-c problem by Alastair Bridgewater.  Thanks again.

Date: Mon Dec 27 05:32:44 2004
Author: rstrandh

Index: climacs/gui.lisp
diff -u climacs/gui.lisp:1.17 climacs/gui.lisp:1.18
--- climacs/gui.lisp:1.17	Sun Dec 26 08:18:01 2004
+++ climacs/gui.lisp	Mon Dec 27 05:32:43 2004
@@ -86,7 +86,8 @@
   (setf (slot-value frame 'win) (find-pane-named frame 'win))
   (let ((*standard-output* (frame-standard-output frame))
 	(*standard-input* (frame-standard-input frame))
-	(*print-pretty* nil))
+	(*print-pretty* nil)
+	(*abort-gestures* nil))
     (redisplay-frame-panes frame :force-p t)
     (loop with gestures = '()
 	  do (setf *current-gesture* (read-gesture :stream *standard-input*))
@@ -316,7 +317,6 @@
   (add-command-to-command-table command 'c-x-climacs-table
 				:keystroke gesture :errorp nil))
 
-;;; for some reason, C-c does not seem to arrive as far as CLIM.
-(c-x-set-key '(#\q :control) 'com-quit)
+(c-x-set-key '(#\c :control) 'com-quit)
 (c-x-set-key '(#\f :control) 'com-find-file)
 (c-x-set-key '(#\s :control) 'com-save-buffer)


Index: climacs/syntax.lisp
diff -u climacs/syntax.lisp:1.6 climacs/syntax.lisp:1.7
--- climacs/syntax.lisp:1.6	Sun Dec 26 16:19:59 2004
+++ climacs/syntax.lisp	Mon Dec 27 05:32:44 2004
@@ -77,8 +77,7 @@
 		    `(let ((contents (compute-contents)))
 		       (present-contents contents pane syntax)
 		       , at body)))
-	 (loop with id = 0
-	       when (mark= scan (point pane))
+	 (loop when (mark= scan (point pane))
 		 do (multiple-value-bind (x y) (stream-cursor-position pane)
 		      (setf cursor-x (+ x (if (null saved-offset)
 					      0