diff options
| author | jave | 2015-01-02 16:30:55 +0100 |
|---|---|---|
| committer | jave | 2015-01-02 16:30:55 +0100 |
| commit | db4613576d3115aa320f0293d081ce98baa06acd (patch) | |
| tree | 829968643b451bd3f64c791e4d3a6c928010e14c /src/ChangeLog | |
| parent | c089503bac34376e75ae6f1d2c289fc8c9f42b8f (diff) | |
| parent | d0ca1148fe2d1e72e86f0197731071f139c143e3 (diff) | |
| download | emacs-db4613576d3115aa320f0293d081ce98baa06acd.tar.gz emacs-db4613576d3115aa320f0293d081ce98baa06acd.zip | |
merge master
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 85eb113db82..7b286ccb8bf 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,12 @@ | |||
| 1 | 2015-01-01 Eli Zaretskii <eliz@gnu.org> | ||
| 2 | |||
| 3 | * xdisp.c (pos_visible_p): Fix up the X coordinate for | ||
| 4 | right-to-left screen lines. (Bug#19473) | ||
| 5 | |||
| 6 | 2015-01-01 Eli Zaretskii <eliz@gnu.org> | ||
| 7 | |||
| 8 | * w32proc.c (Fw32_get_codepage_charset): Doc fix. (Bug#19458) | ||
| 9 | |||
| 1 | 2014-12-31 Paul Eggert <eggert@cs.ucla.edu> | 10 | 2014-12-31 Paul Eggert <eggert@cs.ucla.edu> |
| 2 | 11 | ||
| 3 | Simplify setfattr use by assuming GNU make | 12 | Simplify setfattr use by assuming GNU make |
| @@ -16082,7 +16091,7 @@ See ChangeLog.12 for earlier changes. | |||
| 16082 | ;; coding: utf-8 | 16091 | ;; coding: utf-8 |
| 16083 | ;; End: | 16092 | ;; End: |
| 16084 | 16093 | ||
| 16085 | Copyright (C) 2011-2014 Free Software Foundation, Inc. | 16094 | Copyright (C) 2011-2015 Free Software Foundation, Inc. |
| 16086 | 16095 | ||
| 16087 | This file is part of GNU Emacs. | 16096 | This file is part of GNU Emacs. |
| 16088 | 16097 | ||