From: Nicolas Richard <theonewiththeevillook@yahoo.fr>
To: Nicolas Richard <theonewiththeevillook@yahoo.fr>
Cc: Eli Zaretskii <eliz@gnu.org>,
17724@debbugs.gnu.org, monnier@iro.umontreal.ca
Subject: bug#17724: 24.4.50; regression: error "`recenter'ing a window that does not display current-buffer." when opening org-mode file
Date: Thu, 19 Jun 2014 22:29:38 +0200 [thread overview]
Message-ID: <87mwd8wslp.fsf__47680.4603859366$1403209861$gmane$org@yahoo.fr> (raw)
In-Reply-To: <20140619190810.GB9247@boo.workgroup> (Gregor Zattler's message of "Thu, 19 Jun 2014 21:08:10 +0200")
Gregor Zattler <telegraph@gmx.net> writes:
> s$ git branch -a --contains HEAD
> * emacs-24
> master
> remotes/origin/HEAD -> origin/master
> remotes/origin/master
> remotes/origin/trunk
So indeed your local emacs-24 branch points in fact to a commit from
trunk.
I think running those commands should fix the problem:
git branch -u origin/emacs-24
git reset --hard origin/emacs-24
--
Nico.
next prev parent reply other threads:[~2014-06-19 20:30 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <87bnu4ww4i.fsf@boo.workgroup>
[not found] ` <83r4303cuc.fsf@gnu.org>
2014-06-07 17:18 ` bug#17724: 24.4.50; regression: error "`recenter'ing a window that does not display current-buffer." when opening org-mode file Glenn Morris
[not found] ` <wsmwdosko4.fsf@fencepost.gnu.org>
2014-06-07 18:59 ` Bastien
[not found] ` <87singtukm.fsf@bzg.ath.cx>
2014-06-09 20:53 ` Nicolas Richard
2014-06-10 2:38 ` Eli Zaretskii
[not found] ` <83mwdl1oay.fsf__34932.3046779775$1402367995$gmane$org@gnu.org>
2014-06-10 8:09 ` Nicolas Richard
[not found] ` <871tuxdw3y.fsf@geodiff-mac3.ulb.ac.be>
2014-06-10 8:19 ` Bastien
[not found] ` <87lht5xjlt.fsf@bzg.ath.cx>
2014-06-17 12:14 ` lee
[not found] ` <87lhsvbunj.fsf@yun.yagibdah.de>
2014-06-17 13:20 ` Stefan Monnier
2014-06-17 17:15 ` lee
[not found] ` <87ha3jlaoa.fsf@yun.yagibdah.de>
2014-06-17 19:28 ` Eli Zaretskii
2014-06-17 19:45 ` Stefan Monnier
[not found] ` <jwv38f38gwv.fsf-monnier+emacsbugs@gnu.org>
2014-06-18 2:43 ` Eli Zaretskii
[not found] ` <834mzjuecn.fsf@gnu.org>
2014-06-18 12:04 ` Stefan Monnier
[not found] ` <jwvy4wu1l1g.fsf-monnier+emacsbugs@gnu.org>
2014-06-18 14:39 ` Eli Zaretskii
[not found] ` <83y4wuth7s.fsf@gnu.org>
2014-06-18 18:15 ` Stefan Monnier
[not found] ` <8361jzuyh2.fsf@gnu.org>
2014-06-18 11:10 ` lee
[not found] ` <87mwdav5gk.fsf@yun.yagibdah.de>
2014-06-19 2:46 ` Eli Zaretskii
[not found] ` <837g4dty3k.fsf@gnu.org>
2014-06-19 9:35 ` lee
2014-06-08 1:06 ` Stefan Monnier
[not found] ` <jwvioocfc04.fsf-monnier+emacsbugs@gnu.org>
2014-06-18 18:52 ` Gregor Zattler
[not found] ` <20140618185205.GA19722@boo.workgroup>
2014-06-18 19:10 ` Eli Zaretskii
2014-06-18 22:07 ` Gregor Zattler
[not found] ` <20140618220737.GE19722@boo.workgroup>
2014-06-19 8:20 ` Nicolas Richard
[not found] ` <8761jxqpiv.fsf@geodiff-mac3.ulb.ac.be>
2014-06-19 14:58 ` Eli Zaretskii
2014-06-19 19:08 ` Gregor Zattler
[not found] ` <20140619190810.GB9247@boo.workgroup>
2014-06-19 20:29 ` Nicolas Richard [this message]
2014-06-19 20:43 ` Achim Gratz
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
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='87mwd8wslp.fsf__47680.4603859366$1403209861$gmane$org@yahoo.fr' \
--to=theonewiththeevillook@yahoo.fr \
--cc=17724@debbugs.gnu.org \
--cc=eliz@gnu.org \
--cc=monnier@iro.umontreal.ca \
/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 public inbox
https://git.savannah.gnu.org/cgit/emacs/org-mode.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).