aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog.10
diff options
context:
space:
mode:
authorGlenn Morris2011-02-27 17:07:29 -0800
committerGlenn Morris2011-02-27 17:07:29 -0800
commit2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb (patch)
treeb924eb1c22ab3bce643676162ef039f250782661 /src/ChangeLog.10
parentdf7f0d0b10ce31a6f1a8b7e979e120c695699d5a (diff)
parentd1f61aaf6f0b6a2cf2bbb7eaf5631f8b580568d4 (diff)
downloademacs-2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb.tar.gz
emacs-2b0c7330457b8ca42375c92ada7dc7cefb0fa9fb.zip
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 @@
20002 20002
20003 * w32reg.c (w32_get_rdb_resource): New function. 20003 * w32reg.c (w32_get_rdb_resource): New function.
20004 (x_get_string_resource): Use it, so resources passed with -xrm 20004 (x_get_string_resource): Use it, so resources passed with -xrm
20005 supercede the ones in the registry. 20005 supersede the ones in the registry.
20006 20006
200072003-03-04 Jan Djärv <jan.h.d@swipnet.se> 200072003-03-04 Jan Djärv <jan.h.d@swipnet.se>
20008 20008
@@ -25474,7 +25474,7 @@
25474 recursive call unless that arg is non-nil. 25474 recursive call unless that arg is non-nil.
25475 (where_is_internal): New argument no_remap. Callers changed. 25475 (where_is_internal): New argument no_remap. Callers changed.
25476 Call recursively to find original key bindings for a remapped 25476 Call recursively to find original key bindings for a remapped
25477 comand unless that arg is non-nil. 25477 command unless that arg is non-nil.
25478 (Fwhere_is_internal): New optional argument NO-REMAP. 25478 (Fwhere_is_internal): New optional argument NO-REMAP.
25479 Doc updated. Callers changed. Pass arg to where_is_internal. 25479 Doc updated. Callers changed. Pass arg to where_is_internal.
25480 25480