diff options
| author | Paul Eggert | 2011-03-01 17:52:03 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-03-01 17:52:03 -0800 |
| commit | ba46f4d85a6938273f52a8cdf7e09d9afee61d7f (patch) | |
| tree | 606ec46b703532d463ccddf287f0053430eb1f4a /src/ChangeLog.10 | |
| parent | d9d0d182da35312ed0d7a9859b9c6a03994d86d8 (diff) | |
| parent | 0dc3e4109e0c41bbf5fdcae0ff1156162719693e (diff) | |
| download | emacs-ba46f4d85a6938273f52a8cdf7e09d9afee61d7f.tar.gz emacs-ba46f4d85a6938273f52a8cdf7e09d9afee61d7f.zip | |
Merge from mainline.
Diffstat (limited to 'src/ChangeLog.10')
| -rw-r--r-- | src/ChangeLog.10 | 4 |
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 | ||
| 20007 | 2003-03-04 Jan Djärv <jan.h.d@swipnet.se> | 20007 | 2003-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 | ||