lib/linebreak.c.diff is no longer needed.

diff --git a/gnulib-local/ChangeLog b/gnulib-local/ChangeLog
index 32f32ef070a5f86a840691588f7dfb691a6de56e..a46811c6070c9e5712be8284a6b6cc29b9cde47a 100644 (file)
--- a/gnulib-local/ChangeLog
+++ b/gnulib-local/ChangeLog
@@ -1,3 +1,8 @@
+2008-05-10  Bruno Haible  <bruno@clisp.org>
+
+       * lib/linebreak.c.diff: Remove file.
+       * Makefile.am (EXTRA_DIST): Remove it.
+
 2008-01-13  Bruno Haible  <bruno@clisp.org>
 
        New configure option --disable-curses.

diff --git a/gnulib-local/Makefile.am b/gnulib-local/Makefile.am
index 228e45c3fa7ce3575b964a682a940a438abbeb4a..9499db64172f7b4b6d60dc42ac632607e46c55a3 100644 (file)
--- a/gnulib-local/Makefile.am
+++ b/gnulib-local/Makefile.am
@@ -218,7 +218,6 @@ lib/libxml/xpath.in.h \
 lib/libxml/xpathInternals.in.h \
 lib/libxml/xpointer.c \
 lib/libxml/xpointer.in.h \
-lib/linebreak.c.diff \
 lib/memory-ostream.oo.c \
 lib/memory-ostream.oo.h \
 lib/moo.h \

diff --git a/gnulib-local/lib/linebreak.c.diff b/gnulib-local/lib/linebreak.c.diff
deleted file mode 100644 (file)
index 1b09615..0000000
--- a/gnulib-local/lib/linebreak.c.diff
+++ /dev/null
@@ -1,68 +0,0 @@
-*** linebreak.c.orig   2007-09-01 17:41:07.000000000 +0200
---- linebreak.c        2007-09-01 17:41:26.000000000 +0200
-***************
-*** 247,252 ****
---- 247,254 ----
-      }
-  }
-  
-+ #ifdef unused
-+ 
-  void
-  u16_possible_linebreaks (const unsigned short *s, size_t n, const char *encoding, char *p)
-  {
-***************
-*** 467,472 ****
---- 469,476 ----
-      }
-  }
-  
-+ #endif
-+ 
-  
-  /* Choose the best line breaks, assuming the uc_width function.
-     Return the column after the end of the string.  */
-***************
-*** 555,560 ****
---- 559,566 ----
-    return last_column + piece_width;
-  }
-  
-+ #ifdef unused
-+ 
-  int
-  u16_width_linebreaks (const unsigned short *s, size_t n,
-                        int width, int start_column, int at_end_columns,
-***************
-*** 722,727 ****
---- 728,735 ----
-    return last_column + piece_width;
-  }
-  
-+ #endif
-+ 
-  
-  #ifdef TEST1
-  
-***************
-*** 987,992 ****
---- 995,1002 ----
-  
-  #endif /* C_CTYPE_ASCII */
-  
-+ #if defined unused || defined TEST2
-+ 
-  void
-  mbs_possible_linebreaks (const char *s, size_t n, const char *encoding,
-                           char *p)
-***************
-*** 1080,1085 ****
---- 1090,1097 ----
-      }
-  }
-  
-+ #endif
-+ 
-  int
-  mbs_width_linebreaks (const char *s, size_t n,
-                        int width, int start_column, int at_end_columns,