diff options
| author | Daiki Ueno | 2014-07-16 14:44:05 +0900 |
|---|---|---|
| committer | Daiki Ueno | 2014-07-16 14:44:05 +0900 |
| commit | 74660d84d923fd8252b166770ca2403f6025a7ac (patch) | |
| tree | d137a32d62ad19c33bf4750ee6db32f4c3508a7f /src/ChangeLog | |
| parent | 037a830b500e5640335b2a45ccd52510fc5dc88b (diff) | |
| download | emacs-74660d84d923fd8252b166770ca2403f6025a7ac.tar.gz emacs-74660d84d923fd8252b166770ca2403f6025a7ac.zip | |
Revert 2014-07-16T04:11:08Z!ueno@gnu.org and fix XCHAR2B_BYTE[12] in nsgui.h only
* nsgui.h (XCHAR2B_BYTE1): Add missing parentheses around
pointer argument, before dereferencing.
(XCHAR2B_BYTE2): Likewise.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 2d81cf2f465..4fb688aed16 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,15 +1,8 @@ | |||
| 1 | 2014-07-16 Daiki Ueno <ueno@gnu.org> | 1 | 2014-07-15 Daiki Ueno <ueno@gnu.org> |
| 2 | 2 | ||
| 3 | Consolidate XChar2b macros for the X, W32, and NS | 3 | * nsgui.h (XCHAR2B_BYTE1): Add missing parentheses around |
| 4 | Suggested by Jan Djärv in: | 4 | pointer argument, before dereferencing. |
| 5 | https://lists.gnu.org/archive/html/emacs-devel/2014-07/msg00203.html | 5 | (XCHAR2B_BYTE2): Likewise. |
| 6 | * w32gui.h (STORE_XCHAR2B, XCHAR2B_BYTE1, XCHAR2B_BYTE2): Move the | ||
| 7 | fallback definitions to dispextern.h. | ||
| 8 | * nsgui.h (STORE_XCHAR2B, XCHAR2B_BYTE1, XCHAR2B_BYTE2): Likewise. | ||
| 9 | Share the same definition with W32. | ||
| 10 | * xterm.h (STORE_XCHAR2B, XCHAR2B_BYTE1, XCHAR2B_BYTE2): Move to ... | ||
| 11 | * dispextern.h (STORE_XCHAR2B, XCHAR2B_BYTE1, XCHAR2B_BYTE2): | ||
| 12 | ... here for the consistency with W32 and NS. | ||
| 13 | 6 | ||
| 14 | 2014-07-15 Dmitry Antipov <dmantipov@yandex.ru> | 7 | 2014-07-15 Dmitry Antipov <dmantipov@yandex.ru> |
| 15 | 8 | ||