merge from upstream. currently seems to have bitroted and i get segfaults

[gnu-emacs] / src / bidi.c

diff --git a/src/bidi.c b/src/bidi.c
index 1f14f6ab8405b5a26bf95b1591ca2c47e28b7f8c..9740fe8f1d55f4ace1d66870396e2734c7133b73 100644 (file)
--- a/src/bidi.c
+++ b/src/bidi.c
@@ -1,5 +1,5 @@
 /* Low-level bidirectional buffer-scanning functions for GNU Emacs.
-   Copyright (C) 2000, 2001, 2004, 2005, 2009, 2010
+   Copyright (C) 2000-2001, 2004-2005, 2009-2011
    Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.