From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stefan Monnier 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, 04 Feb 2024 22:08:59 -0500 Message-ID: References: <871q9rvqbi.fsf@jeremybryant.net> Reply-To: Stefan Monnier Mime-Version: 1.0 Content-Type: text/plain Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="4658"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: jb@jeremybryant.net, 68929@debbugs.gnu.org To: Justin Burkett Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Mon Feb 05 04:10:23 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 1rWpNG-000107-U8 for geb-bug-gnu-emacs@m.gmane-mx.org; Mon, 05 Feb 2024 04:10:23 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rWpMl-0004wb-T5; Sun, 04 Feb 2024 22:09:51 -0500 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 1rWpMk-0004wK-04 for bug-gnu-emacs@gnu.org; Sun, 04 Feb 2024 22:09:50 -0500 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 1rWpMj-0008AK-Np for bug-gnu-emacs@gnu.org; Sun, 04 Feb 2024 22:09:49 -0500 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1rWpMv-0007Uq-Vq for bug-gnu-emacs@gnu.org; Sun, 04 Feb 2024 22:10:01 -0500 X-Loop: help-debbugs@gnu.org Resent-From: Stefan Monnier Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Mon, 05 Feb 2024 03:10:01 +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 X-Debbugs-Original-Cc: Jeremy Bryant , bug-gnu-emacs@gnu.org Original-Received: via spool by submit@debbugs.gnu.org id=B.170710257228776 (code B ref -1); Mon, 05 Feb 2024 03:10:01 +0000 Original-Received: (at submit) by debbugs.gnu.org; 5 Feb 2024 03:09:32 +0000 Original-Received: from localhost ([127.0.0.1]:50328 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWpMS-0007U3-8Q for submit@debbugs.gnu.org; Sun, 04 Feb 2024 22:09:32 -0500 Original-Received: from lists.gnu.org ([2001:470:142::17]:50126) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1rWpMM-0007Tn-T2 for submit@debbugs.gnu.org; Sun, 04 Feb 2024 22:09:30 -0500 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 1rWpM4-0004up-Vt for bug-gnu-emacs@gnu.org; Sun, 04 Feb 2024 22:09:09 -0500 Original-Received: from mailscanner.iro.umontreal.ca ([132.204.25.50]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rWpM3-00089V-15 for bug-gnu-emacs@gnu.org; Sun, 04 Feb 2024 22:09:08 -0500 Original-Received: from pmg1.iro.umontreal.ca (localhost.localdomain [127.0.0.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id C88D0100390; Sun, 4 Feb 2024 22:09:04 -0500 (EST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=iro.umontreal.ca; s=mail; t=1707102541; bh=nGBEfsNb+JqC7TzmqxX8FAiDhnnjS0qOekebrTFgbiU=; h=From:To:Cc:Subject:In-Reply-To:References:Date:From; b=eP2JSO+xCGtQQ3odUwvjnnzLuNj9UoPZLvPzeRF09QBl5z2Zk+2SgDYWfsvfzpG70 Mo2fNa4xxjpn2KIgQil+wr/7gDWqj7xYe5DYMVg/Da/tjejcLmsFKsk+dF6AYcEpwC C9TOG5Dj1NByH4mDPEnGgHPVVPbWNGpooJklH2XnfKMXRL2sYduCAusoCXFhYfsJwh cYdANKxmjzgZfBiPnc0clBnKV1+zlaMe6qbzqnRqwAlVliB7n7aKHBSBqtGM2NpOIA nXqXdS2dUNpOlqjH3unq/+4TSoFQM91xDN4N0H9WSoAS4LB+AMZ/k++Wxp/qPO3P3Q T/BsEPILxcDlA== Original-Received: from mail01.iro.umontreal.ca (unknown [172.31.2.1]) by pmg1.iro.umontreal.ca (Proxmox) with ESMTP id 2BC08100301; Sun, 4 Feb 2024 22:09:01 -0500 (EST) Original-Received: from pastel (69-165-153-17.dsl.teksavvy.com [69.165.153.17]) by mail01.iro.umontreal.ca (Postfix) with ESMTPSA id E3C4E12030A; Sun, 4 Feb 2024 22:09:00 -0500 (EST) In-Reply-To: (Justin Burkett's message of "Sun, 4 Feb 2024 21:15:19 -0500") Received-SPF: pass client-ip=132.204.25.50; envelope-from=monnier@iro.umontreal.ca; helo=mailscanner.iro.umontreal.ca X-Spam_score_int: -42 X-Spam_score: -4.3 X-Spam_bar: ---- X-Spam_report: (-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action 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:279431 Archived-At: > I can take care of this tomorrow, but otherwise feel free to make the move > yourselves. BTW, rather than adding a file, another way to add it to `emacs.git` is by `git merge --allow-unrelated-histories`. If you wan to do that, you'll want to first create a new commit which moves the files to their "final" destination, like: git rm .gitignore .github Makefile LICENSE.md ... git mv which-key.el lisp/which-key.el git mv which-key-tests.el test/lisp/which-key-tests.el [ not sure what you plan to do with the README.org and image files. ] git commit -m 'Move files in preparation for merge into emacs.git' and then you can `git merge` that new commit into Emacs, preserving the history. Stefan