branch: externals/ess
commit f193e204a74b3272b144ab247077a6202ae99395
Author: Martin Maechler <maech...@r-project.org>
Commit: Martin Maechler <maech...@r-project.org>
remove one conflict of standard emacs' M-? ; comment the other
---
lisp/ess-inf.el | 2 +-
lisp/ess-r-mode.el | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lisp/ess-inf.el b/lisp/ess-inf.el
index 57e1f5fd86..28c79357f0 100644
--- a/lisp/ess-inf.el
+++ b/lisp/ess-inf.el
@@ -1998,7 +1998,7 @@ meaning as for `ess-eval-region'."
(define-key map "\C-c\C-z" #'ess-switch-to-inferior-or-script-buffer) ;
mask comint map
(define-key map "\C-d" #'delete-char) ; EOF no good in S
(define-key map "\t" #'completion-at-point)
- (define-key map "\M-?" #'ess-complete-object-name)
+ (define-key map "\M-?" #'ess-complete-object-name); stealing M-? from
xref(standard Emacs)
(define-key map "\C-c\C-k" #'ess-request-a-process)
(define-key map "," #'ess-smart-comma)
(define-key map "\C-c\C-d" 'ess-doc-map)
diff --git a/lisp/ess-r-mode.el b/lisp/ess-r-mode.el
index 8e5dab1f78..2a6c329329 100644
--- a/lisp/ess-r-mode.el
+++ b/lisp/ess-r-mode.el
@@ -264,7 +264,7 @@ value by using `ess-r-runners-reset'."
(defvar ess-r-mode-map
(let ((map (make-sparse-keymap)))
(define-key map (kbd "C-c C-=") #'ess-cycle-assign)
- (define-key map "\M-?" #'ess-complete-object-name)
+ ;;(define-key map "\M-?" #'ess-complete-object-name); not stealing M-?
from "standard Emacs"
(define-key map (kbd "C-c C-.") 'ess-rutils-map)
map))
