summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--README.md3
-rw-r--r--cider-compat.el2
-rw-r--r--cider-eldoc.el3
-rw-r--r--cider-interaction.el3
-rw-r--r--cider-macroexpansion.el3
-rw-r--r--cider-mode.el3
-rw-r--r--cider-repl.el3
-rw-r--r--cider-scratch.el1
-rw-r--r--cider-selector.el3
-rw-r--r--cider-util.el3
-rw-r--r--cider.el3
-rw-r--r--nrepl-client.el3
-rw-r--r--test/cider-tests.el23
13 files changed, 33 insertions, 23 deletions
diff --git a/README.md b/README.md
index 3e3c6bcd..91963887 100644
--- a/README.md
+++ b/README.md
@@ -1794,8 +1794,7 @@ $ make test-bytecomp
## License
-Copyright © 2012-2016 Tim King, Phil Hagelberg, Bozhidar Batsov, Hugo
-Duncan, Steve Purcell and
+Copyright © 2012-2016 Tim King, Phil Hagelberg, Bozhidar Batsov, Artur Malabarba and
[contributors](https://github.com/clojure-emacs/cider/contributors).
Distributed under the GNU General Public License, version 3
diff --git a/cider-compat.el b/cider-compat.el
index d551d64f..159602d2 100644
--- a/cider-compat.el
+++ b/cider-compat.el
@@ -1,7 +1,7 @@
;;; cider-compat.el --- Functions from newer Emacs versions for compatibility -*- lexical-binding: t -*-
;; Copyright © 2012-2016 Tim King, Phil Hagelberg
-;; Copyright © 2013-2016 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;; Copyright © 2013-2016 Bozhidar Batsov, Artur Malabarba and CIDER contributors
;;
;; This program is free software: you can redistribute it and/or modify
diff --git a/cider-eldoc.el b/cider-eldoc.el
index 38f957a6..0ba0141a 100644
--- a/cider-eldoc.el
+++ b/cider-eldoc.el
@@ -1,11 +1,12 @@
;;; cider-eldoc.el --- eldoc support for Clojure -*- lexical-binding: t -*-
;; Copyright © 2012-2016 Tim King, Phil Hagelberg
-;; Copyright © 2013-2016 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;; Copyright © 2013-2016 Bozhidar Batsov, Artur Malabarba and CIDER contributors
;;
;; Author: Tim King <kingtim@gmail.com>
;; Phil Hagelberg <technomancy@gmail.com>
;; Bozhidar Batsov <bozhidar@batsov.com>
+;; Artur Malabarba <bruce.connor.am@gmail.com>
;; Hugo Duncan <hugo@hugoduncan.org>
;; Steve Purcell <steve@sanityinc.com>
diff --git a/cider-interaction.el b/cider-interaction.el
index 73237d05..75766838 100644
--- a/cider-interaction.el
+++ b/cider-interaction.el
@@ -1,11 +1,12 @@
;;; cider-interaction.el --- IDE for Clojure -*- lexical-binding: t -*-
;; Copyright © 2012-2016 Tim King, Phil Hagelberg
-;; Copyright © 2013-2016 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;; Copyright © 2013-2016 Bozhidar Batsov, Artur Malabarba and CIDER contributors
;;
;; Author: Tim King <kingtim@gmail.com>
;; Phil Hagelberg <technomancy@gmail.com>
;; Bozhidar Batsov <bozhidar@batsov.com>
+;; Artur Malabarba <bruce.connor.am@gmail.com>
;; Hugo Duncan <hugo@hugoduncan.org>
;; Steve Purcell <steve@sanityinc.com>
diff --git a/cider-macroexpansion.el b/cider-macroexpansion.el
index 3b87d31d..12db2313 100644
--- a/cider-macroexpansion.el
+++ b/cider-macroexpansion.el
@@ -1,11 +1,12 @@
;;; cider-macroexpansion.el --- Macro expansion support -*- lexical-binding: t -*-
;; Copyright © 2012-2016 Tim King, Phil Hagelberg
-;; Copyright © 2013-2016 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;; Copyright © 2013-2016 Bozhidar Batsov, Artur Malabarba and CIDER contributors
;;
;; Author: Tim King <kingtim@gmail.com>
;; Phil Hagelberg <technomancy@gmail.com>
;; Bozhidar Batsov <bozhidar@batsov.com>
+;; Artur Malabarba <bruce.connor.am@gmail.com>
;; Hugo Duncan <hugo@hugoduncan.org>
;; Steve Purcell <steve@sanityinc.com>
diff --git a/cider-mode.el b/cider-mode.el
index 18209302..d3e84471 100644
--- a/cider-mode.el
+++ b/cider-mode.el
@@ -1,11 +1,12 @@
;;; cider-mode.el --- Minor mode for REPL interactions -*- lexical-binding: t -*-
;; Copyright © 2012-2016 Tim King, Phil Hagelberg
-;; Copyright © 2013-2016 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;; Copyright © 2013-2016 Bozhidar Batsov, Artur Malabarba and CIDER contributors
;;
;; Author: Tim King <kingtim@gmail.com>
;; Phil Hagelberg <technomancy@gmail.com>
;; Bozhidar Batsov <bozhidar@batsov.com>
+;; Artur Malabarba <bruce.connor.am@gmail.com>
;; Hugo Duncan <hugo@hugoduncan.org>
;; Steve Purcell <steve@sanityinc.com>
diff --git a/cider-repl.el b/cider-repl.el
index d30ad683..ab72fddb 100644
--- a/cider-repl.el
+++ b/cider-repl.el
@@ -1,11 +1,12 @@
;;; cider-repl.el --- REPL interactions -*- lexical-binding: t -*-
;; Copyright © 2012-2016 Tim King, Phil Hagelberg
-;; Copyright © 2013-2016 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;; Copyright © 2013-2016 Bozhidar Batsov, Artur Malabarba and CIDER contributors
;;
;; Author: Tim King <kingtim@gmail.com>
;; Phil Hagelberg <technomancy@gmail.com>
;; Bozhidar Batsov <bozhidar@batsov.com>
+;; Artur Malabarba <bruce.connor.am@gmail.com>
;; Hugo Duncan <hugo@hugoduncan.org>
;; Steve Purcell <steve@sanityinc.com>
diff --git a/cider-scratch.el b/cider-scratch.el
index 130fcaab..fbb8b594 100644
--- a/cider-scratch.el
+++ b/cider-scratch.el
@@ -5,6 +5,7 @@
;; Author: Tim King <kingtim@gmail.com>
;; Phil Hagelberg <technomancy@gmail.com>
;; Bozhidar Batsov <bozhidar@batsov.com>
+;; Artur Malabarba <bruce.connor.am@gmail.com>
;; Hugo Duncan <hugo@hugoduncan.org>
;; Steve Purcell <steve@sanityinc.com>
diff --git a/cider-selector.el b/cider-selector.el
index 5082e1f0..fdd068b4 100644
--- a/cider-selector.el
+++ b/cider-selector.el
@@ -1,11 +1,12 @@
;;; cider-selector.el --- Buffer selection command inspired by SLIME's selector -*- lexical-binding: t -*-
;; Copyright © 2012-2016 Tim King, Phil Hagelberg
-;; Copyright © 2013-2016 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;; Copyright © 2013-2016 Bozhidar Batsov, Artur Malabarba and CIDER contributors
;;
;; Author: Tim King <kingtim@gmail.com>
;; Phil Hagelberg <technomancy@gmail.com>
;; Bozhidar Batsov <bozhidar@batsov.com>
+;; Artur Malabarba <bruce.connor.am@gmail.com>
;; Hugo Duncan <hugo@hugoduncan.org>
;; Steve Purcell <steve@sanityinc.com>
diff --git a/cider-util.el b/cider-util.el
index b1594950..18d82a02 100644
--- a/cider-util.el
+++ b/cider-util.el
@@ -1,11 +1,12 @@
;;; cider-util.el --- Common utility functions that don't belong anywhere else -*- lexical-binding: t -*-
;; Copyright © 2012-2016 Tim King, Phil Hagelberg
-;; Copyright © 2013-2016 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;; Copyright © 2013-2016 Bozhidar Batsov, Artur Malabarba and CIDER contributors
;;
;; Author: Tim King <kingtim@gmail.com>
;; Phil Hagelberg <technomancy@gmail.com>
;; Bozhidar Batsov <bozhidar@batsov.com>
+;; Artur Malabarba <bruce.connor.am@gmail.com>
;; Hugo Duncan <hugo@hugoduncan.org>
;; Steve Purcell <steve@sanityinc.com>
diff --git a/cider.el b/cider.el
index 4299fde7..7d885e9d 100644
--- a/cider.el
+++ b/cider.el
@@ -1,11 +1,12 @@
;;; cider.el --- Clojure Interactive Development Environment that Rocks -*- lexical-binding: t -*-
;; Copyright © 2012-2016 Tim King, Phil Hagelberg
-;; Copyright © 2013-2016 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;; Copyright © 2013-2016 Bozhidar Batsov, Artur Malabarba and CIDER contributors
;;
;; Author: Tim King <kingtim@gmail.com>
;; Phil Hagelberg <technomancy@gmail.com>
;; Bozhidar Batsov <bozhidar@batsov.com>
+;; Artur Malabarba <bruce.connor.am@gmail.com>
;; Hugo Duncan <hugo@hugoduncan.org>
;; Steve Purcell <steve@sanityinc.com>
;; Maintainer: Bozhidar Batsov <bozhidar@batsov.com>
diff --git a/nrepl-client.el b/nrepl-client.el
index bdab522a..ef6a9db2 100644
--- a/nrepl-client.el
+++ b/nrepl-client.el
@@ -1,11 +1,12 @@
;;; nrepl-client.el --- Client for Clojure nREPL -*- lexical-binding: t -*-
;; Copyright © 2012-2016 Tim King, Phil Hagelberg
-;; Copyright © 2013-2016 Bozhidar Batsov, Hugo Duncan, Steve Purcell
+;; Copyright © 2013-2016 Bozhidar Batsov, Artur Malabarba and CIDER contributors
;;
;; Author: Tim King <kingtim@gmail.com>
;; Phil Hagelberg <technomancy@gmail.com>
;; Bozhidar Batsov <bozhidar@batsov.com>
+;; Artur Malabarba <bruce.connor.am@gmail.com>
;; Hugo Duncan <hugo@hugoduncan.org>
;; Steve Purcell <steve@sanityinc.com>
;;
diff --git a/test/cider-tests.el b/test/cider-tests.el
index 3a5ee25e..063be21c 100644
--- a/test/cider-tests.el
+++ b/test/cider-tests.el
@@ -4,6 +4,7 @@
;; Author: Tim King <kingtim@gmail.com>
;; Bozhidar Batsov <bozhidar@batsov.com>
+;; Artur Malabarba <bruce.connor.am@gmail.com>
;; This file is NOT part of GNU Emacs.
@@ -783,14 +784,14 @@
(ert-deftest cider-expected-ns ()
(noflet ((cider-ensure-connected () t)
(cider-sync-request:classpath () '("/a" "/b" "/c" "/c/inner")))
- (should (string= (cider-expected-ns "/a/foo/bar/baz_utils.clj")
- "foo.bar.baz-utils"))
- (should (string= (cider-expected-ns "/b/foo.clj")
- "foo"))
- (should (string= (cider-expected-ns "/not/in/classpath.clj")
- nil))
- (should (string= (cider-expected-ns "/c/inner/foo/bar.clj")
- ;; NOT inner.foo.bar
- "foo.bar"))
- (should (string= (cider-expected-ns "/c/foo/bar/baz")
- "foo.bar.baz"))))
+ (should (string= (cider-expected-ns "/a/foo/bar/baz_utils.clj")
+ "foo.bar.baz-utils"))
+ (should (string= (cider-expected-ns "/b/foo.clj")
+ "foo"))
+ (should (string= (cider-expected-ns "/not/in/classpath.clj")
+ nil))
+ (should (string= (cider-expected-ns "/c/inner/foo/bar.clj")
+ ;; NOT inner.foo.bar
+ "foo.bar"))
+ (should (string= (cider-expected-ns "/c/foo/bar/baz")
+ "foo.bar.baz"))))
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-30 12:15:18 +0000