merge trunk

9 files changed, 21 insertions, 7 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 452a99d2d9b..11aba88c6a1 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,13 @@
+2012-08-28  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * charsets/MULE-ethiopic.map: Fix typo in comment.
+        * charsets/MULE-ipa.map: Likewise.
+        * charsets/MULE-is13194.map: Likewise.
+        * charsets/MULE-lviscii.map: Likewise.
+        * charsets/MULE-sisheng.map: Likewise.
+        * charsets/MULE-tibetan.map: Likewise.
+        * charsets/MULE-uviscii.map: Likewise.
+
 2012-08-09  Chong Yidong  <cyd@gnu.org>
 
         * images/splash.svg, images/splash.png: Tweak SVG paths to improve
diff --git a/etc/NEWS b/etc/NEWS
index fb8722ab8f8..e17846cc4d0 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -207,6 +207,8 @@ It copies the region-rectangle as the last rectangle kill.
 
 * Changes in Specialized Modes and Packages in Emacs 24.3
 
+** Compilation has a new `compilation-always-kill' configuration variable.
+
 ** Term changes
 
 The variables `term-default-fg-color' and `term-default-bg-color' are
@@ -588,6 +590,8 @@ are deprecated and will be removed eventually.
 
 * Lisp changes in Emacs 24.3
 
+** New minor mode `read-only-mode' to replace toggle-read-only (now obsolete).
+
 ** New functions `autoloadp' and `autoload-do-load'.
 
 ** New function `posnp' to test if an object is a `posn'.
diff --git a/etc/charsets/MULE-ethiopic.map b/etc/charsets/MULE-ethiopic.map
index d2720bd10ba..30cf5736763 100644
--- a/etc/charsets/MULE-ethiopic.map
+++ b/etc/charsets/MULE-ethiopic.map
@@ -1,4 +1,4 @@
-# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
+# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3.
 0x2121 0x1200
 0x2122 0x1201
 0x2123 0x1202
diff --git a/etc/charsets/MULE-ipa.map b/etc/charsets/MULE-ipa.map
index 35e5d50ecec..0a6c61d5a95 100644
--- a/etc/charsets/MULE-ipa.map
+++ b/etc/charsets/MULE-ipa.map
@@ -1,4 +1,4 @@
-# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
+# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3.
 0x20 0x0069
 0x21 0x026A
 0x22 0x0065
diff --git a/etc/charsets/MULE-is13194.map b/etc/charsets/MULE-is13194.map
index 1fa9b21dcf8..390132cd375 100644
--- a/etc/charsets/MULE-is13194.map
+++ b/etc/charsets/MULE-is13194.map
@@ -1,4 +1,4 @@
-# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
+# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3.
 0x21 0x0901
 0x22 0x0902
 0x23 0x0903
diff --git a/etc/charsets/MULE-lviscii.map b/etc/charsets/MULE-lviscii.map
index 3b6a38be616..e4d2eca90ac 100644
--- a/etc/charsets/MULE-lviscii.map
+++ b/etc/charsets/MULE-lviscii.map
@@ -1,4 +1,4 @@
-# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
+# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3.
 0x21 0x1EAF
 0x22 0x1EB1
 0x23 0x1EB7
diff --git a/etc/charsets/MULE-sisheng.map b/etc/charsets/MULE-sisheng.map
index 405bb1ffa2c..144a3ff5134 100644
--- a/etc/charsets/MULE-sisheng.map
+++ b/etc/charsets/MULE-sisheng.map
@@ -1,4 +1,4 @@
-# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
+# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3.
 0x21 0x0101
 0x22 0x00E1
 0x23 0x01CE
diff --git a/etc/charsets/MULE-tibetan.map b/etc/charsets/MULE-tibetan.map
index 0d6ff3a0a39..b885585c094 100644
--- a/etc/charsets/MULE-tibetan.map
+++ b/etc/charsets/MULE-tibetan.map
@@ -1,4 +1,4 @@
-# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
+# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3.
 0x2130 0x0F00
 0x2131 0x0F01
 0x2132 0x0F02
diff --git a/etc/charsets/MULE-uviscii.map b/etc/charsets/MULE-uviscii.map
index 65e5d2968e5..dc19583bdfe 100644
--- a/etc/charsets/MULE-uviscii.map
+++ b/etc/charsets/MULE-uviscii.map
@@ -1,4 +1,4 @@
-# Generated by running amdin/charsets/mule-charsets.el in Emacs 22.3.
+# Generated by running admin/charsets/mule-charsets.el in Emacs 22.3.
 0x21 0x1EAE
 0x22 0x1EB0
 0x23 0x1EB6