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

Modified Files: gui.lisp Log Message: fixed up a flaw in C-k, thanks antifuchsls Date: Fri Jan 7 15:29:10 2005 Author: ejohnson

Index: climacs/gui.lisp diff -u climacs/gui.lisp:1.50 climacs/gui.lisp:1.51 --- climacs/gui.lisp:1.50 Fri Jan 7 14:07:45 2005 +++ climacs/gui.lisp Fri Jan 7 15:29:05 2005 @@ -348,21 +348,18 @@

(define-named-command com-kill-line () (let* ((payne (win *application-frame*)) - (pnt (point payne))) - (if (and (beginning-of-buffer-p pnt) - (end-of-line-p pnt)) - NIL - (let ((mrk (offset pnt))) - (end-of-line pnt) - (if (end-of-buffer-p pnt) - nil - (forward-object pnt)) - (if (eq (previous-command payne) 'com-kill-line) - (kill-ring-concatenating-push *kill-ring* - (region-to-sequence mrk pnt)) - (kill-ring-standard-push *kill-ring* - (region-to-sequence mrk pnt))) - (delete-region mrk pnt))))) + (pnt (point payne)) + (mrk (offset pnt))) + (end-of-line pnt) + (cond ((or (beginning-of-buffer-p pnt) + (end-of-buffer-p pnt)) nil) + ((beginning-of-line-p pnt)(forward-object pnt))) + (if (eq (previous-command payne) 'com-kill-line) + (kill-ring-concatenating-push *kill-ring* + (region-to-sequence mrk pnt)) + (kill-ring-standard-push *kill-ring* + (region-to-sequence mrk pnt))) + (delete-region mrk pnt)))

(define-named-command com-forward-word () (forward-word (point (win *application-frame*))))