all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: Stephen Berman via "Bug reports for GNU Emacs, the Swiss army knife of text editors" <bug-gnu-emacs@gnu.org>
To: Eli Zaretskii <eliz@gnu.org>
Cc: 74090-done@debbugs.gnu.org
Subject: bug#74090: 31.0.50; Problems with dabbrev-expand
Date: Thu, 31 Oct 2024 12:17:06 +0100	[thread overview]
Message-ID: <87o730v7wt.fsf@gmx.net> (raw)
In-Reply-To: <86jzdo35wq.fsf@gnu.org> (Eli Zaretskii's message of "Thu, 31 Oct 2024 12:47:49 +0200")

On Thu, 31 Oct 2024 12:47:49 +0200 Eli Zaretskii <eliz@gnu.org> wrote:

>> From: Stephen Berman <stephen.berman@gmx.net>
>> 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 <stephen.berman@gmx.net> wrote:
>>
>> > On Thu, 31 Oct 2024 12:09:04 +0200 Eli Zaretskii <eliz@gnu.org> wrote:
>> >
>> >>> From: Stephen Berman <stephen.berman@gmx.net>
>> >>> 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.

Thanks, that worked.  And with that I'm closing the bug.

Steve Berman





      reply	other threads:[~2024-10-31 11:17 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-10-29 17:06 bug#74090: 31.0.50; Problems with dabbrev-expand Stephen Berman via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-10-29 18:17 ` Juri Linkov
2024-10-29 18:57   ` Stephen Berman via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-10-30  7:32     ` Juri Linkov
2024-10-31 10:01       ` Stephen Berman via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-10-30 13:03 ` Eli Zaretskii
2024-10-31 10:00   ` Stephen Berman via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-10-31 10:09     ` Eli Zaretskii
2024-10-31 10:20       ` Stephen Berman via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-10-31 10:39         ` Stephen Berman via Bug reports for GNU Emacs, the Swiss army knife of text editors
2024-10-31 10:47           ` Eli Zaretskii
2024-10-31 11:17             ` Stephen Berman via Bug reports for GNU Emacs, the Swiss army knife of text editors [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87o730v7wt.fsf@gmx.net \
    --to=bug-gnu-emacs@gnu.org \
    --cc=74090-done@debbugs.gnu.org \
    --cc=eliz@gnu.org \
    --cc=stephen.berman@gmx.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
Code repositories for project(s) associated with this external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.