Skip to content

Commit f193e20

Browse files
committed
remove one conflict of standard emacs' M-? ; comment the other
1 parent df2ac1d commit f193e20

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

lisp/ess-inf.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1998,7 +1998,7 @@ meaning as for `ess-eval-region'."
19981998
(define-key map "\C-c\C-z" #'ess-switch-to-inferior-or-script-buffer) ; mask comint map
19991999
(define-key map "\C-d" #'delete-char) ; EOF no good in S
20002000
(define-key map "\t" #'completion-at-point)
2001-
(define-key map "\M-?" #'ess-complete-object-name)
2001+
(define-key map "\M-?" #'ess-complete-object-name); stealing M-? from xref(standard Emacs)
20022002
(define-key map "\C-c\C-k" #'ess-request-a-process)
20032003
(define-key map "," #'ess-smart-comma)
20042004
(define-key map "\C-c\C-d" 'ess-doc-map)

lisp/ess-r-mode.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -264,7 +264,7 @@ value by using `ess-r-runners-reset'."
264264
(defvar ess-r-mode-map
265265
(let ((map (make-sparse-keymap)))
266266
(define-key map (kbd "C-c C-=") #'ess-cycle-assign)
267-
(define-key map "\M-?" #'ess-complete-object-name)
267+
;;(define-key map "\M-?" #'ess-complete-object-name); not stealing M-? from "standard Emacs"
268268
(define-key map (kbd "C-c C-.") 'ess-rutils-map)
269269
map))
270270

0 commit comments

Comments
 (0)