From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Jeremy Bryant via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#68929: [PATCH] Copy which-key from GNU ELPA into core Date: Sun, 14 Apr 2024 10:21:24 +0100 Message-ID: <871q78i9kb.fsf@jeremybryant.net> References: <871q9rvqbi.fsf@jeremybryant.net> <87mssc65y8.fsf@posteo.net> <87y1bwrll4.fsf@jeremybryant.net> <86h6ijxzjk.fsf@gnu.org> <87msrh4kkc.fsf@jeremybryant.net> <87jzml3rlz.fsf@posteo.net> <87wmp2ibjj.fsf@jeremybryant.net> Reply-To: Jeremy Bryant Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="18983"; mail-complaints-to="usenet@ciao.gmane.io" Cc: Eli Zaretskii , 68929@debbugs.gnu.org, monnier@iro.umontreal.ca, justin@burkett.cc To: Philip Kaludercic Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Sun Apr 14 11:22:13 2024 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane-mx.org Original-Received: from lists.gnu.org ([209.51.188.17]) by ciao.gmane.io with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1rvw3w-0004kc-Ok for geb-bug-gnu-emacs@m.gmane-mx.org; Sun, 14 Apr 2024 11:22:12 +0200 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rvw3d-0003MR-2M; Sun, 14 Apr 2024 05:21:53 -0400 Original-Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rvw3b-0003MC-Aq for bug-gnu-emacs@gnu.org; Sun, 14 Apr 2024 05:21:51 -0400 Original-Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rvw3b-0004GS-2w for bug-gnu-emacs@gnu.org; Sun, 14 Apr 2024 05:21:51 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rvw3m-0005dR-1X for bug-gnu-emacs@gnu.org; Sun, 14 Apr 2024 05:22:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Jeremy Bryant Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Sun, 14 Apr 2024 09:22:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 68929 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: patch Original-Received: via spool by 68929-submit@debbugs.gnu.org id=B68929.171308651021551 (code B ref 68929); Sun, 14 Apr 2024 09:22:02 +0000 Original-Received: (at 68929) by debbugs.gnu.org; 14 Apr 2024 09:21:50 +0000 Original-Received: from localhost ([127.0.0.1]:34292 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvw3Y-0005b8-6i for submit@debbugs.gnu.org; Sun, 14 Apr 2024 05:21:49 -0400 Original-Received: from out-183.mta1.migadu.com ([95.215.58.183]:21590) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rvw3U-0005Zc-Db for 68929@debbugs.gnu.org; Sun, 14 Apr 2024 05:21:45 -0400 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jeremybryant.net; s=key1; t=1713086486; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=YSl/WrnfwasIuQvCl0UwHEj9Yxlj7jK219VC5OZmjHA=; b=R/cRmjpZ/IWLq1HggjqCS0AMwxLX0m7hovI0B0ybDfRAeA1oqo1C0YXoMIp2CwhHiRsH+C W+UKb4KFbQhQe7fytGxVC1TijOzSxnwBTVcbx6LY0BDEqo7DBGZhUScrK6bEgWFzCnmp32 a5IeEfBHq1drn/MB4SNnL/me8rD2O3YwsGvMZvgSuqDl+HKTuasyyBjghm/0pEsc20Rm2J HN3AK7JlPZ5mwhcl7XJ/PdqWgwNASh/fbBiXELcwW4dAyUdd3eHkPPa840jG5k1y3yT/4H onbRj47RiAsUFpQTit0He/5rmrVySLutatwAkHSAwi4yi76WH8dAXZct8tRe1g== In-Reply-To: <87wmp2ibjj.fsf@jeremybryant.net> (Jeremy Bryant's message of "Fri, 12 Apr 2024 21:14:08 +0100") X-Migadu-Flow: FLOW_OUT X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: bug-gnu-emacs@gnu.org List-Id: "Bug reports for GNU Emacs, the Swiss army knife of text editors" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Xref: news.gmane.io gmane.emacs.bugs:283261 Archived-At: Jeremy Bryant writes: > Here is the current status on the road to adapting which-key code to > merge into Emacs, and in adapting the code to the coding conventions and > requirements for maintainability, > > I've followed comments from Eli and then Philip, there have been > around 65 patches submitted upstream > https://github.com/justbur/emacs-which-key/commits/master/ > > Many thanks to Philip for the detailed code review and the many > clarifications off-list, and to Justin, the author, for examining and > merging the patches in preparation for this. > > I am currently looking at the merging of history, there appear to be 2 > historical commits which exceed the line length in CONTRIBUTE. > If there is a recommended way to change them please let me know. I have worked out the change command that work locally to allow these 2 historical commits to be merged. (with thanks to Stefan) git merge --no-verify --allow-unrelated-histories --no-edit which-key-integration/which-key-prepare-integration FYI the two exceptions were below. Allowing these would preserve the copyright assignment tracking. $ git log --oneline | awk 'length($0)>78+8' ;; :group 'which-key |ad8eb57 Merge branch 'better-window-sizes' of https://github.com/bmag/emacs-which-key into better-window-sizes ;; :type 'string) |1fd43dc Merge branch 'frame-popup' of https://github.com/bmag/emacs-which-key into pr12 > > The latest version is attached, if there are any more comments they are > welcome. > > [2. application/emacs-lisp; which-key.el]...