aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim F. Storm <[email protected]>2004-11-01 23:16:25 +0000
committerKim F. Storm <[email protected]>2004-11-01 23:16:25 +0000
commitad8d994cbecb75742754f1a9d56e5f1b11950e78 (patch)
treec145216221c0bd8a575e9c4fee9d674e784be01f
parent3fc26d4804fac2ed6c3828b9c08037a6cb1a8920 (diff)
(electric-help-map): Reorder Q/q and R/r entries so
substitute-command-keys will select lower-case bindings like those used in the static help texts.
-rw-r--r--lisp/ChangeLog4
-rw-r--r--lisp/ehelp.el4
2 files changed, 6 insertions, 2 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index bb38dbc47e..3bdd1fefca 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
2004-11-02 Kim F. Storm <[email protected]>
+ * files.el (set-auto-mode-0): Don't rely on dynamic binding of
+ keep-mode-if-same variable. Add it as optional arg instead.
+ (set-auto-mode): Call set-auto-mode-0 with keep-mode-if-same.
+
* ehelp.el (electric-help-map): Reorder Q/q and R/r entries so
substitute-command-keys will select lower-case bindings like those
used in the static help texts.
diff --git a/lisp/ehelp.el b/lisp/ehelp.el
index e80c129d3e..82a8e10301 100644
--- a/lisp/ehelp.el
+++ b/lisp/ehelp.el
@@ -85,11 +85,11 @@
(define-key map "<" 'beginning-of-buffer)
(define-key map ">" 'end-of-buffer)
;(define-key map "\C-g" 'electric-help-exit)
- (define-key map "q" 'electric-help-exit)
(define-key map "Q" 'electric-help-exit)
+ (define-key map "q" 'electric-help-exit)
;;a better key than this?
- (define-key map "r" 'electric-help-retain)
(define-key map "R" 'electric-help-retain)
+ (define-key map "r" 'electric-help-retain)
(define-key map "\ex" 'electric-help-execute-extended)
(define-key map "\C-x" 'electric-help-ctrl-x-prefix)