aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Rudalics2008-09-28 08:43:50 +0000
committerMartin Rudalics2008-09-28 08:43:50 +0000
commitc41bd0ec431e1b15b5f800b2ca302cc27f2208f5 (patch)
treeba795010428082f7cbfde9cd87495ed4411c14ba
parentc73ae4aedf8b59b90acd8c5f9e4da837161cc91e (diff)
downloademacs-c41bd0ec431e1b15b5f800b2ca302cc27f2208f5.tar.gz
emacs-c41bd0ec431e1b15b5f800b2ca302cc27f2208f5.zip
(read-quoted-char): Call char-resolve-modifiers
instead of char-resolve-modifers.
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/subr.el2
2 files changed, 6 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0278476b49e..034569fc30e 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12008-09-28 Martin Rudalics <rudalics@gmx.at>
2
3 * subr.el (read-quoted-char): Call char-resolve-modifiers
4 instead of char-resolve-modifers.
5
12008-09-27 Glenn Morris <rgm@gnu.org> 62008-09-27 Glenn Morris <rgm@gnu.org>
2 7
3 * play/solitaire.el (solitaire-mode-map): Bind "\r" rather 8 * play/solitaire.el (solitaire-mode-map): Bind "\r" rather
diff --git a/lisp/subr.el b/lisp/subr.el
index 2ce6b234e60..d62b38b00d4 100644
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1742,7 +1742,7 @@ any other non-digit terminates the character code and is then used as input."))
1742 ;; bound to some prefix in function-key-map or key-translation-map. 1742 ;; bound to some prefix in function-key-map or key-translation-map.
1743 (setq translated 1743 (setq translated
1744 (if (integerp char) 1744 (if (integerp char)
1745 (char-resolve-modifers char) 1745 (char-resolve-modifiers char)
1746 char)) 1746 char))
1747 (let ((translation (lookup-key local-function-key-map (vector char)))) 1747 (let ((translation (lookup-key local-function-key-map (vector char))))
1748 (if (arrayp translation) 1748 (if (arrayp translation)