summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Worth <cworth@cworth.org>2005-06-03 15:54:40 +0000
committerCarl Worth <cworth@cworth.org>2005-06-03 15:54:40 +0000
commit56990720358ea18b026f952101ddd674a5fbb268 (patch)
tree575ffb7b22183a55111a85a8a986564bc19ed4bc
parent36beed9bf1b3ddef42e0fb1a46035ed4a6afa4f7 (diff)
Fix Freudian unwrapped line in paragraph describing why long lines should be wrapped.
-rw-r--r--CODING_STYLE5
-rw-r--r--ChangeLog7
-rw-r--r--src/cairo-gstate-private.h1
3 files changed, 9 insertions, 4 deletions
diff --git a/CODING_STYLE b/CODING_STYLE
index c2c6d4a59..f1a7b1c32 100644
--- a/CODING_STYLE
+++ b/CODING_STYLE
@@ -153,8 +153,9 @@ And function prototypes should similarly have the return type (and
associated specifiers and qualifiers) on a line above the function, so
that the function name is flush left.
-Break up long line (> ~80 characters) and use whitespace to align
-things nicely. For example the arguments in a long list to a function call should all be aligned with each other:
+Break up long lines (> ~80 characters) and use whitespace to align
+things nicely. For example the arguments in a long list to a function
+call should all be aligned with each other:
align_function_arguments (argument_the_first,
argument_the_second,
diff --git a/ChangeLog b/ChangeLog
index bf35f5b46..b37aaecd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,8 +1,13 @@
2005-06-03 Carl Worth <cworth@cworth.org>
+ * CODING_STYLE: Fix Freudian unwrapped line in paragraph
+ describing why long lines should be wrapped.
+
+2005-06-03 Carl Worth <cworth@cworth.org>
+
* CODING_STYLE: Add CODING_STYLE document to standardize on some
style issues.
-
+
* src/cairo-atsui-font.c:
* src/cairo-cache.c:
* src/cairo-ft-font.c:
diff --git a/src/cairo-gstate-private.h b/src/cairo-gstate-private.h
index 238b703e3..8a744856d 100644
--- a/src/cairo-gstate-private.h
+++ b/src/cairo-gstate-private.h
@@ -82,7 +82,6 @@ struct _cairo_gstate {
cairo_font_face_t *font_face;
cairo_scaled_font_t *scaled_font; /* Specific to the current CTM */
-
cairo_matrix_t font_matrix;
cairo_clip_t clip;