23 files changed, 150 insertions, 423 deletions
diff --git a/elisp/geiser-autodoc.el b/elisp/geiser-autodoc.el
index 75f2e7c..4ecb8d9 100644
--- a/elisp/geiser-autodoc.el
+++ b/elisp/geiser-autodoc.el
@@ -2,28 +2,14 @@
 
 ;; Copyright (C) 2009 Jose Antonio Ortega Ruiz
 
-;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
-;; Start date: Sun Feb 08, 2009 19:44
-
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This file is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the Modified BSD License. You should
+;; have received a copy of the license along with this program. If
+;; not, see <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>.
 
-;;; Comentary:
-
-;; A minor mode that echoes information about procedures and variables
-;; near point at the minibuffer.
+;; Start date: Sun Feb 08, 2009 19:44
 
-;;; Code:
+
 
 (require 'geiser-eval)
 (require 'geiser-syntax)
diff --git a/elisp/geiser-base.el b/elisp/geiser-base.el
index fca955a..868288c 100644
--- a/elisp/geiser-base.el
+++ b/elisp/geiser-base.el
@@ -2,29 +2,16 @@
 
 ;; Copyright (C) 2009  Jose Antonio Ortega Ruiz
 
-;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
-;; Keywords: languages, tools
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the Modified BSD License. You should
+;; have received a copy of the license along with this program. If
+;; not, see <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>.
 
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
+
 
 ;; Settings and vars shared by all geiser modules, including little
 ;; utilities and emacsen compatibility bits.
 
-;;; Code:
-
 ;;; Emacs compatibility:
 
 (require 'cl)
diff --git a/elisp/geiser-company.el b/elisp/geiser-company.el
index 37c2196..55a3097 100644
--- a/elisp/geiser-company.el
+++ b/elisp/geiser-company.el
@@ -2,23 +2,14 @@
 
 ;; Copyright (C) 2009 Jose Antonio Ortega Ruiz
 
-;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
-;; Start date: Mon Aug 24, 2009 12:44
-
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This file is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the Modified BSD License. You should
+;; have received a copy of the license along with this program. If
+;; not, see <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>.
 
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; Start date: Mon Aug 24, 2009 12:44
 
-;;; Code:
+
 
 (require 'geiser-autodoc)
 (require 'geiser-completion)
diff --git a/elisp/geiser-compile.el b/elisp/geiser-compile.el
index 4e9e8cb..8260b34 100644
--- a/elisp/geiser-compile.el
+++ b/elisp/geiser-compile.el
@@ -2,27 +2,14 @@
 
 ;; Copyright (C) 2009 Jose Antonio Ortega Ruiz
 
-;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
-;; Start date: Wed Feb 11, 2009 00:16
-
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This file is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the Modified BSD License. You should
+;; have received a copy of the license along with this program. If
+;; not, see <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>.
 
-;;; Comentary:
-
-;; Functions to compile and load Scheme files.
+;; Start date: Wed Feb 11, 2009 00:16
 
-;;; Code:
+
 
 (require 'geiser-debug)
 (require 'geiser-eval)
diff --git a/elisp/geiser-completion.el b/elisp/geiser-completion.el
index e3bd74b..99a3cfc 100644
--- a/elisp/geiser-completion.el
+++ b/elisp/geiser-completion.el
@@ -1,28 +1,15 @@
-;; geiser-completion.el -- tab completion
+;;; geiser-completion.el -- tab completion
 
 ;; Copyright (C) 2009 Jose Antonio Ortega Ruiz
 
-;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
-;; Start date: Mon Feb 09, 2009 22:21
-
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This file is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the Modified BSD License. You should
+;; have received a copy of the license along with this program. If
+;; not, see <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>.
 
-;;; Comentary:
-
-;; Utilities for completing symbol at point in Guile buffers.
+;; Start date: Mon Feb 09, 2009 22:21
 
-;;; Code:
+
 
 (require 'geiser-eval)
 (require 'geiser-log)
diff --git a/elisp/geiser-connection.el b/elisp/geiser-connection.el
index 4f8592b..af4c611 100644
--- a/elisp/geiser-connection.el
+++ b/elisp/geiser-connection.el
@@ -1,30 +1,19 @@
-;; geiser-connection.el -- talking to a guile process
+;;; geiser-connection.el -- talking to a scheme process
 
 ;; Copyright (C) 2009 Jose Antonio Ortega Ruiz
 
-;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
-;; Start date: Sat Feb 07, 2009 21:11
-
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This file is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the Modified BSD License. You should
+;; have received a copy of the license along with this program. If
+;; not, see <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>.
 
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; Start date: Sat Feb 07, 2009 21:11
 
-;;; Comentary:
+
 
 ;; Connection datatype and functions for managing request queues
 ;; between emacs and inferior guile processes.
 
-;;; Code:
-
 (require 'geiser-log)
 (require 'geiser-syntax)
 (require 'geiser-base)
diff --git a/elisp/geiser-custom.el b/elisp/geiser-custom.el
index 78ee79d..0b3460f 100644
--- a/elisp/geiser-custom.el
+++ b/elisp/geiser-custom.el
@@ -1,28 +1,15 @@
-;; geiser-custom.el -- customization
+;;; geiser-custom.el -- customization utilities
 
 ;; Copyright (C) 2009 Jose Antonio Ortega Ruiz
 
-;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
-;; Start date: Sat Feb 14, 2009 21:49
-
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This file is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the Modified BSD License. You should
+;; have received a copy of the license along with this program. If
+;; not, see <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>.
 
-;;; Comentary:
-
-;; Utilities for handling custom variables and faces.
+;; Start date: Sat Feb 14, 2009 21:49
 
-;;; Code:
+
 
 (require 'font-lock)
 (require 'geiser-base)
diff --git a/elisp/geiser-debug.el b/elisp/geiser-debug.el
index 6d795df..62b3ead 100644
--- a/elisp/geiser-debug.el
+++ b/elisp/geiser-debug.el
@@ -1,29 +1,15 @@
-;; geiser-debug.el -- displaying debug information
+;;; geiser-debug.el -- displaying debug information and evaluation results
 
 ;; Copyright (C) 2009 Jose Antonio Ortega Ruiz
 
-;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
-;; Start date: Mon Feb 23, 2009 22:34
-
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This file is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the Modified BSD License. You should
+;; have received a copy of the license along with this program. If
+;; not, see <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>.
 
-;;; Comentary:
-
-;; Buffer and associated mode for displaying results of evaluations
-;; and compilations.
+;; Start date: Mon Feb 23, 2009 22:34
 
-;;; Code:
+
 
 (require 'geiser-impl)
 (require 'geiser-eval)
diff --git a/elisp/geiser-doc.el b/elisp/geiser-doc.el
index 29f0de2..977b074 100644
--- a/elisp/geiser-doc.el
+++ b/elisp/geiser-doc.el
@@ -1,28 +1,15 @@
-;; geiser-doc.el -- accessing documentation
+;;; geiser-doc.el -- accessing scheme-provided documentation
 
 ;; Copyright (C) 2009 Jose Antonio Ortega Ruiz
 
-;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
-;; Start date: Sat Feb 14, 2009 14:09
-
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This file is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the Modified BSD License. You should
+;; have received a copy of the license along with this program. If
+;; not, see <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>.
 
-;;; Comentary:
-
-;; Utilities for accessing docstrings and texinfo documentation.
+;; Start date: Sat Feb 14, 2009 14:09
 
-;;; Code:
+
 
 (require 'geiser-impl)
 (require 'geiser-completion)
diff --git a/elisp/geiser-edit.el b/elisp/geiser-edit.el
index 0ec1669..156493a 100644
--- a/elisp/geiser-edit.el
+++ b/elisp/geiser-edit.el
@@ -1,28 +1,15 @@
-;; geiser-edit.el -- visiting source files
+;;; geiser-edit.el -- scheme edit locations
 
 ;; Copyright (C) 2009 Jose Antonio Ortega Ruiz
 
-;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
-;; Start date: Wed Feb 11, 2009 21:07
-
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This file is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the Modified BSD License. You should
+;; have received a copy of the license along with this program. If
+;; not, see <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>.
 
-;;; Comentary:
-
-;; Functions to access Scheme files and spots.
+;; Start date: Wed Feb 11, 2009 21:07
 
-;;; Code:
+
 
 (require 'geiser-completion)
 (require 'geiser-eval)
@@ -32,7 +19,7 @@
 (require 'etags)
 
 
-;;; Customization
+;;; Customization:
 
 (defmacro geiser-edit--define-custom-visit (var group doc)
   `(defcustom ,var nil
diff --git a/elisp/geiser-eval.el b/elisp/geiser-eval.el
index 1c8cbfe..402e261 100644
--- a/elisp/geiser-eval.el
+++ b/elisp/geiser-eval.el
@@ -1,29 +1,18 @@
-;; geiser-eval.el -- sending scheme code for evaluation
+;;; geiser-eval.el -- sending scheme code for evaluation
 
 ;; Copyright (C) 2009 Jose Antonio Ortega Ruiz
 
-;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
-;; Start date: Sat Feb 07, 2009 22:35
-
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This file is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the Modified BSD License. You should
+;; have received a copy of the license along with this program. If
+;; not, see <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>.
 
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Comentary:
+;; Start date: Sat Feb 07, 2009 22:35
 
 ;; Functions, building on top of geiser-connection, to evaluate scheme
 ;; code.
 
-;;; Code:
+
 
 (require 'geiser-connection)
 (require 'geiser-syntax)
diff --git a/elisp/geiser-guile.el b/elisp/geiser-guile.el
index ed14e87..489dc63 100644
--- a/elisp/geiser-guile.el
+++ b/elisp/geiser-guile.el
@@ -2,27 +2,14 @@
 
 ;; Copyright (C) 2009 Jose Antonio Ortega Ruiz
 
-;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
-;; Start date: Sun Mar 08, 2009 23:03
-
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This file is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the Modified BSD License. You should
+;; have received a copy of the license along with this program. If
+;; not, see <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>.
 
-;;; Comentary:
-
-;; Implementation of all required Elisp Geiser protocols for Guile.
+;; Start date: Sun Mar 08, 2009 23:03
 
-;;; Code:
+
 
 (require 'geiser-syntax)
 (require 'geiser-custom)
diff --git a/elisp/geiser-impl.el b/elisp/geiser-impl.el
index 00fa1ef..1725907 100644
--- a/elisp/geiser-impl.el
+++ b/elisp/geiser-impl.el
@@ -2,28 +2,14 @@
 
 ;; Copyright (C) 2009 Jose Antonio Ortega Ruiz
 
-;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
-;; Start date: Sat Mar 07, 2009 23:32
-
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This file is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the Modified BSD License. You should
+;; have received a copy of the license along with this program. If
+;; not, see <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>.
 
-;;; Comentary:
-
-;; Functions to handle setup of Scheme implementations supported by
-;; Geiser.
+;; Start date: Sat Mar 07, 2009 23:32
 
-;;; Code:
+
 
 (require 'geiser-eval)
 (require 'geiser-base)
diff --git a/elisp/geiser-log.el b/elisp/geiser-log.el
index 27a485a..150e6f3 100644
--- a/elisp/geiser-log.el
+++ b/elisp/geiser-log.el
@@ -2,29 +2,18 @@
 
 ;; Copyright (C) 2009 Jose Antonio Ortega Ruiz
 
-;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
-;; Start date: Sat Feb 07, 2009 12:07
-
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This file is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the Modified BSD License. You should
+;; have received a copy of the license along with this program. If
+;; not, see <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>.
 
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; Start date: Sat Feb 07, 2009 12:07
 
-;;; Comentary:
+
 
 ;; Some utilities for maintaining a simple log buffer, mainly for
 ;; debugging purposes.
 
-;;; Code:
-
 (require 'geiser-popup)
 (require 'geiser-base)
 
diff --git a/elisp/geiser-mode.el b/elisp/geiser-mode.el
index fa686ec..a1e2e30 100644
--- a/elisp/geiser-mode.el
+++ b/elisp/geiser-mode.el
@@ -2,28 +2,14 @@
 
 ;; Copyright (C) 2009 Jose Antonio Ortega Ruiz
 
-;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
-;; Start date: Sun Feb 08, 2009 15:13
-
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This file is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the Modified BSD License. You should
+;; have received a copy of the license along with this program. If
+;; not, see <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>.
 
-;;; Comentary:
-
-;; Minor mode adding Geiser REPL/Emacs interaction commands to Scheme
-;; buffers.
+;; Start date: Sun Feb 08, 2009 15:13
 
-;;; Code:
+
 
 (require 'geiser-doc)
 (require 'geiser-compile)
diff --git a/elisp/geiser-plt.el b/elisp/geiser-plt.el
index 8810250..ab194b7 100644
--- a/elisp/geiser-plt.el
+++ b/elisp/geiser-plt.el
@@ -2,27 +2,14 @@
 
 ;; Copyright (C) 2009 Jose Antonio Ortega Ruiz
 
-;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
-;; Start date: Sat Apr 25, 2009 21:13
-
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This file is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the Modified BSD License. You should
+;; have received a copy of the license along with this program. If
+;; not, see <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>.
 
-;;; Comentary:
-
-;; Implementation of Geiser's protocols for MzScheme.
+;; Start date: Sat Apr 25, 2009 21:13
 
-;;; Code:
+
 
 (require 'geiser-edit)
 (require 'geiser-doc)
diff --git a/elisp/geiser-popup.el b/elisp/geiser-popup.el
index 486d1d8..0fa14f1 100644
--- a/elisp/geiser-popup.el
+++ b/elisp/geiser-popup.el
@@ -2,28 +2,14 @@
 
 ;; Copyright (C) 2009 Jose Antonio Ortega Ruiz
 
-;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
-;; Start date: Sat Feb 07, 2009 14:05
-
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This file is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the Modified BSD License. You should
+;; have received a copy of the license along with this program. If
+;; not, see <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>.
 
-;;; Comentary:
-
-;; Utilities for defining pop-up windows that get easily out of the
-;; way.
+;; Start date: Sat Feb 07, 2009 14:05
 
-;;; Code:
+
 
 (make-variable-buffer-local
  (defvar geiser-popup--created-window nil))
diff --git a/elisp/geiser-reload.el b/elisp/geiser-reload.el
index 5a30e1f..80d6a17 100644
--- a/elisp/geiser-reload.el
+++ b/elisp/geiser-reload.el
@@ -2,23 +2,14 @@
 
 ;; Copyright (C) 2009 Jose Antonio Ortega Ruiz
 
-;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
-;; Start date: Sat Aug 22, 2009 23:04
-
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This file is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the Modified BSD License. You should
+;; have received a copy of the license along with this program. If
+;; not, see <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>.
 
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; Start date: Sat Aug 22, 2009 23:04
 
-;;; Code:
+
 
 (require 'geiser-impl)
 (require 'geiser-repl)
diff --git a/elisp/geiser-repl.el b/elisp/geiser-repl.el
index b75fe78..fe2f6a4 100644
--- a/elisp/geiser-repl.el
+++ b/elisp/geiser-repl.el
@@ -1,28 +1,13 @@
 ;;; geiser-repl.el --- Geiser's REPL
 
-;; Copyright (C) 2009  Jose Antonio Ortega Ruiz
+;; Copyright (C) 2009 Jose Antonio Ortega Ruiz
 
-;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
-;; Keywords: languages, tools
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the Modified BSD License. You should
+;; have received a copy of the license along with this program. If
+;; not, see <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>.
 
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
-
-;; Major mode (comint-based) to interact with a Scheme REPL.
-
-;;; Code:
+
 
 (require 'geiser-company)
 (require 'geiser-autodoc)
diff --git a/elisp/geiser-syntax.el b/elisp/geiser-syntax.el
index b2233cf..7dfcefc 100644
--- a/elisp/geiser-syntax.el
+++ b/elisp/geiser-syntax.el
@@ -1,28 +1,15 @@
-;; geiser-syntax.el -- guile-specific scheme syntax
+;;; geiser-syntax.el -- utilities for parsing scheme syntax
 
 ;; Copyright (C) 2009 Jose Antonio Ortega Ruiz
 
-;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
-;; Start date: Sun Feb 08, 2009 15:03
-
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This file is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the Modified BSD License. You should
+;; have received a copy of the license along with this program. If
+;; not, see <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>.
 
-;;; Comentary:
-
-;; Utilities for parsing Guile-specific Scheme syntax.
+;; Start date: Sun Feb 08, 2009 15:03
 
-;;; Code:
+
 
 (require 'geiser-popup)
 (require 'geiser-base)
diff --git a/elisp/geiser-version.el.in b/elisp/geiser-version.el.in
index 5b1258b..f5a1348 100644
--- a/elisp/geiser-version.el.in
+++ b/elisp/geiser-version.el.in
@@ -1,5 +1,13 @@
+;;; geiser-version.el.in -- geiser's version
+
+;; Copyright (C) 2009 Jose Antonio Ortega Ruiz
+
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the Modified BSD License. You should
+;; have received a copy of the license along with this program. If
+;; not, see <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>.
+
 
-;;; Versioning:
 
 (defvar geiser-version-string "@PACKAGE_STRING@"
   "Geiser's version as a string.")
diff --git a/elisp/geiser-xref.el b/elisp/geiser-xref.el
index f85c2f1..d351c63 100644
--- a/elisp/geiser-xref.el
+++ b/elisp/geiser-xref.el
@@ -2,27 +2,14 @@
 
 ;; Copyright (C) 2009 Jose Antonio Ortega Ruiz
 
-;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
-;; Start date: Thu Mar 05, 2009 23:03
-
-;; This file is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation; either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This file is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the Modified BSD License. You should
+;; have received a copy of the license along with this program. If
+;; not, see <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>.
 
-;;; Comentary:
-
-;; Obtaining cross-reference information (generic's methods, callers, etc.)
+;; Start date: Thu Mar 05, 2009 23:03
 
-;;; Code:
+
 
 (require' geiser-edit)
 (require 'geiser-eval)
diff --git a/elisp/geiser.el b/elisp/geiser.el
index 64d4efb..ea973fa 100644
--- a/elisp/geiser.el
+++ b/elisp/geiser.el
@@ -1,30 +1,15 @@
-;;; geiser.el --- main geiser file
+;;; geiser.el -- main geiser file
 
-;; Copyright (C) 2009  Jose Antonio Ortega Ruiz
+;; Copyright (C) 2009 Jose Antonio Ortega Ruiz
 
-;; Author: Jose Antonio Ortega Ruiz <jao@gnu.org>
-;; Keywords: languages, tools
-
-;; This program is free software; you can redistribute it and/or modify
-;; it under the terms of the GNU General Public License as published by
-;; the Free Software Foundation, either version 3 of the License, or
-;; (at your option) any later version.
-
-;; This program is distributed in the hope that it will be useful,
-;; but WITHOUT ANY WARRANTY; without even the implied warranty of
-;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-;; GNU General Public License for more details.
-
-;; You should have received a copy of the GNU General Public License
-;; along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-;;; Commentary:
+;; This program is free software; you can redistribute it and/or
+;; modify it under the terms of the Modified BSD License. You should
+;; have received a copy of the license along with this program. If
+;; not, see <http://www.xfree86.org/3.3.6/COPYRIGHT2.html#5>.
 
+
 ;; Autoloads and basic setup for geiser.
 
-;;; Code:
-
-
 ;;; Locations:
 
 (defvar geiser-elisp-dir nil