From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.io!.POSTED.blaine.gmane.org!not-for-mail From: Stephen Berman via "Bug reports for GNU Emacs, the Swiss army knife of text editors" Newsgroups: gmane.emacs.bugs Subject: bug#74090: 31.0.50; Problems with dabbrev-expand Date: Thu, 31 Oct 2024 12:17:06 +0100 Message-ID: <87o730v7wt.fsf@gmx.net> 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> <86jzdo35wq.fsf@gnu.org> Reply-To: Stephen Berman Mime-Version: 1.0 Content-Type: text/plain Content-Transfer-Encoding: quoted-printable Injection-Info: ciao.gmane.io; posting-host="blaine.gmane.org:116.202.254.214"; logging-data="35364"; mail-complaints-to="usenet@ciao.gmane.io" User-Agent: Gnus/5.13 (Gnus v5.13) Cc: 74090-done@debbugs.gnu.org To: Eli Zaretskii Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane-mx.org@gnu.org Thu Oct 31 12:18:28 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 1t6TC6-00091m-C0 for geb-bug-gnu-emacs@m.gmane-mx.org; Thu, 31 Oct 2024 12:18:26 +0100 Original-Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1t6TBm-0008M4-0c; Thu, 31 Oct 2024 07:18: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 1t6TBi-0008Jh-Lv for bug-gnu-emacs@gnu.org; Thu, 31 Oct 2024 07:18: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 1t6TBi-0004Wl-DC for bug-gnu-emacs@gnu.org; Thu, 31 Oct 2024 07:18:02 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=debbugs.gnu.org; s=debbugs-gnu-org; h=MIME-Version:Date:References:In-Reply-To:From:To:Subject; bh=dtPlhQoiz9sokcjMvwdKvY6ZZdHJTHErLF80VxcdUxY=; b=C9XiS+zisl9u2QZhfH8k+2X2AoDwJulL3FXXy4yOiNhJKCJlsclMI+We0KFHpSmodyJCvYjwyLjb5QZgE6ju6paXuPIuD6PkVAcmOH9cdQ/5JLmGQPvPoYMPpfbWgWHnQoOfj9nBbXaiGV2Eg4RgCsRjyQBIoz117qqBIwTOqxeU7a+plNBVMbzRag/QDduLnTHObAf0q6v2apc8pxZtL1c/VA6ZZXnXcnBbWnb/wMO2RdH0h8cIBqEPt6EbT43q+GcUVJ51JQsYNzY6/UkXYNnbRNFzExYBTNLAv01JsNViZuyTu9N5rG9t1nnem4dqWmQU6YLJ2SVECdubf0IYOg==; Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1t6TBi-0004ZO-7W for bug-gnu-emacs@gnu.org; Thu, 31 Oct 2024 07:18:02 -0400 Resent-From: Stephen Berman Original-Sender: "Debbugs-submit" Resent-To: bug-gnu-emacs@gnu.org Resent-Date: Thu, 31 Oct 2024 11:18:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: cc-closed 74090 X-GNU-PR-Package: emacs Mail-Followup-To: 74090@debbugs.gnu.org, stephen.berman@gmx.net, stephen.berman@gmx.net Original-Received: via spool by 74090-done@debbugs.gnu.org id=D74090.173037343817540 (code D ref 74090); Thu, 31 Oct 2024 11:18:01 +0000 Original-Received: (at 74090-done) by debbugs.gnu.org; 31 Oct 2024 11:17:18 +0000 Original-Received: from localhost ([127.0.0.1]:41699 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6TAz-0004Yp-PP for submit@debbugs.gnu.org; Thu, 31 Oct 2024 07:17:18 -0400 Original-Received: from mout.gmx.net ([212.227.15.18]:36595) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1t6TAx-0004Yh-9Q for 74090-done@debbugs.gnu.org; Thu, 31 Oct 2024 07:17:16 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmx.net; s=s31663417; t=1730373429; x=1730978229; i=stephen.berman@gmx.net; bh=dtPlhQoiz9sokcjMvwdKvY6ZZdHJTHErLF80VxcdUxY=; h=X-UI-Sender-Class:From:To:Cc:Subject:In-Reply-To:References:Date: Message-ID:MIME-Version:Content-Type:Content-Transfer-Encoding:cc: content-transfer-encoding:content-type:date:from:message-id: mime-version:reply-to:subject:to; b=ijUevzQpciV0GDGkjxf+c9c8/s4rXPPmiAWVLyBpGIblDbwnqJuf1qk0onoTgmaB /YV9hNxIYrg2Q3k0BVr0undQ1q5rlmHzk+js0gcv0mWACSAZeN2EJ+tgdCmcrUNyh 7+9yUV2YAHC3Fqw8IMBwbSM1N/D6MD+eG6iResn/Sdr/qLrYZdbY1Up+nMKwm+JqA IsDTKUlEIHKuasEhrQyHmGv/mAjxPkEAgL8Oj8TReTtmWgyDrcJrT91qP6Au1vQkh ZkZrE1DZ4E0L7+ONMdbAMXgYw88SPYrG9rr6Flr39UYcD1nnhq9cjkHMYjbdzX6nL vH8nBzCFrSTwkpfD5A== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Original-Received: from strobelfssd ([94.134.95.122]) by mail.gmx.net (mrgmx004 [212.227.17.190]) with ESMTPSA (Nemesis) id 1MybKp-1u4mSW0UMH-00tEkd; Thu, 31 Oct 2024 12:17:09 +0100 In-Reply-To: <86jzdo35wq.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 31 Oct 2024 12:47:49 +0200") X-Provags-ID: V03:K1:n7Ey4MmJEdYICo6z7nZbs3lZuP4F8hGccPXMN3XGDGJX1mfH2bZ OCsDCMGScvP1mqfkO24am3hmygWFpPZeM7s/bgilpV+I9Hst8ki56y3xmdwslzeNSS1qgKP KS0+i+PANBcmzQUxl95ZE6098+MSGRGvRU/6qoFN0U2qfB5HxYs1S0Fz+4hpgXX38dJcZMx 0w/WLW43/t6xVxztM4z/w== UI-OutboundReport: notjunk:1;M01:P0:yNphnPkhHUs=;OWNYe4iCie6qfU/Dtsh+fDZxEr8 p7iW0TFCC3fB4rB06gfpqVF6gsPCMTOwWO8jkRvOxO8AYHGECjECPjmORHWyVyqu90E6in9aJ R5oy1NSt5NUl49GVazbpbc8mj3f7PfzQG9CHIyERFltboteO9nVvU2tMoe11fznbqHLNygcNZ bBm1c0v3dQzMdVICai41sa26Vm99EOubIG8ebVXbe7SyH4HEU5XW89oQGfR8oBEmVa3TSsvSB LFR4tOjfopmei9g1qB6HRPEYStx4xlGDLGCUQCVCuNh/AGl813UTVZANvt7tw1adGpSNsh22W zgJfQJ31mZPUUe5Pmdz4+ENfDRdXUck1KNF9S/PVmZTK+Zg5eApGV7fYOpPQSf4ss0UiFH7OY bhglgjuxct8tuviocKzyyEJdH1pW0qyU+0pRrCMouvujP6KZjmZDdgk/KpOrC2GBB2MhlRmVE 5Dc8qynrEcHBt5LjGpSlZX3KmDLmiPpnc+DpBeLfQ/hCsDSaiSzwKpu1rgocLgL/MVfmpO6G4 ly+SImibCo8X7ecirIBAa1YXgsmhpqAfnKlxnSvQADkLWrbzU6jwwhihr5w69SZCoeu6zFKkw rqfZCfUDxD3Qa56Wbow6PlorCKTawacw8iZmO87YYcBOfDVeWL4Vkr+CN9M9ovAfWJzxaSq5B CQi+3VtCvtc6nc6Oi2qGBC2mYBHjV25eU/esKmYp+TuYEsJJaeXvx4l37VjJVMvMx6flUAKkP WxHtuDYjOppBcXej/ZTIp8wbcGDiPsYmj+pImy9JK/WPmJuYJNG2BXzROIxsCduCSHFHRSt3 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:294621 Archived-At: On Thu, 31 Oct 2024 12:47:49 +0200 Eli Zaretskii wrote: >> 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 th= e 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 reverti= ng >> >>> 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 t= he >> > 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. Thanks, that worked. And with that I'm closing the bug. Steve Berman