From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Nicolas Richard Newsgroups: gmane.emacs.bugs 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@yahoo.fr> References: <87bnu4ww4i.fsf@boo.workgroup> <20140618185205.GA19722@boo.workgroup> <83egymt4om.fsf@gnu.org> <20140618220737.GE19722@boo.workgroup> <8761jxqpiv.fsf@geodiff-mac3.ulb.ac.be> <20140619190810.GB9247@boo.workgroup> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1403209853 23711 80.91.229.3 (19 Jun 2014 20:30:53 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Thu, 19 Jun 2014 20:30:53 +0000 (UTC) Cc: 17724@debbugs.gnu.org To: Nicolas Richard Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Thu Jun 19 22:30:46 2014 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Wxiyq-0005sl-G2 for geb-bug-gnu-emacs@m.gmane.org; Thu, 19 Jun 2014 22:30:44 +0200 Original-Received: from localhost ([::1]:37798 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Wxiyp-0004vi-HQ for geb-bug-gnu-emacs@m.gmane.org; Thu, 19 Jun 2014 16:30:43 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:58184) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxiyZ-0004pq-4R for bug-gnu-emacs@gnu.org; Thu, 19 Jun 2014 16:30:34 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1WxiyR-00009n-M7 for bug-gnu-emacs@gnu.org; Thu, 19 Jun 2014 16:30:27 -0400 Original-Received: from debbugs.gnu.org ([140.186.70.43]:34106) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1WxiyB-0008JB-Na; Thu, 19 Jun 2014 16:30:03 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.80) (envelope-from ) id 1WxiyB-0001Ip-1Y; Thu, 19 Jun 2014 16:30:03 -0400 X-Loop: help-debbugs@gnu.org Resent-From: Nicolas Richard Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org, emacs-orgmode@gnu.org Resent-Date: Thu, 19 Jun 2014 20:30:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 17724 X-GNU-PR-Package: emacs,org-mode X-GNU-PR-Keywords: Original-Received: via spool by 17724-submit@debbugs.gnu.org id=B17724.14032097994974 (code B ref 17724); Thu, 19 Jun 2014 20:30:02 +0000 Original-Received: (at 17724) by debbugs.gnu.org; 19 Jun 2014 20:29:59 +0000 Original-Received: from localhost ([127.0.0.1]:53489 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Wxiy6-0001I8-QY for submit@debbugs.gnu.org; Thu, 19 Jun 2014 16:29:59 -0400 Original-Received: from mailrelay001.isp.belgacom.be ([195.238.6.51]:49843) by debbugs.gnu.org with esmtp (Exim 4.80) (envelope-from ) id 1Wxiy4-0001Hv-Fw for 17724@debbugs.gnu.org; Thu, 19 Jun 2014 16:29:57 -0400 X-Belgacom-Dynamic: yes Original-Received: from 76.210-178-91.adsl-dyn.isp.belgacom.be (HELO LDLC-portable) ([91.178.210.76]) by relay.skynet.be with ESMTP; 19 Jun 2014 22:29:39 +0200 In-Reply-To: <20140619190810.GB9247@boo.workgroup> (Gregor Zattler's message of "Thu, 19 Jun 2014 21:08:10 +0200") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3.91 (gnu/linux) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.15 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 140.186.70.43 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.org@gnu.org Original-Sender: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.bugs:90565 Archived-At: Gregor Zattler 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.