From mboxrd@z Thu Jan  1 00:00:00 1970
From: Nicolas Goaziou <mail@nicolasgoaziou.fr>
Subject: Re: Bug (regression) in org-replace-disputed-keys. Bisected.
Date: Mon, 03 Nov 2014 21:54:42 +0100
Message-ID: <87fve0c8dp.fsf@nicolasgoaziou.fr>
References: <20140909.204231.1213619806378148264.teika@gmx.com>
	<20141001.102227.1578863029392514259.teika@gmx.com>
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]:57317)
	by lists.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mail@nicolasgoaziou.fr>) id 1XlOdV-0002Oi-Lg
	for emacs-orgmode@gnu.org; Mon, 03 Nov 2014 15:54:09 -0500
Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71)
	(envelope-from <mail@nicolasgoaziou.fr>) id 1XlOdO-0001Go-6R
	for emacs-orgmode@gnu.org; Mon, 03 Nov 2014 15:54:01 -0500
Received: from relay5-d.mail.gandi.net ([2001:4b98:c:538::197]:50359)
	by eggs.gnu.org with esmtp (Exim 4.71)
	(envelope-from <mail@nicolasgoaziou.fr>) id 1XlOdO-0001Fp-1e
	for emacs-orgmode@gnu.org; Mon, 03 Nov 2014 15:53:54 -0500
In-Reply-To: <20141001.102227.1578863029392514259.teika@gmx.com> (Teika
	Kazura's message of "Wed, 01 Oct 2014 10:22:27 +0900 (JST)")
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: Teika Kazura <teika@gmx.com>
Cc: emacs-orgmode@gnu.org, bezjak.miro@gmail.com

Hello,

Teika Kazura <teika@gmx.com> writes:

> Now a real fix. There're two candidates:
>
> (i) Revert the wrong commit. Since it was in fact done in two separate commits[2], you need another patch, not git-revert. Here it is:
> ------------------------------------------------------------------------
> diff -u -r org-8.2.7c-orig/lisp/org.el org-8.2.7c/lisp/org.el
> --- org-8.2.7c-orig/lisp/org.el	2014-09-30 18:10:54.485977061 +0900
> +++ org-8.2.7c/lisp/org.el	2014-09-30 18:11:24.293602328 +0900
> @@ -16220,8 +16220,7 @@
>  (defvar org-read-date-inactive)
>  
>  (defvar org-read-date-minibuffer-local-map
> -  (let* ((org-replace-disputed-keys nil)
> -	 (map (make-sparse-keymap)))
> +  (let* ((map (make-sparse-keymap)))
>      (set-keymap-parent map minibuffer-local-map)
>      (org-defkey map (kbd ".")
>                  (lambda () (interactive)
> ------------------------------------------------------------------------

I think this change is appropriate. Could you provide a patch with git
format-patch?


Regards,

-- 
Nicolas Goaziou