From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Eli Zaretskii Newsgroups: gmane.emacs.bugs Subject: bug#74090: 31.0.50; Problems with dabbrev-expand Date: Thu, 31 Oct 2024 12:47:49 +0200 Message-ID: <86jzdo35wq.fsf@gnu.org> References: <878qu6j0tx.fsf@gmx.net> <86zfml4uay.fsf@gnu.org> <87cyjgwq1a.fsf@gmx.net> <86plng37pb.fsf@gnu.org> <87zfmkvaj5.fsf@gmx.net> <87v7x8v9o3.fsf@gmx.net> Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="36632"; mail-complaints-to="usenet@ciao.gmane.io" Cc: 74090@debbugs.gnu.org To: Stephen Berman Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Oct 31 11:48:32 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 1t6SjA-0009Ot-Bj for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 31 Oct 2024 11:48:32 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t6Sik-0007OQ-IQ; Thu, 31 Oct 2024 06:48:06 -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 1t6Sih-0007NA-Ip for bug-gnu-emacs@gnu.org; Thu, 31 Oct 2024 06:48:03 -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 1t6Sig-0000Ky-AM for bug-gnu-emacs@gnu.org; Thu, 31 Oct 2024 06:48:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=References:In-Reply-To:From:Date:To:Subject; bh=uqn2zvwsbDywy0So84yRbewXciHeLYRICrqHvbWaZGY=; b=kx922oSPSuPMShLU7ZyQ4MOp8iyDo45qjqLMjuGQAM6DWrKlQmNPJjahA5Z9UKT6+p+B6s6obb4/O0rkPhk4Jv9fIk45EkhieS+dUjfc8qepk6vPgYDIb0zwkdklt/+BiVTLumzAdX5uz+w7YQl3UJM/yMaIxamkjoPBFrzYVfFU2/xIipzX3i8L66vLaLxDQ6FP1vQOU3qRioOYHDQzeRv8mndMnJFluUwVosA09tyN/vxBD4WsZMP7hgdB4xWvEv7u3+hSSS8R3WEmxH0iS3dQOgSx92WFjAFP9n1Wa3591lYz8JQMKBzCCttMDa6ZskhtHigib7HwVbWHYZj3NQ==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t6Sif-0003UR-W6 for bug-gnu-emacs@gnu.org; Thu, 31 Oct 2024 06:48:02 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Eli Zaretskii Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Thu, 31 Oct 2024 10:48:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 74090 X-GNU-PR-Package: emacs Original-Received: via spool by 74090-submit@debbugs.gnu.org id=B74090.173037168013407 (code B ref 74090); Thu, 31 Oct 2024 10:48:01 +0000 Original-Received: (at 74090) by debbugs.gnu.org; 31 Oct 2024 10:48:00 +0000 Original-Received: from localhost ([127.0.0.1]:41605 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6Sid-0003UA-S3 for submit@debbugs.gnu.org; Thu, 31 Oct 2024 06:48:00 -0400 Original-Received: from eggs.gnu.org ([209.51.188.92]:39622) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6Sic-0003U0-8b for 74090@debbugs.gnu.org; Thu, 31 Oct 2024 06:47:59 -0400 Original-Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1t6SiW-0000KQ-IB; Thu, 31 Oct 2024 06:47:52 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=References:Subject:In-Reply-To:To:From:Date: mime-version; bh=uqn2zvwsbDywy0So84yRbewXciHeLYRICrqHvbWaZGY=; b=A+GTCqAYXLJr Ddaqo0f2H8CRAPDS2Q+Rm14yDCDQbiRWVMmCFFz6d9taunwXTvM0bjFeqbjW9OA2ldA9D+EvekOuQ 8OkPluSP2PEiXDy4RS7kOVAoY+cx7G8xAeCSSiqPg+9TG0dCQbW9UieZ8cH0xfbo4lo2E+XsxcDyr BMBkQoPClH9tISG4ngxZXoJiU9pfVHBGKstsCKxpkKenxpaU+nIc0w8Z2xNF78ISnKoq91jkXu21D 2tffVUX9fuh1gua4epvDSLVZ0jt/gsfGnmfzzALAau9UT/SBbMjynQO6p7kSRJbFouSW15+9+wa3D RhPV5Hj/FfFU1AFR9p9h5Q==; In-Reply-To: <87v7x8v9o3.fsf@gmx.net> (message from Stephen Berman on Thu, 31 Oct 2024 11:39:08 +0100) 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:294614 Archived-At: > From: Stephen Berman > Cc: 74090@debbugs.gnu.org > Date: Thu, 31 Oct 2024 11:39:08 +0100 > > On Thu, 31 Oct 2024 11:20:30 +0100 Stephen Berman wrote: > > > On Thu, 31 Oct 2024 12:09:04 +0200 Eli Zaretskii wrote: > > > >>> From: Stephen Berman > >>> Cc: 74090@debbugs.gnu.org > >>> Date: Thu, 31 Oct 2024 11:00:17 +0100 > >>> > >>> > Thanks, feel free to install on the emacs-30 branch. > >>> > > >>> >> + ;; Comparing with point only makes sense in the buffer > >>> >> + ;; where we called dabbrev-exand, but if that differs > >>> > ^^^^^^^^^^^^^ > >>> > Typo. > >>> > >>> Thanks, typo corrected and pushed as commit f6c359cb66a -- but to > >>> master, I just now noticed that you said emacs-30. I tried reverting > >>> but I don't know how. What should I do? Sorry for the snafu. > >> > >> Instead of reverting, simply cherry-pick it to emacs-30. > > > > I don't want to screw up again; do I enter exactly the following in the > > shell (from the emacs-30 directory)? > > > > git cherry-pick master > > My commit to master is no longer the most recent, so should I use this > instead? > > git cherry-pick master f6c359cb66a Just make sure emacs-30 is the current branch, and then type $ git cherry-pick -x f6c359cb66a Then "git show" to eyeball the change, and "git push" to push upstream. You cannot screw up as long as you examine the changes before you push after cherry-picking, because any the problems, such as they are, are only present in your local clone, and you can always undo with $ git reset --hard HEAD^ Thanks.