From d58cba753997eba892a0f4c9a642c5cfc77099f6 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 9 Jan 2012 17:13:27 +0800 Subject: Backport Bug#9990 fix from trunk * src/dispnew.c (scrolling_window): Fix incorrect indices in accessing current_matrix and desired_matrix. (Bug#9990) --- src/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index d006f58b8b6..55cc8e8bf27 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-01-09 Eli Zaretskii + + * dispnew.c (scrolling_window): Fix incorrect indices in accessing + current_matrix and desired_matrix. (Bug#9990) + 2011-10-31 YAMAMOTO Mitsuharu * xmenu.c (cleanup_widget_value_tree): New function. -- cgit v1.2.1 From de92a50b9e157cac071355b9836717e62b9edff1 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Mon, 9 Jan 2012 17:23:36 +0800 Subject: Fix glitch in scrolling_window (backport from trunk). * dispnew.c (scrolling_window): Truncate overlaps in copy destination of scroll runs so as to avoid assigning disabled bogus rows and unnecessary graphics copy operations. --- src/ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 55cc8e8bf27..d0c89f2e44c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2012-01-09 YAMAMOTO Mitsuharu + + * dispnew.c (scrolling_window): Truncate overlaps in copy + destination of scroll runs so as to avoid assigning disabled bogus + rows and unnecessary graphics copy operations. + 2012-01-09 Eli Zaretskii * dispnew.c (scrolling_window): Fix incorrect indices in accessing -- cgit v1.2.1 From 0c5b9eef72cbb54964d34c28ddffd17a0646bc87 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 9 Jan 2012 17:27:02 +0800 Subject: Fix use of uninitialized variable (backport from trunk). * xdisp.c (note_mouse_highlight): Initialize `part', to avoid a possible random value that matches one of those tested as condition to clear the mouse face. --- src/ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index d0c89f2e44c..c819bb08369 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2012-01-09 Eli Zaretskii + + * xdisp.c (note_mouse_highlight): Initialize `part', to avoid a + possible random value that matches one of those tested as + condition to clear the mouse face. + 2012-01-09 YAMAMOTO Mitsuharu * dispnew.c (scrolling_window): Truncate overlaps in copy -- cgit v1.2.1 From d12815f82606816370e32309deefa8081de64d51 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Mon, 9 Jan 2012 17:35:21 +0800 Subject: Fix use of uninitialized var (backport from trunk). * xdisp.c (note_mouse_highlight): Fix use of uninitialized var. --- src/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index c819bb08369..fcaff20727d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-01-09 Chong Yidong + + * xdisp.c (note_mouse_highlight): Fix use of uninitialized var. + 2012-01-09 Eli Zaretskii * xdisp.c (note_mouse_highlight): Initialize `part', to avoid a -- cgit v1.2.1 From 1ba94341834d2846ca3bde3e5c1154fb365b7360 Mon Sep 17 00:00:00 2001 From: Johan Bockgård Date: Mon, 9 Jan 2012 17:44:18 +0800 Subject: Avoid crash on composition (backport from trunk). * xdisp.c (fill_composite_glyph_string): Always set s->face, to avoid a crash (bug#9496). --- src/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index fcaff20727d..7cfb3aa61e1 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-11-11 Johan Bockgård + + * xdisp.c (fill_composite_glyph_string): Always set s->face, to + avoid a crash (bug#9496). + 2012-01-09 Chong Yidong * xdisp.c (note_mouse_highlight): Fix use of uninitialized var. -- cgit v1.2.1 From ed516deec46c8e45356c066b79c3f77ca8cdb4d0 Mon Sep 17 00:00:00 2001 From: Eli Zaretskii Date: Mon, 9 Jan 2012 17:49:08 +0800 Subject: Fix uninitialized variable in note_mouse_highlight (backport from trunk). * xdisp.c (note_mouse_highlight): Initialize `area'. (Bug#9947) --- src/ChangeLog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 7cfb3aa61e1..46d1b292425 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -9,9 +9,9 @@ 2012-01-09 Eli Zaretskii - * xdisp.c (note_mouse_highlight): Initialize `part', to avoid a - possible random value that matches one of those tested as - condition to clear the mouse face. + * xdisp.c (note_mouse_highlight): Initialize `area'. (Bug#9947) + Initialize `part', to avoid a possible random value that matches + one of those tested as condition to clear the mouse face. 2012-01-09 YAMAMOTO Mitsuharu -- cgit v1.2.1 From 49f70d46ea38ceb7a501594db7f6ea35e19681aa Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Tue, 10 Jan 2012 23:52:35 -0800 Subject: Add 2012 to FSF copyright years for Emacs files (do not merge to trunk) --- src/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 46d1b292425..8f81cc78ed2 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -23000,7 +23000,7 @@ See ChangeLog.10 for earlier changes. ;; add-log-time-zone-rule: t ;; End: - Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. + Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. This file is part of GNU Emacs. -- cgit v1.2.1 From 39ac32998179359c74f49be6564f11acf4db8b20 Mon Sep 17 00:00:00 2001 From: Sven Joachim Date: Thu, 12 Jan 2012 18:41:16 +0800 Subject: * src/s/gnu-linux.h: Use CRT_DIR. --- src/ChangeLog | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 8f81cc78ed2..62554190500 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +2012-01-12 Sven Joachim + + * s/gnu-linux.h: Use CRT_DIR. + 2011-11-11 Johan Bockgård * xdisp.c (fill_composite_glyph_string): Always set s->face, to -- cgit v1.2.1 From 25ed9e61dbea0a7a4f4a84288000bc30ebd7ac87 Mon Sep 17 00:00:00 2001 From: Kenichi Handa Date: Fri, 13 Jan 2012 14:47:28 +0900 Subject: Take display-table into account on calculating character/string width (#Bug#9496). --- src/ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 62554190500..4c657ae64ee 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2011-12-26 Kenichi Handa + + * character.c (char_width): New function. + (Fchar_width, c_string_width, lisp_string_width): Use char_width + (Bug#9496). + 2012-01-12 Sven Joachim * s/gnu-linux.h: Use CRT_DIR. -- cgit v1.2.1 From 70d4fdf6255b95d89452180d1173343bafa893df Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 13 Jan 2012 09:26:05 -0800 Subject: ChangeLog date fix (no need to merge to trunk) --- src/ChangeLog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 4c657ae64ee..28d6fcbec5d 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,8 +1,8 @@ -2011-12-26 Kenichi Handa +2011-01-13 Kenichi Handa * character.c (char_width): New function. - (Fchar_width, c_string_width, lisp_string_width): Use char_width - (Bug#9496). + (Fchar_width, c_string_width, lisp_string_width): + Use char_width (Bug#9496). 2012-01-12 Sven Joachim -- cgit v1.2.1 From 9a20751b09b6179de1fdc93a9f38bc5646c54967 Mon Sep 17 00:00:00 2001 From: Glenn Morris Date: Fri, 13 Jan 2012 11:15:24 -0800 Subject: Fix previous ChangeLog date fix (no need to merge to trunk) --- src/ChangeLog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 28d6fcbec5d..8d784e1fa90 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,4 +1,4 @@ -2011-01-13 Kenichi Handa +2012-01-13 Kenichi Handa * character.c (char_width): New function. (Fchar_width, c_string_width, lisp_string_width): -- cgit v1.2.1 From eb74c659d5529b14c7f3aad4b51e39161178fea7 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Sun, 15 Jan 2012 10:55:52 +0800 Subject: Fix wrong font metrics for mouse highlight (backport 2011-12-15T02:12:08Z!handa@m17n.org from trunk) * src/xftfont.c (xftfont_draw): Use the font metrics of s->font to fill background (Bug#8992). --- src/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 8d784e1fa90..2238c1b8bfd 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-01-15 YAMAMOTO Mitsuharu + + * xftfont.c (xftfont_draw): Use the font metrics of s->font to + fill background (Bug#8992). + 2012-01-13 Kenichi Handa * character.c (char_width): New function. -- cgit v1.2.1 From 893d44a1693a196f3022492f66c0205b7ccbeb47 Mon Sep 17 00:00:00 2001 From: Yoshiaki Kasahara Date: Wed, 18 Jan 2012 23:01:35 +0800 Subject: Fix init_buffer for USE_MMAP_FOR_BUFFERS case (backport from trunk) * buffer.c (init_buffer) [USE_MMAP_FOR_BUFFERS]: Adjust to aliasing change. --- src/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 2238c1b8bfd..18b96b04195 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-01-18 Yoshiaki Kasahara (tiny change) + + * buffer.c (init_buffer) [USE_MMAP_FOR_BUFFERS]: Adjust to + aliasing change. + 2012-01-15 YAMAMOTO Mitsuharu * xftfont.c (xftfont_draw): Use the font metrics of s->font to -- cgit v1.2.1 From 34a02f46dce0136ef10deb0f632330c76babbd9c Mon Sep 17 00:00:00 2001 From: Martin Rudalics Date: Thu, 19 Jan 2012 11:38:31 +0100 Subject: Fix handling of persistent window parameters. * window.c (save_window_save, Fcurrent_window_configuration) (Vwindow_persistent_parameters): Do not use Qstate. Rewrite doc-strings. * window.el (window--state-get-1, window-state-get): Do not use special state value for window-persistent-parameters. Rename argument IGNORE to WRITABLE. Rewrite doc-string. (window--state-put-2): Reset all window parameters to nil before assigning values of persistent parameters. * windows.texi (Window Configurations): Rewrite references to persistent window parameters. (Window Parameters): Fix description of persistent window parameters. --- src/ChangeLog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 3a6e31eede4..faaea4057c5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,9 @@ +2012-01-19 Martin Rudalics + + * window.c (save_window_save, Fcurrent_window_configuration) + (Vwindow_persistent_parameters): Do not use Qstate. Rewrite + doc-strings. + 2012-01-19 Kenichi Handa * character.c (char_width): New function. -- cgit v1.2.1 From 959ad23fb9020a121c4520946835e9f0aeb9bcb2 Mon Sep 17 00:00:00 2001 From: Andreas Schwab Date: Sat, 21 Jan 2012 11:54:19 +0100 Subject: * process.c (read_process_output): Use p instead of XPROCESS (proc). (send_process): Likewise. --- src/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index faaea4057c5..925bb8299ba 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-01-21 Andreas Schwab + + * process.c (read_process_output): Use p instead of XPROCESS (proc). + (send_process): Likewise. + 2012-01-19 Martin Rudalics * window.c (save_window_save, Fcurrent_window_configuration) -- cgit v1.2.1 From 3c2907f7e83d2a324aca245b5cb1b8c84a1055e7 Mon Sep 17 00:00:00 2001 From: Chong Yidong Date: Sat, 21 Jan 2012 23:52:46 +0800 Subject: Make second arg of copysign non-optional. * src/floatfns.c (Fcopysign): Make the second argument non-optional, since nil is not allowed anyway. --- src/ChangeLog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'src/ChangeLog') diff --git a/src/ChangeLog b/src/ChangeLog index 925bb8299ba..c8b1e654830 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-01-21 Chong Yidong + + * floatfns.c (Fcopysign): Make the second argument non-optional, + since nil is not allowed anyway. + 2012-01-21 Andreas Schwab * process.c (read_process_output): Use p instead of XPROCESS (proc). -- cgit v1.2.1