Update copyright years plus two style nits

diff --git a/lisp/emacs-lisp/comp.el b/lisp/emacs-lisp/comp.el
index 67fc8f39f8cdcb88d461b2873106a1c1395135e3..80a542257fbefff286d2daa8057072ae1483b9b2 100644 (file)
--- a/lisp/emacs-lisp/comp.el
+++ b/lisp/emacs-lisp/comp.el
@@ -2,7 +2,7 @@
 
 ;; Author: Andrea Corallo <akrl@sdf.com>
 
-;; Copyright (C) 2019 Free Software Foundation, Inc.
+;; Copyright (C) 2019-2020 Free Software Foundation, Inc.
 
 ;; Keywords: lisp
 ;; Package: emacs
@@ -1587,8 +1587,8 @@ PRE-LAMBDA and POST-LAMBDA are called in pre or post-order if non nil."
                ;; Note: this last is just a property of the code generated
                ;; by the byte-compiler.
                (cl-assert (= (comp-mvar-array-idx arg) 0))
-               (setf (comp-mvar-slot arg) i)
-               (setf (comp-mvar-array-idx arg) arr-idx))))
+               (setf (comp-mvar-slot arg) i
+                     (comp-mvar-array-idx arg) arr-idx))))
 
 (defun comp-propagate-prologue (backward)
   "Prologue for the propagate pass.
@@ -1682,8 +1682,8 @@ Here goes everything that can be done not iteratively (read once).
          (cl-loop with slot = (comp-mvar-slot lval)
                   for arg in rest
                   do
-                  (setf (comp-mvar-array-idx arg) arr-idx)
-                  (setf (comp-mvar-slot arg) slot)))))))
+                  (setf (comp-mvar-array-idx arg) arr-idx
+                        (comp-mvar-slot arg) slot)))))))
 
 (defun comp-propagate* ()
   "Propagate for set* and phi operands.

diff --git a/src/comp.c b/src/comp.c
index d95a87b03b18eef873308a79d7d8d877f27953e6..2f24b10bba07132a2d14c9a9c0e12255f4c39952 100644 (file)
--- a/src/comp.c
+++ b/src/comp.c
@@ -1,5 +1,5 @@
 /* Compile elisp into native code.
-   Copyright (C) 2019 Free Software Foundation, Inc.
+   Copyright (C) 2019-2020 Free Software Foundation, Inc.
 
 Author: Andrea Corallo <akrl@sdf.org>
 

diff --git a/src/comp.h b/src/comp.h
index ddebbbcccf0fd463035f4abefb712879ca23b2d2..6019831bc30da812c8b4bcd257225e2fad961e17 100644 (file)
--- a/src/comp.h
+++ b/src/comp.h
@@ -1,5 +1,5 @@
 /* Elisp native compiler definitions
-Copyright (C) 2012-2019 Free Software Foundation, Inc.
+Copyright (C) 2019-2020 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 

diff --git a/test/src/comp-test-funcs.el b/test/src/comp-test-funcs.el
index cbf287838cbd9489a59d04779cde7f4840f6b413..46d324bc42fd7c213b5508184addc2cdd46577b6 100644 (file)
--- a/test/src/comp-test-funcs.el
+++ b/test/src/comp-test-funcs.el
@@ -1,6 +1,6 @@
 ;;; comp-test-funcs.el --- compilation unit tested by comp-tests.el -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2019 Free Software Foundation, Inc.
+;; Copyright (C) 2019-2020 Free Software Foundation, Inc.
 
 ;; Author: Andrea Corallo <akrl@sdf.org>
 

diff --git a/test/src/comp-tests.el b/test/src/comp-tests.el
index 15a39c4e8832cc7b728f266c2682565a461d0e61..fc6543bcaeca1ecdcb4b9c002861416a533229ca 100644 (file)
--- a/test/src/comp-tests.el
+++ b/test/src/comp-tests.el
@@ -1,6 +1,6 @@
 ;;; comp-tests.el --- unit tests for src/comp.c      -*- lexical-binding: t; -*-
 
-;; Copyright (C) 2019 Free Software Foundation, Inc.
+;; Copyright (C) 2019-2020 Free Software Foundation, Inc.
 
 ;; Author: Andrea Corallo <akrl@sdf.org>