[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] scratch/ess f45542e723: Fix up copyright notices for GNU ELPA
|
From: |
Stefan Monnier |
|
Subject: |
[elpa] scratch/ess f45542e723: Fix up copyright notices for GNU ELPA |
|
Date: |
Thu, 15 Sep 2022 17:30:16 -0400 (EDT) |
branch: scratch/ess
commit f45542e723d7415f5e22bcf39f25e31d055d168c
Author: Stefan Monnier <monnier@iro.umontreal.ca>
Commit: Stefan Monnier <monnier@iro.umontreal.ca>
Fix up copyright notices for GNU ELPA
Includes a few other minor changes, the most important of which is moving a
macro
to fix a miscompilation.
* .gitignore: Add ELPA-generated files.
* doc/ess.texi: Make more use of `ESSVER`.
* targets/travis-install-package.el:
* targets/create-pkg-file.el:
* lisp/obsolete/ess-font-lock.el:
* test/etest/etest.el: Fix up copyright notices.
(etest--push-local-config): Move before first use.
(etest--setup-body, etest--run-test, etest-run): Use `lexical-binding`.
(etest-run): Add FIXME.
(etest--decode-keysequence): Fix quote markup in docstring.
---
.gitignore | 4 ++++
doc/ess.texi | 2 +-
lisp/obsolete/ess-font-lock.el | 3 +--
targets/create-pkg-file.el | 2 ++
targets/travis-install-package.el | 2 ++
test/etest/etest.el | 38 +++++++++++++++++++-------------------
6 files changed, 29 insertions(+), 22 deletions(-)
diff --git a/.gitignore b/.gitignore
index 6642af81f2..559bfee1c3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,7 @@ tmp*
.dependencies
NEWS
ONEWS
+
+# ELPA-generated files
+/ess-autoloads.el
+/ess-pkg.el
diff --git a/doc/ess.texi b/doc/ess.texi
index 369495e869..94fc999467 100644
--- a/doc/ess.texi
+++ b/doc/ess.texi
@@ -57,7 +57,7 @@ ESS version
@top ESS: Emacs Speaks Statistics
ESS version
-@include ../VERSION
+@ESSVER
@display
by A.J. Rossini,
diff --git a/lisp/obsolete/ess-font-lock.el b/lisp/obsolete/ess-font-lock.el
index 298dfd2fbc..b948fd3854 100755
--- a/lisp/obsolete/ess-font-lock.el
+++ b/lisp/obsolete/ess-font-lock.el
@@ -1,7 +1,6 @@
;;; ess-font-lock.el --- font-lock color options
-;; Copyright (C) 2000--2006 A.J. Rossini, Richard M. Heiberger, Martin
-;; Maechler, Kurt Hornik, Rodney Sparapani, and Stephen Eglen.
+;; Copyright (C) 2000-2022 Free Software Foundation, Inc.
;; Author: Richard M. Heiberger <rmh@temple.edu>
;; Created: 06 Feb 2000
diff --git a/targets/create-pkg-file.el b/targets/create-pkg-file.el
index a616147e19..2310a417ca 100644
--- a/targets/create-pkg-file.el
+++ b/targets/create-pkg-file.el
@@ -1,5 +1,7 @@
;;; create-pkg-file.el --- Create ess-pkg.el -*- lexical-binding: t; -*-
+;; Copyright (C) 2018-2022 Free Software Foundation, Inc.
+
;;; Commentary:
;; Creates ess-pkg.el
diff --git a/targets/travis-install-package.el
b/targets/travis-install-package.el
index d86969514f..0292681526 100644
--- a/targets/travis-install-package.el
+++ b/targets/travis-install-package.el
@@ -1,5 +1,7 @@
;;; travis-install-package.el -*- lexical-binding: t; -*-
+;; Copyright (C) 2018-2022 Free Software Foundation, Inc.
+
;;; Commentary:
;; This file simulates a user installing the ess-$VERSION.tar file and
;; then loading ess. It's meant to be used for testing purposes only.
diff --git a/test/etest/etest.el b/test/etest/etest.el
index beba4cbbd7..81a23ed0fe 100644
--- a/test/etest/etest.el
+++ b/test/etest/etest.el
@@ -1,7 +1,6 @@
;;; etest.el --- Emacs behavioural test framework -*- lexical-binding: t; -*-
-;; Copyright (C) 2020 Free Software Foundation, Inc.
-;; Copyright (C) 2014-2015 Oleh Krehel
+;; Copyright (C) 2014-2022 Free Software Foundation, Inc.
;; Author:
;; Lionel Henry <lionel.hry@gmail.com>
@@ -34,6 +33,18 @@ contents.")
List of etest keywords and commands, e.g. an `:init' spec to set
up a particular mode.")
+;; Evaluate symbols to make it easier to set local variables
+(defmacro etest--push-local-config (place)
+ `(unless (eq (car ,place) :config)
+ (let ((etest--config (cond ((not etest-local-config)
+ nil)
+ ((symbolp etest-local-config)
+ (eval etest-local-config t))
+ (t
+ etest-local-config))))
+ (when etest--config
+ (setq ,place (append etest--config ,place))))))
+
(cl-defmacro etest-deftest (name args &body body)
(declare (doc-string 3)
(indent 2))
@@ -51,7 +62,7 @@ up a particular mode.")
`(progn
(when (eq (car ,place) :config)
(pop ,place)
- (setq ,place (append (eval (pop ,place)) ,place)))
+ (setq ,place (append (eval (pop ,place) t) ,place)))
(etest--pop-init ,place)))
(defmacro etest--pop-init (place)
@@ -61,18 +72,6 @@ up a particular mode.")
(setq local (append local (pop ,place))))
local))
-;; Evaluate symbols to make it easier to set local variables
-(defmacro etest--push-local-config (place)
- `(unless (eq (car ,place) :config)
- (let ((etest--config (cond ((not etest-local-config)
- nil)
- ((symbolp etest-local-config)
- (eval etest-local-config))
- (t
- etest-local-config))))
- (when etest--config
- (setq ,place (append etest--config ,place))))))
-
(defmacro etest--with-test-buffer (init &rest body)
(declare (indent 1)
(debug (&rest form)))
@@ -121,7 +120,7 @@ and are processed with DO-RESULT."
(let ((etest--key (pop body))
(etest--value (pop body)))
(pcase etest--key
- (`:inf-buffer (setq etest-local-inferior-buffer (eval
etest--value)))
+ (`:inf-buffer (setq etest-local-inferior-buffer (eval
etest--value t)))
(`:cleanup (push etest--value etest--cleanup))
(`:inf-cleanup (push `(progn
,etest--value
@@ -281,10 +280,11 @@ keywords."
;; Krehel in <https://github.com/abo-abo/lispy/blob/master/lispy-test.el>.
;; The main difference is support for multiple cursors.
-(defun etest-run (buf cmds &optional reset-state)
+(defun etest-run (buf cmds &optional _reset-state)
"Run CMDS in BUF.
If RESET-STATE is non-nil, `last-command' and
`current-prefix-arg' are set to nil for all cursors."
+ ;; FIXME: `reset-state' is not used!
(with-current-buffer buf
(goto-char (point-min))
(when (search-forward "×" nil t)
@@ -322,7 +322,7 @@ If RESET-STATE is non-nil, `last-command' and
(eq (car x) 'kbd))
(etest--unalias x))
(t (let ((inhibit-message t))
- (eval x)))))
+ (eval x t)))))
cmds)
(let ((marker (point-marker)))
(set-marker-insertion-type marker t)
@@ -379,7 +379,7 @@ Insert KEY if there's no command."
(setq last-command cmd))))
(defun etest--decode-keysequence (str)
- "Decode STR from e.g. \"23ab5c\" to '(23 \"a\" \"b\" 5 \"c\")"
+ "Decode STR from e.g. \"23ab5c\" to ='(23 \"a\" \"b\" 5 \"c\")"
(let ((table (copy-sequence (syntax-table))))
(cl-loop for i from ?0 to ?9 do
(modify-syntax-entry i "." table))