summaryrefslogtreecommitdiff
path: root/src/ChangeLog.10
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2011-02-27 17:07:29 -0800
committerGlenn Morris <rgm@gnu.org>2011-02-27 17:07:29 -0800
commit2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb (patch)
treeb924eb1c22ab3bce643676162ef039f250782661 /src/ChangeLog.10
parentdf7f0d0b10ce31a6f1a8b7e979e120c695699d5a (diff)
parentd1f61aaf6f0b6a2cf2bbb7eaf5631f8b580568d4 (diff)
downloademacs-2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb.tar.gz
Merge from emacs-23; up to 2010-06-03T05:41:49Z!rgm@gnu.org.
Diffstat (limited to 'src/ChangeLog.10')
-rw-r--r--src/ChangeLog.104
1 files changed, 2 insertions, 2 deletions
diff --git a/src/ChangeLog.10 b/src/ChangeLog.10
index 869ab5b07d8..6152b4c76af 100644
--- a/src/ChangeLog.10
+++ b/src/ChangeLog.10
@@ -20002,7 +20002,7 @@
* w32reg.c (w32_get_rdb_resource): New function.
(x_get_string_resource): Use it, so resources passed with -xrm
- supercede the ones in the registry.
+ supersede the ones in the registry.
2003-03-04 Jan Djärv <jan.h.d@swipnet.se>
@@ -25474,7 +25474,7 @@
recursive call unless that arg is non-nil.
(where_is_internal): New argument no_remap. Callers changed.
Call recursively to find original key bindings for a remapped
- comand unless that arg is non-nil.
+ command unless that arg is non-nil.
(Fwhere_is_internal): New optional argument NO-REMAP.
Doc updated. Callers changed. Pass arg to where_is_internal.