Merge commit '243c680396edc99db85cc3152a7bbf020aa7a233' from ace-window

diff --git a/packages/ace-window/ace-window.el b/packages/ace-window/ace-window.el
index a846869fcb7a7d45419f78f2111ebf34c2fb5d1a..4b0a76f695f9432924eb8330e2efb1dc1edec102 100644 (file)
--- a/packages/ace-window/ace-window.el
+++ b/packages/ace-window/ace-window.el
@@ -1,13 +1,14 @@
 ;;; ace-window.el --- Quickly switch windows. -*- lexical-binding: t -*-
 
-;; Copyright (C) 2014-2015 Oleh Krehel
+;; Copyright (C) 2015  Free Software Foundation, Inc.
 
 ;; Author: Oleh Krehel <ohwoeowho@gmail.com>
+;; Maintainer: Oleh Krehel <ohwoeowho@gmail.com>
 ;; URL: https://github.com/abo-abo/ace-window
 ;; Version: 0.8.0
 ;; Keywords: window, location
 
-;; This file is not part of GNU Emacs
+;; This file is part of GNU Emacs.
 
 ;; 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

diff --git a/packages/ace-window/avy-jump.el b/packages/ace-window/avy-jump.el
index 13b610230f774c68b18c729afdd3a571337afcc2..b83f7a8bd7aee6db3dafa46faf3473a252564e85 100644 (file)
--- a/packages/ace-window/avy-jump.el
+++ b/packages/ace-window/avy-jump.el
@@ -1,10 +1,10 @@
 ;;; avy-jump.el --- jump to things tree-style
 
-;; Author: Oleh Krehel <ohwoeowho@gmail.com>
-;; Version: 0.1.0
-;; Keywords: point
+;; Copyright (C) 2015  Free Software Foundation, Inc.
 
-;; This file is not part of GNU Emacs
+;; Author: Oleh Krehel
+
+;; This file is part of GNU Emacs.
 
 ;; 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

diff --git a/packages/ace-window/avy-test.el b/packages/ace-window/avy-test.el
index 84d976640b2267808474baa3633ae7debfe1da06..339d8a06d536ad4f3565e2867a8fa83040fc759d 100644 (file)
--- a/packages/ace-window/avy-test.el
+++ b/packages/ace-window/avy-test.el
@@ -1,3 +1,29 @@
+;;; avy-test.el --- Tests for avy
+
+;; Copyright (C) 2015  Free Software Foundation, Inc.
+
+;; Author: Oleh Krehel
+
+;; This file is part of GNU Emacs.
+
+;; GNU Emacs 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.
+
+;; GNU Emacs 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 GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.
+
+;;; Commentary:
+;;
+
+;;; Code:
+
 (require 'ert)
 (require 'avy)
 

diff --git a/packages/ace-window/avy.el b/packages/ace-window/avy.el
index ebaec20abeb5c75df6974338bbb6d57dd6d6f03f..2f7d086b7ecaa1206bb7a433ba3658e82f22a90e 100644 (file)
--- a/packages/ace-window/avy.el
+++ b/packages/ace-window/avy.el
@@ -1,12 +1,10 @@
 ;;; avy.el --- set-based completion -*- lexical-binding: t -*-
 
-;; Copyright (C) 2015 Oleh Krehel
+;; Copyright (C) 2015  Free Software Foundation, Inc.
 
-;; Author: Oleh Krehel <ohwoeowho@gmail.com>
-;; Version: 0.1.0
-;; Keywords: completion
+;; Author: Oleh Krehel
 
-;; This file is not part of GNU Emacs
+;; This file is part of GNU Emacs.
 
 ;; 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