HCoop
/
bpt
/
emacs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge from emacs-23; up to 2010-06-03T05:41:49Z!rgm@gnu.org.
[bpt/emacs.git]
/
src
/
ChangeLog.10
diff --git
a/src/ChangeLog.10
b/src/ChangeLog.10
index
133f5e6
..
6152b4c
100644
(file)
--- 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
* w32reg.c (w32_get_rdb_resource): New function.
(x_get_string_resource): Use it, so resources passed with -xrm
- super
c
ede the ones in the registry.
+ super
s
ede the ones in the registry.
2003-03-04 Jan Djärv <jan.h.d@swipnet.se>
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
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.
+ com
m
and unless that arg is non-nil.
(Fwhere_is_internal): New optional argument NO-REMAP.
Doc updated. Callers changed. Pass arg to where_is_internal.
(Fwhere_is_internal): New optional argument NO-REMAP.
Doc updated. Callers changed. Pass arg to where_is_internal.
@@
-27912,8
+27912,7
@@
See ChangeLog.9 for earlier changes.
;; add-log-time-zone-rule: t
;; End:
;; add-log-time-zone-rule: t
;; End:
- Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007,
- 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+ Copyright (C) 2001-2011 Free Software Foundation, Inc.
This file is part of GNU Emacs.
This file is part of GNU Emacs.