[clfswm-cvs] [clfswm-git]CLFSWM - A(nother) Common Lisp FullScreen Window Manager branch master updated. R-1212-3-gd414d0b

[Philippe Brochard]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CLFSWM - A(nother) Common Lisp FullScreen Window Manager".

The branch, master has been updated
       via  d414d0b4a92ed04b4197c552aa3d08df477712dc (commit)
      from  d29648229fbd5a0c1ea2c977bb8fe2c9a1d62b5a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit d414d0b4a92ed04b4197c552aa3d08df477712dc
Author: Philippe Brochard <pbrochard at common-lisp.net>
Date:   Wed Dec 19 22:14:27 2012 +0100

    Prevent current-child to be set to nil

diff --git a/src/clfswm-internal.lisp b/src/clfswm-internal.lisp
index 0531d92..d529b3d 100644
--- a/src/clfswm-internal.lisp
+++ b/src/clfswm-internal.lisp
@@ -709,7 +709,7 @@
         (return-from find-child-in-all-root root))))
 
   (defun find-current-root ()
-    (root-child (find-root (current-child))))
+    (root-child (find-root current-child)))
 
   (defun exchange-root-geometry (root-1 root-2)
     (when (and root-1 root-2)
@@ -746,9 +746,10 @@
     current-child)
 
   (defun current-child-setter (value)
-    (awhen (find-root value)
-      (setf (root-current-child it) value))
-    (setf current-child value))
+    (when value
+      (awhen (find-root value)
+        (setf (root-current-child it) value))
+      (setf current-child value)))
 
   (defmacro with-current-child ((new-child) &body body)
     "Temporarly change the current child"
diff --git a/src/version.lisp b/src/version.lisp
index 1866ea0..80d8d1d 100644
--- a/src/version.lisp
+++ b/src/version.lisp
@@ -33,4 +33,4 @@
 
 (in-package :version)
 
-(defparameter *version* #.(concatenate 'string "Version: 1209.2   built " (date-string)))
+(defparameter *version* #.(concatenate 'string "Version: 13??   built " (date-string)))

-----------------------------------------------------------------------

Summary of changes:
 src/clfswm-internal.lisp |    9 +++++----
 src/version.lisp         |    2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CLFSWM - A(nother) Common Lisp FullScreen Window Manager