[Linedit-cvs] CVS update: src/editor.lisp src/linedit.asd src/terminal-translations.lisp src/utility-functions.lisp src/version.lisp-expr

[Nikodemus Siivola]

Update of /project/linedit/cvsroot/src
In directory common-lisp.net:/tmp/cvs-serv3774

Modified Files:
	editor.lisp linedit.asd terminal-translations.lisp 
	utility-functions.lisp version.lisp-expr 
Log Message:
Be nicer when updating terminal translations in a live system, put linedit::*debug* in a better place.
Date: Mon Apr 12 09:34:50 2004
Author: nsiivola

Index: src/editor.lisp
diff -u src/editor.lisp:1.13 src/editor.lisp:1.14
--- src/editor.lisp:1.13	Fri Mar  5 17:10:59 2004
+++ src/editor.lisp	Mon Apr 12 09:34:50 2004
@@ -29,7 +29,6 @@
 
 (defvar *history* nil)
 (defvar *killring* nil)
-(defvar *debug* nil)
 
 (defclass editor (line rewindable)
   ((commands :reader editor-commands


Index: src/linedit.asd
diff -u src/linedit.asd:1.29 src/linedit.asd:1.30
--- src/linedit.asd:1.29	Mon Apr 12 08:38:41 2004
+++ src/linedit.asd	Mon Apr 12 09:34:50 2004
@@ -54,7 +54,7 @@
     (error 'operation-error :component c :operation o)))
 
 (defsystem :linedit
-    :version "0.15.10"
+    :version "0.15.11"
     :depends-on (:uffi :terminfo :osicat)
     :components
   (;; Common


Index: src/terminal-translations.lisp
diff -u src/terminal-translations.lisp:1.4 src/terminal-translations.lisp:1.5
--- src/terminal-translations.lisp:1.4	Fri Mar  5 04:21:46 2004
+++ src/terminal-translations.lisp	Mon Apr 12 09:34:50 2004
@@ -25,8 +25,9 @@
 
 (defmacro deftrans (name &rest chords)
   `(dolist (chord ',chords)
-     (when (gethash chord *terminal-translations*)
-       (warn "Multiple translations for ~A." chord))
+     (let ((old (gethash chord *terminal-translations*)))
+       (when (and old (not (equal old ,name)))
+	 (warn "Overriding old translation ~S for ~S with ~S." old chord ,name)))
      (setf (gethash chord *terminal-translations*) ,name)))
 
 (deftrans "C-Space" 0)


Index: src/utility-functions.lisp
diff -u src/utility-functions.lisp:1.11 src/utility-functions.lisp:1.12
--- src/utility-functions.lisp:1.11	Mon Apr 12 08:38:41 2004
+++ src/utility-functions.lisp	Mon Apr 12 09:34:50 2004
@@ -24,6 +24,8 @@
 (declaim (type simple-string *word-delimiters*))
 (defparameter *word-delimiters* "()[]{}',` \"")
 
+(defvar *debug* nil)
+
 (defun required ()
   (error "Required argument missing."))
 


Index: src/version.lisp-expr
diff -u src/version.lisp-expr:1.13 src/version.lisp-expr:1.14
--- src/version.lisp-expr:1.13	Mon Apr 12 08:38:41 2004
+++ src/version.lisp-expr	Mon Apr 12 09:34:50 2004
@@ -1 +1 @@
-0.15.10
+0.15.11