emacs-elpa-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[elpa] externals/counsel ebf380fc34: Merge branch 'master' into external


From: Basil L. Contovounesios
Subject: [elpa] externals/counsel ebf380fc34: Merge branch 'master' into externals/counsel
Date: Wed, 14 Feb 2024 16:45:29 -0500 (EST)

branch: externals/counsel
commit ebf380fc346a855df0518cfdb12d6699777d9489
Merge: 7301ae07d9 4546ce0ca4
Author: Basil L. Contovounesios <basil@contovou.net>
Commit: Basil L. Contovounesios <basil@contovou.net>

    Merge branch 'master' into externals/counsel
---
 .mailmap   | 31 +++++++++++++++++++++++++++++++
 counsel.el | 18 +++++++++++-------
 2 files changed, 42 insertions(+), 7 deletions(-)

diff --git a/.mailmap b/.mailmap
new file mode 100644
index 0000000000..1a00c174ba
--- /dev/null
+++ b/.mailmap
@@ -0,0 +1,31 @@
+# Keep contents sorted using 'M-x sort-lines'.
+# See 'man 5 gitmailmap' for the file format.
+
+<basil@contovou.net> <contovob@tcd.ie>
+<diegoamundo@gmail.com> <therockmandolinist@users.noreply.github.com>
+<dunni@gnu.org> <scholar42@gmail.com>
+<evgenysw@gmail.com> <evgeni.kolev@uber.com>
+<goncalossantos98@gmail.com> <nox@hartley.localdomain>
+<ingo.lohmar@posteo.net> <i.lohmar@gmail.com>
+<jeanphilippe.bernardy@gmail.com> <jean-philippe.bernardy@tweag.io>
+<leungbk@posteo.net> <bkleung89@gmail.com>
+<leungbk@posteo.net> <leungbk@mailfence.com>
+<me@bcc32.com> <azeng@janestreet.com>
+<me@rgrinberg.com> <rudi.grinberg@gmail.com>
+<me@wilfred.me.uk> <whughes@ahl.com>
+<muir@mnd.rs> <muir.manders@gmail.com>
+<muir@mnd.rs> <muir@retailnext.net>
+<ricouilletaff@gmail.com> <admin@ericdanan.net>
+<ricouilletaff@gmail.com> <eric.danan@u-cergy.fr>
+<syohex@gmail.com> <shohei.yoshida@dena.com>
+Daanturo <daanturo@gmail.com> <dantle.v01@gmail.com>
+Diego A. Mundo <diegoamundo@gmail.com>
+Earl Hyatt <okamsn@protonmail.com> <ej32u@protonmail.com>
+Jonathan Hayase <PythonNut@users.noreply.github.com>
+Justin Burkett <justin@burkett.cc>
+Jérôme M. Berger <jeberger@free.fr>
+Manuel Uberti <manuel.uberti@inventati.org> <manuel@boccaperta.com>
+Mohsin Kaleem <mohkale@kisara.moe> <mohkalsin@gmail.com>
+Nathan Moreau <nathan.moreau@m4x.org>
+Troy Hinckley <t.macman@gmail.com>
+Yevgnen Koh <wherejoystarts@gmail.com>
diff --git a/counsel.el b/counsel.el
index 007db01aa3..c5d9e6507a 100644
--- a/counsel.el
+++ b/counsel.el
@@ -1,9 +1,9 @@
 ;;; counsel.el --- Various completion functions using Ivy -*- lexical-binding: 
t -*-
 
-;; Copyright (C) 2015-2023 Free Software Foundation, Inc.
+;; Copyright (C) 2015-2024 Free Software Foundation, Inc.
 
 ;; Author: Oleh Krehel <ohwoeowho@gmail.com>
-;; Maintainer: Basil L. Contovounesios <contovob@tcd.ie>
+;; Maintainer: Basil L. Contovounesios <basil@contovou.net>
 ;; URL: https://github.com/abo-abo/swiper
 ;; Version: 0.14.2
 ;; Package-Requires: ((emacs "24.5") (ivy "0.14.2") (swiper "0.14.2"))
@@ -348,10 +348,14 @@ Update the minibuffer with the amount of lines collected 
every
       (delete-process process))))
 
 ;;* Completion at point
-(define-obsolete-function-alias 'counsel-el #'complete-symbol "<2020-05-20 
Wed>")
-(define-obsolete-function-alias 'counsel-cl #'complete-symbol "<2020-05-20 
Wed>")
-(define-obsolete-function-alias 'counsel-jedi #'complete-symbol "<2020-05-20 
Wed>")
-(define-obsolete-function-alias 'counsel-clj #'complete-symbol "<2020-05-20 
Wed>")
+(define-obsolete-function-alias 'counsel-el
+  #'complete-symbol "0.13.2 (2020-05-20)")
+(define-obsolete-function-alias 'counsel-cl
+  #'complete-symbol "0.13.2 (2020-05-20)")
+(define-obsolete-function-alias 'counsel-jedi
+  #'complete-symbol "0.13.2 (2020-05-20)")
+(define-obsolete-function-alias 'counsel-clj
+  #'complete-symbol "0.13.2 (2020-05-20)")
 
 ;;** `counsel-company'
 (defvar company-candidates)
@@ -6919,7 +6923,7 @@ We update it in the callback with 
`ivy-update-candidates'."
             :caller 'counsel-search))
 
 (define-obsolete-function-alias 'counsel-google
-    #'counsel-search "<2019-10-17 Thu>")
+    #'counsel-search "0.13.2 (2019-10-17)")
 
 ;;** `counsel-compilation-errors'
 (defun counsel--compilation-errors-buffer (buf)



reply via email to

[Prev in Thread] Current Thread [Next in Thread]