From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!.POSTED!not-for-mail From: Allen Li Newsgroups: gmane.emacs.bugs Subject: bug#27828: [PATCH] Do not unset user key remaps in dired-x Date: Wed, 26 Jul 2017 12:07:34 -0700 Message-ID: References: NNTP-Posting-Host: blaine.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="UTF-8" X-Trace: blaine.gmane.org 1501096096 18260 195.159.176.226 (26 Jul 2017 19:08:16 GMT) X-Complaints-To: usenet@blaine.gmane.org NNTP-Posting-Date: Wed, 26 Jul 2017 19:08:16 +0000 (UTC) To: 27828@debbugs.gnu.org Original-X-From: bug-gnu-emacs-bounces+geb-bug-gnu-emacs=m.gmane.org@gnu.org Wed Jul 26 21:08:06 2017 Return-path: Envelope-to: geb-bug-gnu-emacs@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by blaine.gmane.org with esmtp (Exim 4.84_2) (envelope-from ) id 1daRfB-0004Ex-Nk for geb-bug-gnu-emacs@m.gmane.org; Wed, 26 Jul 2017 21:08:05 +0200 Original-Received: from localhost ([::1]:39663 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1daRfH-0003h3-9y for geb-bug-gnu-emacs@m.gmane.org; Wed, 26 Jul 2017 15:08:11 -0400 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:49903) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1daRfC-0003gw-Lq for bug-gnu-emacs@gnu.org; Wed, 26 Jul 2017 15:08:07 -0400 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1daRf8-00010t-Mc for bug-gnu-emacs@gnu.org; Wed, 26 Jul 2017 15:08:06 -0400 Original-Received: from debbugs.gnu.org ([208.118.235.43]:54988) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1daRf8-00010m-Jv for bug-gnu-emacs@gnu.org; Wed, 26 Jul 2017 15:08:02 -0400 Original-Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1daRf8-0006bW-BW for bug-gnu-emacs@gnu.org; Wed, 26 Jul 2017 15:08:02 -0400 X-Loop: help-debbugs@gnu.org In-Reply-To: Resent-From: Allen Li Original-Sender: "Debbugs-submit" Resent-CC: bug-gnu-emacs@gnu.org Resent-Date: Wed, 26 Jul 2017 19:08:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 27828 X-GNU-PR-Package: emacs X-GNU-PR-Keywords: Original-Received: via spool by 27828-submit@debbugs.gnu.org id=B27828.150109606225361 (code B ref 27828); Wed, 26 Jul 2017 19:08:02 +0000 Original-Received: (at 27828) by debbugs.gnu.org; 26 Jul 2017 19:07:42 +0000 Original-Received: from localhost ([127.0.0.1]:57665 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1daReo-0006az-Ij for submit@debbugs.gnu.org; Wed, 26 Jul 2017 15:07:42 -0400 Original-Received: from mail-qk0-f178.google.com ([209.85.220.178]:33596) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1daRem-0006ak-Ny for 27828@debbugs.gnu.org; Wed, 26 Jul 2017 15:07:41 -0400 Original-Received: by mail-qk0-f178.google.com with SMTP id k2so53143482qkf.0 for <27828@debbugs.gnu.org>; Wed, 26 Jul 2017 12:07:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=2J9/IM96kPkIPCUeCVGQKOTwmcY9mQQyu4FydrKQR4A=; b=t0hXGYmfFZavh8pOub1x17R8Umk32qx01fMCpQb1Vju6A216ET1boNnpnzphKuO+8K vQ+/mEYk887kXCbiQmja/sc1U7oCJcvTUNdQe+zv22u5dkyNJgW5qaFWc4NaZAtLPVRi z1KE6SOtB+dCsEOg38ce0HLM1vipGwWVS3QXjTIunCVyUTzRyTba8F4RlEmWPNOo2t8R v/icAT1R1j1hgoKPmv7N7byXZm8pQp/RyjZed/An+WHKv6m8gsXQ8h2/Hgsj+xilaEqG VXvBuFjn1vbsb0HdUyfeMc6JIkRhmRyWzR4gjOr0fOtR+SB4Cx+Tou8ess1W8qRJRXGs lzvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=2J9/IM96kPkIPCUeCVGQKOTwmcY9mQQyu4FydrKQR4A=; b=Ce0eVbr/rrfVIunKN+mwXjP1L/eiWqTdQD53sX+qgficm7L7DUanI8vR9DwlAdN31t UhzLLlwfXMFgo04ddJT7R0MlwTpvwtLU4C+lyibEFB1CiJldD4azlmIKz7B9IwHCJaUW AylG215gBysIhol3DVkLckkrDDD/rbvP4wAJOOHevY4Yg8oFE/rHG1ax+QgzNRF9cerN kj9gSgQwdleKishqbQuXqEd167OYC1r239uUNY8ZpaeNm4HGGsW9A5tozjIMRgpYlQ+L ifgfUnSgK1W+xujk9nxKBY2FmbN3QSlqsX64QsW6WoO3p5eNb6KjTmiiXCI90XScKJk4 xR4A== X-Gm-Message-State: AIVw112OUkQiVdmaFed+vumpAt3WAop01MlNxbP+ox8hyRnjgIJk4lXb PM22itpVtMbRvU0qL2/sjLQRtdS1k+yyVS0= X-Received: by 10.55.133.69 with SMTP id h66mr2645589qkd.153.1501096055122; Wed, 26 Jul 2017 12:07:35 -0700 (PDT) Original-Received: by 10.12.142.67 with HTTP; Wed, 26 Jul 2017 12:07:34 -0700 (PDT) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 208.118.235.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" Xref: news.gmane.org gmane.emacs.bugs:135029 Archived-At: * lisp/dired-x.el (dired-x-bind-find-file): Don't map any keys if user sets dired-x-hands-off-my-keys. --- lisp/dired-x.el | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/lisp/dired-x.el b/lisp/dired-x.el index 915550991d..1425278bdc 100644 --- a/lisp/dired-x.el +++ b/lisp/dired-x.el @@ -1629,10 +1629,11 @@ Binding direction based on `dired-x-hands-off-my-keys'." (if (called-interactively-p 'interactive) (setq dired-x-hands-off-my-keys (not (y-or-n-p "Bind dired-x-find-file over find-file? ")))) - (define-key (current-global-map) [remap find-file] - (if (not dired-x-hands-off-my-keys) 'dired-x-find-file)) - (define-key (current-global-map) [remap find-file-other-window] - (if (not dired-x-hands-off-my-keys) 'dired-x-find-file-other-window))) + (unless dired-x-hands-off-my-keys + (define-key (current-global-map) [remap find-file] + 'dired-x-find-file) + (define-key (current-global-map) [remap find-file-other-window] + 'dired-x-find-file-other-window))) ;; Now call it so binding is correct. This could go in the :initialize ;; slot, but then dired-x-bind-find-file has to be defined before the -- 2.14.0.rc0.400.g1c36432dff-goog