aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2014-12-28 09:00:14 -0800
committerPaul Eggert2014-12-28 09:00:41 -0800
commit20791069fa34b486c018ba7f27982bdc6ad2a4ea (patch)
treefe895873e492db9dd92e8c56c81d8c0903ec4174
parent79e2dade762491c58aa6396e35bae0ef418bafc6 (diff)
downloademacs-20791069fa34b486c018ba7f27982bdc6ad2a4ea.tar.gz
emacs-20791069fa34b486c018ba7f27982bdc6ad2a4ea.zip
Fix produce_composite_width typo
* term.c (produce_composite_glyph): Fix typo that confused number of columns for pixel width.
-rw-r--r--src/ChangeLog6
-rw-r--r--src/term.c2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 9e3fb904b93..2ab5101fc6f 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12014-12-28 Paul Eggert <eggert@cs.ucla.edu>
2
3 Fix produce_composite_width typo
4 * term.c (produce_composite_glyph):
5 Fix typo that confused number of columns for pixel width.
6
12014-12-28 Paul Eggert <eggert@Penguin.CS.UCLA.EDU> 72014-12-28 Paul Eggert <eggert@Penguin.CS.UCLA.EDU>
2 8
3 Wrap dll functions more simply 9 Wrap dll functions more simply
diff --git a/src/term.c b/src/term.c
index 04f6e3318a0..bcb83e5891d 100644
--- a/src/term.c
+++ b/src/term.c
@@ -1736,7 +1736,7 @@ produce_composite_glyph (struct it *it)
1736 { 1736 {
1737 struct composition *cmp = composition_table[it->cmp_it.id]; 1737 struct composition *cmp = composition_table[it->cmp_it.id];
1738 1738
1739 it->pixel_width = cmp->width; 1739 it->pixel_width = cmp->pixel_width;
1740 } 1740 }
1741 else 1741 else
1742 { 1742 {