- climacs-cvs@common-lisp.net - mailman3.common-lisp.net

[climacs-cvs] CVS update: climacs/gui.lisp
by abakic＠common-lisp.net 14 Jan '05

14 Jan '05

Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv32458 Modified Files: gui.lisp Log Message: Turned *overwrite-mode* variable into a slot of climacs-pane. (Perhaps there should be pane-mixin and buffer-mixin for non-essential slots.) Date: Fri Jan 14 21:44:47 2005 Author: abakic Index: climacs/gui.lisp diff -u climacs/gui.lisp:1.67 climacs/gui.lisp:1.68 --- climacs/gui.lisp:1.67 Fri Jan 14 14:07:39 2005 +++ climacs/gui.lisp Fri Jan 14 21:44:47 2005 @@ -6,6 +6,8 @@ ;;; Elliott Johnson (ejohnson(a)fasl.info) ;;; (c) copyright 2005 by ;;; Matthieu Villeneuve (matthieu.villeneuve(a)free.fr) +;;; (c) copyright 2005 by +;;; Aleksandar Bakic (a_bakic(a)yahoo.com) ;;; This library is free software; you can redistribute it and/or ;;; modify it under the terms of the GNU Library General Public @@ -46,7 +48,8 @@ ;; for dynamic abbrev expansion (original-prefix :initform nil) (prefix-start-offset :initform nil) - (dabbrev-expansion-mark :initform nil))) + (dabbrev-expansion-mark :initform nil) + (overwrite-mode :initform nil))) (defmethod initialize-instance :after ((pane climacs-pane) &rest args) (declare (ignore args)) @@ -108,8 +111,6 @@ (defun display-message (format-string &rest format-args) (apply #'format *standard-input* format-string format-args)) -(defvar *overwrite-mode* nil) - (defun display-info (frame pane) (let* ((win (win frame)) (buf (buffer win)) @@ -117,7 +118,7 @@ (if (needs-saving buf) "**" "--") (name buf) (name (syntax win)) - (if *overwrite-mode* + (if (slot-value win 'overwrite-mode) "Ovwrt" "")))) (princ name-info pane))) @@ -255,13 +256,16 @@ (frame-exit *application-frame*)) (define-named-command com-toggle-overwrite-mode () - (setf *overwrite-mode* (not *overwrite-mode*))) + (let ((win (win *application-frame*))) + (setf (slot-value win 'overwrite-mode) + (not (slot-value win 'overwrite-mode))))) (define-command com-self-insert () - (let ((point (point (win *application-frame*)))) + (let* ((win (win *application-frame*)) + (point (point win))) (unless (constituentp *current-gesture*) (possibly-expand-abbrev point)) - (if (and *overwrite-mode* (not (end-of-line-p point))) + (if (and (slot-value win 'overwrite-mode) (not (end-of-line-p point))) (progn (delete-range point) (insert-object point *current-gesture*))

1 0

[climacs-cvs] CVS update: climacs/text-syntax.lisp climacs/climacs.asd climacs/gui.lisp climacs/packages.lisp
by rstrandh＠common-lisp.net 14 Jan '05

14 Jan '05

Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv9425 Modified Files: climacs.asd gui.lisp packages.lisp Added Files: text-syntax.lisp Log Message: First attempt at a syntax for ordinary text. Date: Fri Jan 14 14:07:40 2005 Author: rstrandh Index: climacs/climacs.asd diff -u climacs/climacs.asd:1.9 climacs/climacs.asd:1.10 --- climacs/climacs.asd:1.9 Tue Jan 4 00:55:16 2005 +++ climacs/climacs.asd Fri Jan 14 14:07:39 2005 @@ -56,6 +56,7 @@ "io" "abbrev" "syntax" + "text-syntax" "kill-ring" "gui") Index: climacs/gui.lisp diff -u climacs/gui.lisp:1.66 climacs/gui.lisp:1.67 --- climacs/gui.lisp:1.66 Thu Jan 13 20:36:28 2005 +++ climacs/gui.lisp Fri Jan 14 14:07:39 2005 @@ -600,9 +600,13 @@ (offset point) (offset mark)))) (define-named-command com-set-syntax () - (setf (syntax (win *application-frame*)) - (make-instance (accept 'syntax :prompt "Set Syntax") - :pane (win *application-frame*)))) + (let* ((pane (win *application-frame*)) + (buffer (buffer pane))) + (setf (syntax (win *application-frame*)) + (make-instance (accept 'syntax :prompt "Set Syntax") + :pane pane)) + (setf (offset (low-mark buffer)) 0 + (offset (high-mark buffer)) (size buffer)))) ;;;;;;;;;;;;;;;;;;;; ;; Kill ring commands Index: climacs/packages.lisp diff -u climacs/packages.lisp:1.29 climacs/packages.lisp:1.30 --- climacs/packages.lisp:1.29 Thu Jan 13 17:52:14 2005 +++ climacs/packages.lisp Fri Jan 14 14:07:39 2005 @@ -68,7 +68,8 @@ (defpackage :climacs-syntax (:use :clim-lisp :clim :climacs-buffer :climacs-base :flexichain) - (:export #:syntax #:basic-syntax #:texinfo-syntax + (:export #:syntax #:define-syntax + #:basic-syntax #:texinfo-syntax #:redisplay-pane #:redisplay-with-syntax #:full-redisplay #:page-down #:page-up #:url))

1 0

[climacs-cvs] CVS update: climacs/gui.lisp
by ejohnson＠common-lisp.net 13 Jan '05

13 Jan '05

Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv19736 Modified Files: gui.lisp Log Message: missing comma befor forward-object's *numeric-argument-marker* argument Date: Thu Jan 13 20:36:29 2005 Author: ejohnson Index: climacs/gui.lisp diff -u climacs/gui.lisp:1.65 climacs/gui.lisp:1.66 --- climacs/gui.lisp:1.65 Thu Jan 13 17:52:14 2005 +++ climacs/gui.lisp Thu Jan 13 20:36:28 2005 @@ -736,7 +736,7 @@ (global-set-key '(:up) 'com-previous-line) (global-set-key '(:down) 'com-next-line) (global-set-key '(:left) `(com-backward-object ,*numeric-argument-marker*)) -(global-set-key '(:right) `(com-forward-object *numeric-argument-marker*)) +(global-set-key '(:right) `(com-forward-object ,*numeric-argument-marker*)) (global-set-key '(:left :control) 'com-backward-word) (global-set-key '(:right :control) 'com-forward-word) (global-set-key '(:home) 'com-beginning-of-line)

1 0

[climacs-cvs] CVS update: climacs/base.lisp climacs/buffer.lisp climacs/gui.lisp climacs/packages.lisp
by mvilleneuve＠common-lisp.net 13 Jan '05

13 Jan '05

Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv11276 Modified Files: base.lisp buffer.lisp gui.lisp packages.lisp Log Message: Fixed wrong usage of mark-mixin, updated copyrights Date: Thu Jan 13 17:52:14 2005 Author: mvilleneuve Index: climacs/base.lisp diff -u climacs/base.lisp:1.15 climacs/base.lisp:1.16 --- climacs/base.lisp:1.15 Thu Jan 13 16:34:05 2005 +++ climacs/base.lisp Thu Jan 13 17:52:14 2005 @@ -1,9 +1,11 @@ ;;; -*- Mode: Lisp; Package: CLIMACS-BASE -*- -;;; (c) copyright 2004 by +;;; (c) copyright 2004-2005 by ;;; Robert Strandh (strandh(a)labri.fr) -;;; (c) copyright 2004 by +;;; (c) copyright 2004-2005 by ;;; Elliott Johnson (ejohnson(a)fasl.info) +;;; (c) copyright 2005 by +;;; Matthieu Villeneuve (matthieu.villeneuve(a)free.fr) ;;; This library is free software; you can redistribute it and/or ;;; modify it under the terms of the GNU Library General Public @@ -39,14 +41,12 @@ (defgeneric backward-object (mark &optional count)) -(defmethod backward-object ((mark climacs-buffer::mark-mixin) - &optional (count 1)) +(defmethod backward-object ((mark mark) &optional (count 1)) (decf (offset mark) count)) (defgeneric forward-object (mark &optional count)) -(defmethod forward-object ((mark climacs-buffer::mark-mixin) - &optional (count 1)) +(defmethod forward-object ((mark mark) &optional (count 1)) (incf (offset mark) count)) (defun previous-line (mark &optional column) @@ -189,15 +189,14 @@ lowercase. An error is signaled if the two marks are positioned in different buffers. It is acceptable to pass an offset in place of one of the marks.")) -(defmethod downcase-region ((mark1 climacs-buffer::mark-mixin) - (mark2 climacs-buffer::mark-mixin)) +(defmethod downcase-region ((mark1 mark) (mark2 mark)) (assert (eq (buffer mark1) (buffer mark2))) (downcase-buffer-region (buffer mark1) (offset mark1) (offset mark2))) -(defmethod downcase-region ((offset integer) (mark climacs-buffer::mark-mixin)) +(defmethod downcase-region ((offset integer) (mark mark)) (downcase-buffer-region (buffer mark) offset (offset mark))) -(defmethod downcase-region ((mark climacs-buffer::mark-mixin) (offset integer)) +(defmethod downcase-region ((mark mark) (offset integer)) (downcase-buffer-region (buffer mark) (offset mark) offset)) (defun downcase-word (mark &optional (n 1)) @@ -218,15 +217,14 @@ uppercase. An error is signaled if the two marks are positioned in different buffers. It is acceptable to pass an offset in place of one of the marks.")) -(defmethod upcase-region ((mark1 climacs-buffer::mark-mixin) - (mark2 climacs-buffer::mark-mixin)) +(defmethod upcase-region ((mark1 mark) (mark2 mark)) (assert (eq (buffer mark1) (buffer mark2))) (upcase-buffer-region (buffer mark1) (offset mark1) (offset mark2))) -(defmethod upcase-region ((offset integer) (mark climacs-buffer::mark-mixin)) +(defmethod upcase-region ((offset integer) (mark mark)) (upcase-buffer-region (buffer mark) offset (offset mark))) -(defmethod upcase-region ((mark climacs-buffer::mark-mixin) (offset integer)) +(defmethod upcase-region ((mark mark) (offset integer)) (upcase-buffer-region (buffer mark) (offset mark) offset)) (defun upcase-word (mark &optional (n 1)) @@ -255,17 +253,14 @@ An error is signaled if the two marks are positioned in different buffers. It is acceptable to pass an offset in place of one of the marks.")) -(defmethod capitalize-region ((mark1 climacs-buffer::mark-mixin) - (mark2 climacs-buffer::mark-mixin)) +(defmethod capitalize-region ((mark1 mark) (mark2 mark)) (assert (eq (buffer mark1) (buffer mark2))) (capitalize-buffer-region (buffer mark1) (offset mark1) (offset mark2))) -(defmethod capitalize-region ((offset integer) - (mark climacs-buffer::mark-mixin)) +(defmethod capitalize-region ((offset integer) (mark mark)) (capitalize-buffer-region (buffer mark) offset (offset mark))) -(defmethod capitalize-region ((mark climacs-buffer::mark-mixin) - (offset integer)) +(defmethod capitalize-region ((mark mark) (offset integer)) (capitalize-buffer-region (buffer mark) (offset mark) offset)) (defun capitalize-word (mark &optional (n 1)) Index: climacs/buffer.lisp diff -u climacs/buffer.lisp:1.18 climacs/buffer.lisp:1.19 --- climacs/buffer.lisp:1.18 Thu Jan 13 16:31:11 2005 +++ climacs/buffer.lisp Thu Jan 13 17:52:14 2005 @@ -1,9 +1,11 @@ ;;; -*- Mode: Lisp; Package: CLIMACS-BUFFER -*- -;;; (c) copyright 2004 by +;;; (c) copyright 2004-2005 by ;;; Robert Strandh (strandh(a)labri.fr) -;;; (c) copyright 2004 by +;;; (c) copyright 2004-2005 by ;;; Elliott Johnson (ejohnson(a)fasl.info) +;;; (c) copyright 2005 by +;;; Matthieu Villeneuve (matthieu.villeneuve(a)free.fr) ;;; This library is free software; you can redistribute it and/or ;;; modify it under the terms of the GNU Library General Public Index: climacs/gui.lisp diff -u climacs/gui.lisp:1.64 climacs/gui.lisp:1.65 --- climacs/gui.lisp:1.64 Thu Jan 13 16:34:05 2005 +++ climacs/gui.lisp Thu Jan 13 17:52:14 2005 @@ -1,9 +1,11 @@ ;;; -*- Mode: Lisp; Package: CLIMACS-GUI -*- -;;; (c) copyright 2004 by +;;; (c) copyright 2004-2005 by ;;; Robert Strandh (strandh(a)labri.fr) -;;; (c) copyright 2004 by +;;; (c) copyright 2004-2005 by ;;; Elliott Johnson (ejohnson(a)fasl.info) +;;; (c) copyright 2005 by +;;; Matthieu Villeneuve (matthieu.villeneuve(a)free.fr) ;;; This library is free software; you can redistribute it and/or ;;; modify it under the terms of the GNU Library General Public Index: climacs/packages.lisp diff -u climacs/packages.lisp:1.28 climacs/packages.lisp:1.29 --- climacs/packages.lisp:1.28 Thu Jan 13 16:34:05 2005 +++ climacs/packages.lisp Thu Jan 13 17:52:14 2005 @@ -1,7 +1,9 @@ ;;; -*- Mode: Lisp; Package: COMMON-LISP-USER -*- -;;; (c) copyright 2004 by +;;; (c) copyright 2004-2005 by ;;; Robert Strandh (strandh(a)labri.fr) +;;; (c) copyright 2005 by +;;; Matthieu Villeneuve (matthieu.villeneuve(a)free.fr) ;;; This library is free software; you can redistribute it and/or ;;; modify it under the terms of the GNU Library General Public

1 0

[climacs-cvs] CVS update: climacs/base.lisp climacs/gui.lisp climacs/packages.lisp
by mvilleneuve＠common-lisp.net 13 Jan '05

13 Jan '05

Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv7173 Modified Files: base.lisp gui.lisp packages.lisp Log Message: Added upcase/downcase/capitalize-region, and a do-buffer-region macro Date: Thu Jan 13 16:34:05 2005 Author: mvilleneuve Index: climacs/base.lisp diff -u climacs/base.lisp:1.14 climacs/base.lisp:1.15 --- climacs/base.lisp:1.14 Sun Jan 9 15:08:26 2005 +++ climacs/base.lisp Thu Jan 13 16:34:05 2005 @@ -28,12 +28,23 @@ (in-package :climacs-base) +(defmacro do-buffer-region ((object offset buffer offset1 offset2) + &body body) + "Iterate over the elements of the region delimited by offset1 and offset2. +The body is executed for each element, with object being the current object +(setf-able), and offset being its offset." + `(symbol-macrolet ((,object (buffer-object ,buffer ,offset))) + (loop for ,offset from ,offset1 to ,offset2 + do ,@body))) + (defgeneric backward-object (mark &optional count)) + (defmethod backward-object ((mark climacs-buffer::mark-mixin) &optional (count 1)) (decf (offset mark) count)) (defgeneric forward-object (mark &optional count)) + (defmethod forward-object ((mark climacs-buffer::mark-mixin) &optional (count 1)) (incf (offset mark) count)) @@ -164,44 +175,106 @@ finally (return i)) mark)) +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; +;;; +;;; Character case + +(defun downcase-buffer-region (buffer offset1 offset2) + (do-buffer-region (object offset buffer offset1 offset2) + (when (and (constituentp object) (upper-case-p object)) + (setf object (char-downcase object))))) + +(defgeneric downcase-region (mark1 mark2) + (:documentation "Convert all characters after mark1 and before mark2 to +lowercase. An error is signaled if the two marks are positioned in different +buffers. It is acceptable to pass an offset in place of one of the marks.")) + +(defmethod downcase-region ((mark1 climacs-buffer::mark-mixin) + (mark2 climacs-buffer::mark-mixin)) + (assert (eq (buffer mark1) (buffer mark2))) + (downcase-buffer-region (buffer mark1) (offset mark1) (offset mark2))) + +(defmethod downcase-region ((offset integer) (mark climacs-buffer::mark-mixin)) + (downcase-buffer-region (buffer mark) offset (offset mark))) + +(defmethod downcase-region ((mark climacs-buffer::mark-mixin) (offset integer)) + (downcase-buffer-region (buffer mark) (offset mark) offset)) + (defun downcase-word (mark &optional (n 1)) "Convert the next N words to lowercase, leaving mark after the last word." - (dotimes (i n) - (forward-to-word-boundary mark) - (loop until (end-of-buffer-p mark) - while (constituentp (object-after mark)) - for character = (object-after mark) - if (upper-case-p character) - do (progn (delete-range mark 1) - (insert-object mark (char-downcase character))) - else - do (incf (offset mark))))) + (loop repeat n + do (forward-to-word-boundary mark) + (let ((offset (offset mark))) + (forward-word mark) + (downcase-region offset mark)))) + +(defun upcase-buffer-region (buffer offset1 offset2) + (do-buffer-region (object offset buffer offset1 offset2) + (when (and (constituentp object) (lower-case-p object)) + (setf object (char-upcase object))))) + +(defgeneric upcase-region (mark1 mark2) + (:documentation "Convert all characters after mark1 and before mark2 to +uppercase. An error is signaled if the two marks are positioned in different +buffers. It is acceptable to pass an offset in place of one of the marks.")) + +(defmethod upcase-region ((mark1 climacs-buffer::mark-mixin) + (mark2 climacs-buffer::mark-mixin)) + (assert (eq (buffer mark1) (buffer mark2))) + (upcase-buffer-region (buffer mark1) (offset mark1) (offset mark2))) + +(defmethod upcase-region ((offset integer) (mark climacs-buffer::mark-mixin)) + (upcase-buffer-region (buffer mark) offset (offset mark))) + +(defmethod upcase-region ((mark climacs-buffer::mark-mixin) (offset integer)) + (upcase-buffer-region (buffer mark) (offset mark) offset)) (defun upcase-word (mark &optional (n 1)) "Convert the next N words to uppercase, leaving mark after the last word." - (dotimes (i n) - (forward-to-word-boundary mark) - (loop until (end-of-buffer-p mark) - while (constituentp (object-after mark)) - for character = (object-after mark) - when (lower-case-p character) - do (progn - (delete-range mark 1) - (insert-object mark (char-upcase character))) - else - do (incf (offset mark))))) + (loop repeat n + do (forward-to-word-boundary mark) + (let ((offset (offset mark))) + (forward-word mark) + (upcase-region offset mark)))) + +(defun capitalize-buffer-region (buffer offset1 offset2) + (let ((previous-char-constituent-p + (and (plusp offset1) + (constituentp (buffer-object buffer (1- offset1)))))) + (do-buffer-region (object offset buffer offset1 offset2) + (when (constituentp object) + (if previous-char-constituent-p + (when (upper-case-p object) + (setf object (char-downcase object))) + (when (lower-case-p object) + (setf object (char-upcase object))))) + (setf previous-char-constituent-p (constituentp object))))) + +(defgeneric capitalize-region (mark1 mark2) + (:documentation "Capitalize all words after mark1 and before mark2. +An error is signaled if the two marks are positioned in different buffers. +It is acceptable to pass an offset in place of one of the marks.")) + +(defmethod capitalize-region ((mark1 climacs-buffer::mark-mixin) + (mark2 climacs-buffer::mark-mixin)) + (assert (eq (buffer mark1) (buffer mark2))) + (capitalize-buffer-region (buffer mark1) (offset mark1) (offset mark2))) + +(defmethod capitalize-region ((offset integer) + (mark climacs-buffer::mark-mixin)) + (capitalize-buffer-region (buffer mark) offset (offset mark))) + +(defmethod capitalize-region ((mark climacs-buffer::mark-mixin) + (offset integer)) + (capitalize-buffer-region (buffer mark) (offset mark) offset)) (defun capitalize-word (mark &optional (n 1)) "Capitalize the next N words, leaving mark after the last word." - (dotimes (i n) - (forward-to-word-boundary mark) - (unless (end-of-buffer-p mark) - (let ((character (object-after mark))) - (when (lower-case-p character) - (delete-range mark 1) - (insert-object mark (char-upcase character)))) - (when (constituentp (object-after mark)) - (downcase-word mark))))) + (loop repeat n + do (forward-to-word-boundary mark) + (let ((offset (offset mark))) + (forward-word mark) + (capitalize-region offset mark)))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Index: climacs/gui.lisp diff -u climacs/gui.lisp:1.63 climacs/gui.lisp:1.64 --- climacs/gui.lisp:1.63 Thu Jan 13 06:38:41 2005 +++ climacs/gui.lisp Thu Jan 13 16:34:05 2005 @@ -238,6 +238,12 @@ (setf (needs-saving buffer) t))) (redisplay-frame-panes frame)))) +(defun region-limits (pane) + (with-slots (point mark) pane + (if (< (offset mark) (offset point)) + (values mark point) + (values point mark)))) + (defmacro define-named-command (command-name args &body body) `(define-climacs-command ,(if (listp command-name) `(,@command-name :name t) @@ -383,6 +389,18 @@ (define-named-command com-backward-delete-word () (backward-delete-word (point (win *application-frame*)))) +(define-named-command com-upcase-region () + (multiple-value-bind (start end) (region-limits (win *application-frame*)) + (upcase-region start end))) + +(define-named-command com-downcase-region () + (multiple-value-bind (start end) (region-limits (win *application-frame*)) + (downcase-region start end))) + +(define-named-command com-capitalize-region () + (multiple-value-bind (start end) (region-limits (win *application-frame*)) + (capitalize-region start end))) + (define-named-command com-upcase-word () (upcase-word (point (win *application-frame*)))) @@ -593,13 +611,9 @@ ;; Destructively cut a given buffer region into the kill-ring (define-named-command com-cut-out () - (with-slots (point mark)(win *application-frame*) - (cond ((< (offset mark)(offset point)) - (kill-ring-standard-push *kill-ring* (region-to-sequence mark point)) - (delete-region (offset mark) point)) - (t - (kill-ring-standard-push *kill-ring* (region-to-sequence point mark)) - (delete-region (offset point) mark))))) + (multiple-value-bind (start end) (region-limits (win *application-frame*)) + (kill-ring-standard-push *kill-ring* (region-to-sequence start end)) + (delete-region (offset start) end))) ;; Non destructively copies in buffer region to the kill ring (define-named-command com-copy-out () Index: climacs/packages.lisp diff -u climacs/packages.lisp:1.27 climacs/packages.lisp:1.28 --- climacs/packages.lisp:1.27 Thu Jan 13 06:38:41 2005 +++ climacs/packages.lisp Thu Jan 13 16:34:05 2005 @@ -42,13 +42,15 @@ (defpackage :climacs-base (:use :clim-lisp :climacs-buffer) - (:export #:forward-object #:backward-object + (:export #:do-buffer-region + #:forward-object #:backward-object #:previous-line #:next-line #:open-line #:kill-line #:number-of-lines-in-region #:constituentp #:whitespacep #:forward-word #:backward-word #:delete-word #:backward-delete-word + #:upcase-region #:downcase-region #:capitalize-region #:upcase-word #:downcase-word #:capitalize-word #:input-from-stream #:output-to-stream #:name-mixin #:name

1 0

[climacs-cvs] CVS update: climacs/buffer.lisp
by mvilleneuve＠common-lisp.net 13 Jan '05

13 Jan '05

Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv6911 Modified Files: buffer.lisp Log Message: Added a (setf buffer-object) method Date: Thu Jan 13 16:31:12 2005 Author: mvilleneuve Index: climacs/buffer.lisp diff -u climacs/buffer.lisp:1.17 climacs/buffer.lisp:1.18 --- climacs/buffer.lisp:1.17 Sun Jan 9 12:54:50 2005 +++ climacs/buffer.lisp Thu Jan 13 16:31:11 2005 @@ -410,6 +410,16 @@ (make-condition 'no-such-offset :offset offset)) (element* (slot-value buffer 'contents) offset)) +(defgeneric (setf buffer-object) (object buffer offset) + (:documentation "Set the object at the offset in the buffer. The first object +has offset 0. If offset is less than zero or greater than or equal to +the size of the buffer, a no-such-offset condition is signaled.")) + +(defmethod (setf buffer-object) (object (buffer standard-buffer) offset) + (assert (<= 0 offset (1- (size buffer))) () + (make-condition 'no-such-offset :offset offset)) + (setf (element* (slot-value buffer 'contents) offset) object)) + (defgeneric buffer-sequence (buffer offset1 offset2) (:documentation "Return the contents of the buffer starting at offset1 and ending at offset2-1 as a sequence. If either of the offsets is less than zero @@ -464,6 +474,14 @@ ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; ;;; Buffer modification protocol + +(defmethod (setf buffer-object) :before (object (buffer standard-buffer) offset) + (declare (ignore object)) + (setf (offset (low-mark buffer)) + (min (offset (low-mark buffer)) offset)) + (setf (offset (high-mark buffer)) + (max (offset (high-mark buffer)) offset)) + (setf (slot-value buffer 'modified) t)) (defmethod insert-buffer-object :before ((buffer standard-buffer) offset object) (declare (ignore object))

1 0

[climacs-cvs] CVS update: climacs/abbrev.lisp climacs/gui.lisp climacs/packages.lisp climacs/syntax.lisp
by rstrandh＠common-lisp.net 13 Jan '05

13 Jan '05

Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv9121 Modified Files: abbrev.lisp gui.lisp packages.lisp syntax.lisp Log Message: Fixed up abbrevs somewhat. Made the cursor wider, so easier to find. Added new command `Load File'. Date: Thu Jan 13 06:38:41 2005 Author: rstrandh Index: climacs/abbrev.lisp diff -u climacs/abbrev.lisp:1.5 climacs/abbrev.lisp:1.6 --- climacs/abbrev.lisp:1.5 Fri Dec 31 07:39:21 2004 +++ climacs/abbrev.lisp Thu Jan 13 06:38:40 2005 @@ -50,6 +50,9 @@ (defgeneric add-abbrev (word expansion dictionary-abbrev-expander) (:documentation "Add an abbrev expansion to a dictionary abbrev expander")) +(defmethod add-abbrev (word expansion (expander dictionary-abbrev-expander)) + (push (cons word expansion) (dictionary expander))) + (defun string-upper-case-p (string) "A predicate testing if each character of a string is uppercase." (every #'upper-case-p string)) @@ -74,7 +77,8 @@ (loop until (zerop offset1) while (constituentp (buffer-object buffer (1- offset1))) do (decf offset1)) - (let ((expansion (expand-abbrev (buffer-sequence buffer offset1 offset2) + (let ((expansion (expand-abbrev (coerce (buffer-sequence buffer offset1 offset2) + 'string) (abbrev-expander buffer)))) (when expansion (delete-buffer-range buffer offset1 (- offset2 offset1)) Index: climacs/gui.lisp diff -u climacs/gui.lisp:1.62 climacs/gui.lisp:1.63 --- climacs/gui.lisp:1.62 Wed Jan 12 17:41:16 2005 +++ climacs/gui.lisp Thu Jan 13 06:38:41 2005 @@ -525,6 +525,11 @@ (needs-saving buffer) nil) (display-message "Wrote: ~a" (filename buffer)))) +(define-named-command com-load-file () + (let ((filename (accept 'completable-pathname + :prompt "Load File"))) + (load filename))) + (define-named-command com-beginning-of-buffer () (beginning-of-buffer (point (win *application-frame*)))) @@ -745,6 +750,7 @@ (c-x-set-key '(#\c :control) 'com-quit) (c-x-set-key '(#\f :control) 'com-find-file) +(c-x-set-key '(#\l :control) 'com-load-file) (c-x-set-key '(#\s :control) 'com-save-buffer) (c-x-set-key '(#\t :control) 'com-transpose-lines) (c-x-set-key '(#\w :control) 'com-write-buffer) Index: climacs/packages.lisp diff -u climacs/packages.lisp:1.26 climacs/packages.lisp:1.27 --- climacs/packages.lisp:1.26 Sun Jan 9 15:08:27 2005 +++ climacs/packages.lisp Thu Jan 13 06:38:41 2005 @@ -59,7 +59,8 @@ (defpackage :climacs-abbrev (:use :clim-lisp :clim :climacs-buffer :climacs-base) (:export #:abbrev-expander #:dictionary-abbrev-expander #:dictionary - #:expand-abbrev #:abbrev-mixin #:possibly-expand-abbrev)) + #:expand-abbrev #:abbrev-mixin #:possibly-expand-abbrev + #:add-abbrev)) (defpackage :climacs-syntax (:use :clim-lisp :clim :climacs-buffer :climacs-base :flexichain) Index: climacs/syntax.lisp diff -u climacs/syntax.lisp:1.22 climacs/syntax.lisp:1.23 --- climacs/syntax.lisp:1.22 Wed Jan 12 17:41:17 2005 +++ climacs/syntax.lisp Thu Jan 13 06:38:41 2005 @@ -305,8 +305,8 @@ cursor-y y))) (updating-output (pane :unique-id -1) (draw-rectangle* pane - cursor-x (- cursor-y (* 0.2 height)) - (1+ cursor-x) (+ cursor-y (* 0.8 height)) + (1- cursor-x) (- cursor-y (* 0.2 height)) + (+ cursor-x 2) (+ cursor-y (* 0.8 height)) :ink +red+))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;

1 0

[climacs-cvs] CVS update: climacs/gui.lisp climacs/syntax.lisp
by rstrandh＠common-lisp.net 12 Jan '05

12 Jan '05

Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv1612 Modified Files: gui.lisp syntax.lisp Log Message: * added numeric arguments. This feature requires a CVS version of McCLIM as of 2005-01-11. Only a few commands take numeric arguments at the moment such as forward-object, backward-object, delete-object, and backward-delete-object. There are more to come. * the cursor display problem has been "fixed" by drawing a rectangle rather than a line. This makes obsolete the hacky code for explicit rounding of cursor coordinates. Date: Wed Jan 12 17:41:17 2005 Author: rstrandh Index: climacs/gui.lisp diff -u climacs/gui.lisp:1.61 climacs/gui.lisp:1.62 --- climacs/gui.lisp:1.61 Mon Jan 10 06:31:16 2005 +++ climacs/gui.lisp Wed Jan 12 17:41:16 2005 @@ -71,15 +71,17 @@ :name 'win :incremental-redisplay t :display-function 'display-win)) - (info :application - :width 900 :height 20 :max-height 20 - :name 'info :background +light-gray+ - :scroll-bars nil - :incremental-redisplay t - :display-function 'display-info) - (int (make-pane 'minibuffer-pane - :width 900 :height 20 :max-height 20 :min-height 20 - :scroll-bars nil))) + + (info :application + :width 900 :height 20 :max-height 20 + :name 'info :background +light-gray+ + :scroll-bars nil + :borders nil + :incremental-redisplay t + :display-function 'display-info) + (int (make-pane 'minibuffer-pane + :width 900 :height 20 :max-height 20 :min-height 20 + :scroll-bars nil))) (:layouts (default (vertically (:scroll-bars nil) @@ -162,10 +164,10 @@ (defun read-numeric-argument (&key (stream *standard-input*)) (let ((gesture (climacs-read-gesture))) - (cond ((event-matches-gesture-name-p gesture '(#\u :control)) + (cond ((event-matches-gesture-name-p gesture '(:keyboard #\u 512)) ; FIXME (let ((numarg 4)) (loop for gesture = (climacs-read-gesture) - while (event-matches-gesture-name-p gesture '(#\u :control)) + while (event-matches-gesture-name-p gesture '(:keyboard #\u 512)) ; FIXME do (setf numarg (* 4 numarg)) finally (unread-gesture gesture :stream stream)) (let ((gesture (climacs-read-gesture))) @@ -175,11 +177,12 @@ (loop for gesture = (climacs-read-gesture) while (and (characterp gesture) (digit-char-p gesture 10)) - do (setf gesture (+ (* 10 numarg) - (- (char-code gesture) (char-code #\0)))) + do (setf numarg (+ (* 10 numarg) + (- (char-code gesture) (char-code #\0)))) finally (unread-gesture gesture :stream stream) (return (values numarg t)))) (t + (unread-gesture gesture :stream stream) (values numarg t)))))) ((meta-digit gesture) (let ((numarg (meta-digit gesture))) @@ -202,29 +205,29 @@ (*abort-gestures* nil)) (redisplay-frame-panes frame :force-p t) (loop (catch 'outer-loop - (loop with gestures = '() - with numarg = 1 ; FIXME (read-numeric-argument :stream *standard-input*) - do (setf *current-gesture* (climacs-read-gesture)) - (setf gestures (nconc gestures (list *current-gesture*))) - (let ((item (find-gestures gestures 'global-climacs-table))) - (cond ((not item) - (beep) (setf gestures '())) - ((eq (command-menu-item-type item) :command) - (let ((command (command-menu-item-value item))) - (unless (consp command) - (setf command (list command))) - (setf command (substitute-numeric-argument-marker command numarg)) - (handler-case - (execute-frame-command frame command) - (error (condition) - (beep) - (format *error-output* "~a~%" condition))) - (setf gestures '()) - (setf (previous-command *standard-output*) - (if (consp command) - (car command) - command)))) - (t nil))) + (loop for gestures = '() + for numarg = (read-numeric-argument :stream *standard-input*) + do (loop (setf *current-gesture* (climacs-read-gesture)) + (setf gestures (nconc gestures (list *current-gesture*))) + (let ((item (find-gestures gestures 'global-climacs-table))) + (cond ((not item) + (beep) (return)) + ((eq (command-menu-item-type item) :command) + (let ((command (command-menu-item-value item))) + (unless (consp command) + (setf command (list command))) + (setf command (substitute-numeric-argument-marker command numarg)) + (handler-case + (execute-frame-command frame command) + (error (condition) + (beep) + (format *error-output* "~a~%" condition))) + (setf (previous-command *standard-output*) + (if (consp command) + (car command) + command)) + (return))) + (t nil)))) (let ((buffer (buffer (win frame)))) (when (modified-p buffer) (setf (needs-saving buffer) t))) @@ -236,7 +239,9 @@ (redisplay-frame-panes frame)))) (defmacro define-named-command (command-name args &body body) - `(define-climacs-command ,(if (listp command-name) `(,@command-name :name t) `(,command-name :name t)) ,args ,@body)) + `(define-climacs-command ,(if (listp command-name) + `(,@command-name :name t) + `(,command-name :name t)) ,args ,@body)) (define-named-command (com-quit) () (frame-exit *application-frame*)) @@ -260,11 +265,11 @@ (define-named-command com-end-of-line () (end-of-line (point (win *application-frame*)))) -(define-named-command com-delete-object () - (delete-range (point (win *application-frame*)))) +(define-named-command com-delete-object ((count 'integer :prompt "Number of Objects")) + (delete-range (point (win *application-frame*)) count)) -(define-named-command com-backward-delete-object () - (delete-range (point (win *application-frame*)) -1)) +(define-named-command com-backward-delete-object ((count 'integer :prompt "Number of Objects")) + (delete-range (point (win *application-frame*)) (- count))) (define-named-command com-transpose-objects () (let* ((point (point (win *application-frame*)))) @@ -277,11 +282,11 @@ (insert-object point object) (forward-object point))))) -(define-named-command com-backward-object () - (backward-object (point (win *application-frame*)))) +(define-named-command com-backward-object ((count 'integer :prompt "Number of Objects")) + (backward-object (point (win *application-frame*)) count)) -(define-named-command com-forward-object () - (forward-object (point (win *application-frame*)))) +(define-named-command com-forward-object ((count 'integer :prompt "Number of Objects")) + (forward-object (point (win *application-frame*)) count)) (define-named-command com-transpose-words () (let* ((point (point (win *application-frame*)))) @@ -676,11 +681,11 @@ (global-set-key #\newline 'com-self-insert) (global-set-key #\tab 'com-self-insert) -(global-set-key '(#\f :control) 'com-forward-object) -(global-set-key '(#\b :control) 'com-backward-object) +(global-set-key '(#\f :control) `(com-forward-object ,*numeric-argument-marker*)) +(global-set-key '(#\b :control) `(com-backward-object ,*numeric-argument-marker*)) (global-set-key '(#\a :control) 'com-beginning-of-line) (global-set-key '(#\e :control) 'com-end-of-line) -(global-set-key '(#\d :control) 'com-delete-object) +(global-set-key '(#\d :control) `(com-delete-object ,*numeric-argument-marker*)) (global-set-key '(#\p :control) 'com-previous-line) (global-set-key '(#\n :control) 'com-next-line) (global-set-key '(#\o :control) 'com-open-line) @@ -709,8 +714,8 @@ (global-set-key '(:up) 'com-previous-line) (global-set-key '(:down) 'com-next-line) -(global-set-key '(:left) 'com-backward-object) -(global-set-key '(:right) 'com-forward-object) +(global-set-key '(:left) `(com-backward-object ,*numeric-argument-marker*)) +(global-set-key '(:right) `(com-forward-object *numeric-argument-marker*)) (global-set-key '(:left :control) 'com-backward-word) (global-set-key '(:right :control) 'com-forward-word) (global-set-key '(:home) 'com-beginning-of-line) @@ -719,8 +724,8 @@ (global-set-key '(:next) 'com-page-down) (global-set-key '(:home :control) 'com-beginning-of-buffer) (global-set-key '(:end :control) 'com-end-of-buffer) -(global-set-key #\Rubout 'com-delete-object) -(global-set-key #\Backspace 'com-backward-delete-object) +(global-set-key #\Rubout `(com-delete-object ,*numeric-argument-marker*)) +(global-set-key #\Backspace `(com-backward-delete-object ,*numeric-argument-marker*)) (global-set-key '(:insert) 'com-toggle-overwrite-mode) Index: climacs/syntax.lisp diff -u climacs/syntax.lisp:1.21 climacs/syntax.lisp:1.22 --- climacs/syntax.lisp:1.21 Mon Jan 10 06:31:17 2005 +++ climacs/syntax.lisp Wed Jan 12 17:41:17 2005 @@ -279,12 +279,6 @@ (beginning-of-line (point pane)) (empty-cache cache))))) -;;; this one should not be necessary. -(defun round-up (x) - (cond ((zerop x) 2) - ((evenp x) x) - (t (1+ x)))) - (defmethod redisplay-with-syntax (pane (syntax basic-syntax)) (let* ((medium (sheet-medium pane)) (style (medium-text-style medium)) @@ -310,13 +304,10 @@ (setf cursor-x x cursor-y y))) (updating-output (pane :unique-id -1) - (draw-line* pane - ;; cursors with odd or zero x-positions were invisible - ;; so we round them up to even. - ;; We don't know why, though. - (round-up cursor-x) (- cursor-y (* 0.2 height)) - (round-up cursor-x) (+ cursor-y (* 0.8 height)) - :ink +red+))))) + (draw-rectangle* pane + cursor-x (- cursor-y (* 0.2 height)) + (1+ cursor-x) (+ cursor-y (* 0.8 height)) + :ink +red+))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;;

1 0

[climacs-cvs] CVS update: climacs/gui.lisp climacs/syntax.lisp
by rstrandh＠common-lisp.net 10 Jan '05

10 Jan '05

Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv17277 Modified Files: gui.lisp syntax.lisp Log Message: Removed the line number from the status line until we have the better buffer implementation. Right now, this function requires scanning the entire buffer and counting newlines. Fixed adjust-cache so that it doesn't do anything when there has been no modification of the buffer since previous redisplay. Date: Mon Jan 10 06:31:20 2005 Author: rstrandh Index: climacs/gui.lisp diff -u climacs/gui.lisp:1.60 climacs/gui.lisp:1.61 --- climacs/gui.lisp:1.60 Sun Jan 9 15:08:27 2005 +++ climacs/gui.lisp Mon Jan 10 06:31:16 2005 @@ -115,7 +115,7 @@ (name (syntax win)) (if *overwrite-mode* "Ovwrt" - (format nil "L~d" (line-number (point win))))))) + "")))) (princ name-info pane))) (defun display-win (frame pane) Index: climacs/syntax.lisp diff -u climacs/syntax.lisp:1.20 climacs/syntax.lisp:1.21 --- climacs/syntax.lisp:1.20 Sun Jan 9 12:54:50 2005 +++ climacs/syntax.lisp Mon Jan 10 06:31:17 2005 @@ -233,23 +233,24 @@ (and (mark< low-mark top) (>= (number-of-lines-in-region top high-mark) (nb-elements cache)))) (reposition-window pane syntax) - (let* ((n1 (number-of-lines-in-region top low-mark)) - (n2 (1+ (number-of-lines-in-region low-mark high-mark))) - (n3 (number-of-lines-in-region high-mark bot)) - (diff (- (+ n1 n2 n3) (nb-elements cache)))) - (cond ((>= (+ n1 n2 n3) (+ (nb-elements cache) 20)) - (setf (offset bot) (offset top)) - (end-of-line bot) - (loop for i from n1 below (nb-elements cache) - do (setf (element* cache i) nil))) - ((>= diff 0) - (loop repeat diff do (insert* cache n1 nil)) - (loop for i from (+ n1 diff) below (+ n1 n2) - do (setf (element* cache i) nil))) - (t - (loop repeat (- diff) do (delete* cache n1)) - (loop for i from n1 below (+ n1 n2) - do (setf (element* cache i) nil)))))))) + (when (mark>= high-mark low-mark) + (let* ((n1 (number-of-lines-in-region top low-mark)) + (n2 (1+ (number-of-lines-in-region low-mark high-mark))) + (n3 (number-of-lines-in-region high-mark bot)) + (diff (- (+ n1 n2 n3) (nb-elements cache)))) + (cond ((>= (+ n1 n2 n3) (+ (nb-elements cache) 20)) + (setf (offset bot) (offset top)) + (end-of-line bot) + (loop for i from n1 below (nb-elements cache) + do (setf (element* cache i) nil))) + ((>= diff 0) + (loop repeat diff do (insert* cache n1 nil)) + (loop for i from (+ n1 diff) below (+ n1 n2) + do (setf (element* cache i) nil))) + (t + (loop repeat (- diff) do (delete* cache n1)) + (loop for i from n1 below (+ n1 n2) + do (setf (element* cache i) nil))))))))) (adjust-cache-size-and-bot pane syntax)) (defun page-down (pane syntax)

1 0

[climacs-cvs] CVS update: climacs/base.lisp climacs/gui.lisp climacs/packages.lisp
by rstrandh＠common-lisp.net 09 Jan '05

09 Jan '05

Update of /project/climacs/cvsroot/climacs In directory common-lisp.net:/tmp/cvs-serv3491 Modified Files: base.lisp gui.lisp packages.lisp Log Message: upcase, downcase, capitalize words from Rudi Schlatte. Thanks! Date: Sun Jan 9 15:08:27 2005 Author: rstrandh Index: climacs/base.lisp diff -u climacs/base.lisp:1.13 climacs/base.lisp:1.14 --- climacs/base.lisp:1.13 Sun Jan 9 12:54:50 2005 +++ climacs/base.lisp Sun Jan 9 15:08:26 2005 @@ -111,20 +111,28 @@ #+sbcl (sb-impl::whitespacep obj) #-sbcl (member obj '(#\Space #\Tab)))) -(defun forward-word (mark) - "Forward the mark to the next word." +(defun forward-to-word-boundary (mark) + "Forward the mark forward to the beginning of the next word." (loop until (end-of-buffer-p mark) until (constituentp (object-after mark)) - do (incf (offset mark))) + do (incf (offset mark)))) + +(defun backward-to-word-boundary (mark) + "Move the mark backward to the end of the previous word." + (loop until (beginning-of-buffer-p mark) + until (constituentp (object-before mark)) + do (decf (offset mark)))) + +(defun forward-word (mark) + "Forward the mark to the next word." + (forward-to-word-boundary mark) (loop until (end-of-buffer-p mark) while (constituentp (object-after mark)) do (incf (offset mark)))) (defun backward-word (mark) "Shuttle the mark to the start of the previous word." - (loop until (beginning-of-buffer-p mark) - until (constituentp (object-before mark)) - do (decf (offset mark))) + (backward-to-word-boundary mark) (loop until (beginning-of-buffer-p mark) while (constituentp (object-before mark)) do (decf (offset mark)))) @@ -155,6 +163,45 @@ (constituentp (buffer-object (buffer mark) (1- i)))) finally (return i)) mark)) + +(defun downcase-word (mark &optional (n 1)) + "Convert the next N words to lowercase, leaving mark after the last word." + (dotimes (i n) + (forward-to-word-boundary mark) + (loop until (end-of-buffer-p mark) + while (constituentp (object-after mark)) + for character = (object-after mark) + if (upper-case-p character) + do (progn (delete-range mark 1) + (insert-object mark (char-downcase character))) + else + do (incf (offset mark))))) + +(defun upcase-word (mark &optional (n 1)) + "Convert the next N words to uppercase, leaving mark after the last word." + (dotimes (i n) + (forward-to-word-boundary mark) + (loop until (end-of-buffer-p mark) + while (constituentp (object-after mark)) + for character = (object-after mark) + when (lower-case-p character) + do (progn + (delete-range mark 1) + (insert-object mark (char-upcase character))) + else + do (incf (offset mark))))) + +(defun capitalize-word (mark &optional (n 1)) + "Capitalize the next N words, leaving mark after the last word." + (dotimes (i n) + (forward-to-word-boundary mark) + (unless (end-of-buffer-p mark) + (let ((character (object-after mark))) + (when (lower-case-p character) + (delete-range mark 1) + (insert-object mark (char-upcase character)))) + (when (constituentp (object-after mark)) + (downcase-word mark))))) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; Index: climacs/gui.lisp diff -u climacs/gui.lisp:1.59 climacs/gui.lisp:1.60 --- climacs/gui.lisp:1.59 Sun Jan 9 12:54:50 2005 +++ climacs/gui.lisp Sun Jan 9 15:08:27 2005 @@ -378,6 +378,15 @@ (define-named-command com-backward-delete-word () (backward-delete-word (point (win *application-frame*)))) +(define-named-command com-upcase-word () + (upcase-word (point (win *application-frame*)))) + +(define-named-command com-downcase-word () + (downcase-word (point (win *application-frame*)))) + +(define-named-command com-capitalize-word () + (capitalize-word (point (win *application-frame*)))) + (define-named-command com-toggle-layout () (setf (frame-current-layout *application-frame*) (if (eq (frame-current-layout *application-frame*) 'default) @@ -683,6 +692,9 @@ (global-set-key '(#\f :meta) 'com-forward-word) (global-set-key '(#\b :meta) 'com-backward-word) (global-set-key '(#\t :meta) 'com-transpose-words) +(global-set-key '(#\u :meta) 'com-upcase-word) +(global-set-key '(#\l :meta) 'com-downcase-word) +(global-set-key '(#\c :meta) 'com-capitalize-word) (global-set-key '(#\x :meta) 'com-extended-command) (global-set-key '(#\y :meta) 'com-rotate-yank) (global-set-key '(#\w :meta) 'com-copy-out) @@ -690,7 +702,6 @@ (global-set-key '(#\v :meta) 'com-page-up) (global-set-key '(#\< :shift :meta) 'com-beginning-of-buffer) (global-set-key '(#\> :shift :meta) 'com-end-of-buffer) -(global-set-key '(#\u :meta) 'com-browse-url) (global-set-key '(#\m :meta) 'com-back-to-indentation) (global-set-key '(#\d :meta) 'com-delete-word) (global-set-key '(#\Backspace :meta) 'com-backward-delete-word) Index: climacs/packages.lisp diff -u climacs/packages.lisp:1.25 climacs/packages.lisp:1.26 --- climacs/packages.lisp:1.25 Sun Jan 9 12:54:50 2005 +++ climacs/packages.lisp Sun Jan 9 15:08:27 2005 @@ -49,6 +49,7 @@ #:constituentp #:whitespacep #:forward-word #:backward-word #:delete-word #:backward-delete-word + #:upcase-word #:downcase-word #:capitalize-word #:input-from-stream #:output-to-stream #:name-mixin #:name #:buffer-lookin-at #:looking-at

1 0