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

[Elliott Johnson]

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

Modified Files:
	gui.lisp 
Log Message:
Fixed the beeping from C-k at end-of-buffer, thanks Robert
Date: Sat Jan  8 08:46:33 2005
Author: ejohnson

Index: climacs/gui.lisp
diff -u climacs/gui.lisp:1.55 climacs/gui.lisp:1.56
--- climacs/gui.lisp:1.55	Sat Jan  8 07:30:25 2005
+++ climacs/gui.lisp	Sat Jan  8 08:46:33 2005
@@ -350,13 +350,12 @@
   (let* ((pane (win *application-frame*))
 	 (point (point pane))
          (mark (offset point)))
-    (if (end-of-line-p point)
-	(forward-object point)
-	(progn
-	  (end-of-line point)
-	  (cond ((or (beginning-of-buffer-p point)
-		     (end-of-buffer-p point)) nil)
-		((beginning-of-line-p point)(forward-object point)))))
+    (cond ((end-of-buffer-p point) nil)
+	  ((end-of-line-p point)(forward-object point))
+	  (t
+	   (end-of-line point)
+	   (cond ((beginning-of-buffer-p point) nil)
+		 ((beginning-of-line-p point)(forward-object point)))))
     (if (eq (previous-command pane) 'com-kill-line)
 	(kill-ring-concatenating-push *kill-ring*
 				      (region-to-sequence mark point))