From mboxrd@z Thu Jan  1 00:00:00 1970
From: Nicolas Richard <theonewiththeevillook@yahoo.fr>
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
Message-ID: <87mwd8wslp.fsf__47680.4603859366$1403209861$gmane$org@yahoo.fr>
References: <87bnu4ww4i.fsf@boo.workgroup>
	<jwvioocfc04.fsf-monnier+emacsbugs@gnu.org>
	<20140618185205.GA19722@boo.workgroup> <83egymt4om.fsf@gnu.org>
	<20140618220737.GE19722@boo.workgroup>
	<8761jxqpiv.fsf@geodiff-mac3.ulb.ac.be>
	<20140619190810.GB9247@boo.workgroup>
Mime-Version: 1.0
Content-Type: text/plain
Return-path: <emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org>
Received: from eggs.gnu.org ([2001:4830:134:3::10]:58007)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1WxiyJ-0004ef-VU
	for emacs-orgmode@gnu.org; Thu, 19 Jun 2014 16:30:19 -0400
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <Debian-debbugs@debbugs.gnu.org>) id 1WxiyB-0008KK-QH
	for emacs-orgmode@gnu.org; Thu, 19 Jun 2014 16:30:11 -0400
Sender: "Debbugs-submit" <debbugs-submit-bounces@debbugs.gnu.org>
Resent-Message-ID: <handler.17724.B17724.14032097994974@debbugs.gnu.org>
In-Reply-To: <20140619190810.GB9247@boo.workgroup> (Gregor Zattler's message
	of "Thu, 19 Jun 2014 21:08:10 +0200")
List-Id: "General discussions about Org-mode." <emacs-orgmode.gnu.org>
List-Unsubscribe: <https://lists.gnu.org/mailman/options/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=unsubscribe>
List-Archive: <http://lists.gnu.org/archive/html/emacs-orgmode>
List-Post: <mailto:emacs-orgmode@gnu.org>
List-Help: <mailto:emacs-orgmode-request@gnu.org?subject=help>
List-Subscribe: <https://lists.gnu.org/mailman/listinfo/emacs-orgmode>,
	<mailto:emacs-orgmode-request@gnu.org?subject=subscribe>
Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org
To: Nicolas Richard <theonewiththeevillook@yahoo.fr>
Cc: Eli Zaretskii <eliz@gnu.org>, 17724@debbugs.gnu.org, monnier@iro.umontreal.ca

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.