Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv23174 Modified Files: base.lisp gui.lisp Log Message: fixed some problems with word delete commands. Used define-climacs-command instead of :command-table climacs, and :name t when appropriate (as of now: always). Date: Thu Dec 30 06:28:23 2004 Author: rstrandh Index: climacs/base.lisp diff -u climacs/base.lisp:1.7 climacs/base.lisp:1.8 --- climacs/base.lisp:1.7 Wed Dec 29 17:03:21 2004 +++ climacs/base.lisp Thu Dec 30 06:28:21 2004 @@ -121,7 +121,7 @@ "Delete until the end of the word" (loop until (end-of-buffer-p mark) until (constituentp (object-after mark)) - do (incf (offset mark))) + do (delete-range mark)) (loop until (end-of-buffer-p mark) while (constituentp (object-after mark)) do (delete-range mark))) @@ -130,7 +130,7 @@ "Delete until the beginning of the word" (loop until (beginning-of-buffer-p mark) until (constituentp (object-before mark)) - do (decf (offset mark))) + do (delete-range mark -1)) (loop until (beginning-of-buffer-p mark) while (constituentp (object-before mark)) do (delete-range mark -1))) Index: climacs/gui.lisp diff -u climacs/gui.lisp:1.32 climacs/gui.lisp:1.33 --- climacs/gui.lisp:1.32 Wed Dec 29 17:03:21 2004 +++ climacs/gui.lisp Thu Dec 30 06:28:21 2004 @@ -157,7 +157,7 @@ (setf (needs-saving buffer) t))) (redisplay-frame-panes frame)))) -(define-command (com-quit :name t :command-table climacs) () +(define-climacs-command (com-quit :name t) () (frame-exit *application-frame*)) (define-command com-self-insert () @@ -296,7 +296,7 @@ (concatenate 'string (pathname-name pathname) "." (pathname-type pathname)))) -(define-command (com-find-file :name t :command-table climacs) () +(define-climacs-command (com-find-file :name t) () (let ((filename (accept 'completable-pathname :prompt "Find File"))) (with-slots (buffer point syntax) (win *application-frame*) @@ -352,11 +352,11 @@ while (whitespacep (object-after point)) do (incf (offset point))))) -(define-command (com-goto-position :name t :command-table climacs) () +(define-climacs-command (com-goto-position :name t) () (setf (offset (point (win *application-frame*))) (accept 'integer :prompt "Goto Position"))) -(define-command (com-goto-line :name t :command-table climacs) () +(define-climacs-command (com-goto-line :name t) () (loop with mark = (make-instance 'standard-right-sticky-mark :buffer (buffer (win *application-frame*))) do (end-of-line mark) @@ -368,7 +368,7 @@ (setf (offset (point (win *application-frame*))) (offset mark)))) -(define-command com-browse-url () +(define-climacs-command (com-browse-url :name t) () (accept 'url :prompt "Browse URL")) (define-command com-set-mark ()