diff options
| author | Kenichi Handa | 2010-10-20 09:46:21 +0900 |
|---|---|---|
| committer | Kenichi Handa | 2010-10-20 09:46:21 +0900 |
| commit | cf5314c93a722b73cbf0f3607bea152d79c3df7b (patch) | |
| tree | 0722bb3e26bbf3dbfec1b8d240ea1e1bf16989f2 /src | |
| parent | 52ce289046a06a2ed342a796dbf3050e51dcb615 (diff) | |
| parent | 7c3f6228fffbbd96f7a85e1617c9d99d178d605b (diff) | |
| download | emacs-cf5314c93a722b73cbf0f3607bea152d79c3df7b.tar.gz emacs-cf5314c93a722b73cbf0f3607bea152d79c3df7b.zip | |
merge emacs-23
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 4 | ||||
| -rw-r--r-- | src/s/cygwin.h | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 46913c8a8b0..d33f9dd4f0b 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-10-18 Ken Brown <kbrown@cornell.edu> | ||
| 2 | |||
| 3 | * s/cygwin.h (SIGNALS_VIA_CHARACTERS): New define (bug#7225). | ||
| 4 | |||
| 1 | 2010-10-15 Kenichi Handa <handa@m17n.org> | 5 | 2010-10-15 Kenichi Handa <handa@m17n.org> |
| 2 | 6 | ||
| 3 | Fix incorrect font metrics when the same font is opened with | 7 | Fix incorrect font metrics when the same font is opened with |
diff --git a/src/s/cygwin.h b/src/s/cygwin.h index 9ca5c67ce37..dcab55a91e1 100644 --- a/src/s/cygwin.h +++ b/src/s/cygwin.h | |||
| @@ -132,6 +132,9 @@ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ | |||
| 132 | returns ENOSYS. A workaround is to set G_SLICE=always-malloc. */ | 132 | returns ENOSYS. A workaround is to set G_SLICE=always-malloc. */ |
| 133 | #define G_SLICE_ALWAYS_MALLOC | 133 | #define G_SLICE_ALWAYS_MALLOC |
| 134 | 134 | ||
| 135 | /* Send signals to subprocesses by "typing" special chars at them. */ | ||
| 136 | #define SIGNALS_VIA_CHARACTERS | ||
| 137 | |||
| 135 | /* the end */ | 138 | /* the end */ |
| 136 | 139 | ||
| 137 | /* arch-tag: 5ae7ba00-83b0-4ab3-806a-3e845779191b | 140 | /* arch-tag: 5ae7ba00-83b0-4ab3-806a-3e845779191b |