Merge from trunk.

1 files changed, 20 insertions, 3 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 6030dd8f6d3..4da85943b7f 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,20 @@
+2011-11-26  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * grammars/bovine-grammar.el (bovine--grammar-newstyle-unquote):
+        Avoid warning about old-style backquote.
+
+        * grammars/wisent-grammar.el (auto-mode-alist): Change `$' to `\''
+        in regexp.
+        (wisent-make-parsers): Likewise.  Quote `.'.
+
+        * grammars/bovine-grammar.el (auto-mode-alist): Change `$' to `\''
+        in regexp.
+        (bovine-make-parsers): Likewise.  Quote `.'.
+
+2011-11-20  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * CPP-DEFINES (VIRT_ADDR_VARIES): Remove.
+
 2011-11-16  Juanma Barranquero  <lekktu@gmail.com>
 
         * admin.el (manual-dvi): Fix typo.
@@ -398,7 +415,7 @@
 
 2009-06-24  Kenichi Handa  <handa@m17n.org>
 
-        * charsets/mapconv: For the UNICODE format files, do reverse sort
+        * charsets/mapconv: For the Unicode format files, do reverse sort
         and don't compact the map.  This is to prefer the first one in the
         duplicated mappings (e.g. 0x20->U+0020, 0x20->U+00A0).
 
@@ -893,11 +910,11 @@
 
         * FOR-RELEASE (NEW FEATURES): Completed work on this item:
         Rework how fringe bitmaps are defined and used.
-        Currently, bitmap usage and bitmap appearence are "mixed-up" in a
+        Currently, bitmap usage and bitmap appearance are "mixed-up" in a
         one-level representation.  It would be cleaner to split the
         representation into a two-level model where first level maps
         bitmap usage to a bitmap name, and second level maps bitmap name to
-        a bitmap appearence.
+        a bitmap appearance.
 
 2006-01-27  Chong Yidong  <cyd@stupidchicken.com>