[Emacs-diffs] master dfee60f: Do not unset user key remaps in dired-x

[Eli Zaretskii]

branch: master
commit dfee60fe66f3d9fe4249c9662d802753f3e50929
Author: Allen Li <address@hidden>
Commit: Eli Zaretskii <address@hidden>

    Do not unset user key remaps in dired-x
    
    * lisp/dired-x.el (dired-x-bind-find-file): Don't map any keys if user
    sets dired-x-hands-off-my-keys.  (Bug#27828)
    
    Copyright-paperwork-exempt: yes
---
 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 9155509..1425278 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