(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/ChangeLog b/lisp/ChangeLog
index bb38dbc47ed4d792924d0b8a13f6c3f41c86cbd4..3bdd1fefca19db43f945bb0eb4f3b31368b7885e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,5 +1,9 @@
 2004-11-02  Kim F. Storm  <storm@cua.dk>
 
+       * 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 e80c129d3ea68a6362c010114fe611232cedceb1..82a8e10301e36ad89430cc7f445846f4c79db0b5 100644 (file)
--- 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)