[climacs-cvs] CVS update: climacs/base.lisp climacs/buffer.lisp climacs/gui.lisp climacs/packages.lisp
Matthieu Villeneuve
mvilleneuve at common-lisp.net
Thu Jan 13 16:52:19 UTC 2005
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 at labri.fr)
-;;; (c) copyright 2004 by
+;;; (c) copyright 2004-2005 by
;;; Elliott Johnson (ejohnson at fasl.info)
+;;; (c) copyright 2005 by
+;;; Matthieu Villeneuve (matthieu.villeneuve at 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 at labri.fr)
-;;; (c) copyright 2004 by
+;;; (c) copyright 2004-2005 by
;;; Elliott Johnson (ejohnson at fasl.info)
+;;; (c) copyright 2005 by
+;;; Matthieu Villeneuve (matthieu.villeneuve at 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 at labri.fr)
-;;; (c) copyright 2004 by
+;;; (c) copyright 2004-2005 by
;;; Elliott Johnson (ejohnson at fasl.info)
+;;; (c) copyright 2005 by
+;;; Matthieu Villeneuve (matthieu.villeneuve at 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 at labri.fr)
+;;; (c) copyright 2005 by
+;;; Matthieu Villeneuve (matthieu.villeneuve at free.fr)
;;; This library is free software; you can redistribute it and/or
;;; modify it under the terms of the GNU Library General Public
More information about the Climacs-cvs
mailing list