merge trunk

4 files changed, 23 insertions, 5 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index da9b8c180c4..94a9ae6ed4d 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,8 @@
+2012-03-16  Glenn Morris  <rgm@gnu.org>
+
+        * HELLO: Say that this is not a comprehensive list.
+        Remove "duplicate" entry.  (Bug#11024)
+
 2012-02-20  Paul Eggert  <eggert@cs.ucla.edu>
 
         * emacs-buffer.gdb ($valmask): Don't assume EMACS_INT fits in 'long'.
diff --git a/etc/HELLO b/etc/HELLO
index d95f010aa6e..d6857235f68 100644
--- a/etc/HELLO
+++ b/etc/HELLO
@@ -1,4 +1,6 @@
 This is a list of ways to say hello in various languages.
+It is not intended to be comprehensive, but to demonstrate
+some of the character sets that Emacs supports.
 
 Non-ASCII examples:
   Europe: ,A!(BHola!, Gr,A|_(B Gott, Hyv,Add(B p,Ad(Biv,Add(B, Tere ,Au(Bhtust, Bon,Cu(Bu
@@ -46,7 +48,6 @@ Lao ((1>RJRERG(B)	(1JP:R-4U(B / (1"mcKib*!4U(B
 Malayalam ($,1@N@R@O@^@S@"(B) $,1@H@N@X@m@5@^@P@"(B
 Maltese (il-Malti)      Bon,Cu(Bu / Sa,C11(Ba
 Mathematics     $,1x (B p $,1x((B world $,1s"(B hello p  $,2!a(B
-Nederlands, Vlaams      Hallo / Dag
 Norwegian (norsk)       Hei / God dag
 Oriya ($,1:s;\;?:f(B) $,1;6;A;#;?;,;G(B
 Polish  (j,Bj(Bzyk polski)    Dzie,Bq(B dobry! / Cze,B6f(B!
@@ -55,7 +56,7 @@ Sinhala ($,1B#B2ABB$A}(B)	$,1AFAzB4AvB=B AqB*(B
 Slovak (sloven,Bh(Bina)       Dobr,A}(B de,Br(B
 Slovenian (sloven,B9h(Bina)   Pozdravljeni!
 Spanish (espa,Aq(Bol) ,A!(BHola!
-Swedish (p,Ae(B svenska)      Hej / Goddag / Hall,Ae(B
+Swedish (svenska)       Hej / Goddag / Hall,Ae(B
 Tamil ($,1<D<N<_<T<m(B)       $,1<U<C<5<m<5<N<m(B
 Telugu ($,1=d>&=r>!=W>!(B)    $,1=h=n=x>-=U=~=p=B(B
 Thai (,T@RIRd7B(B)    ,TJGQJ4U$CQ:(B / ,TJGQJ4U$hP(B
diff --git a/etc/NEWS b/etc/NEWS
index 72eaee13dd7..78b306f057e 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -251,7 +251,8 @@ On character terminals, these methods are used for characters that
 cannot be encoded by the `terminal-coding-system'.
 
 ---
-*** New input methods for Farsi: farsi and farsi-translit.
+*** New input methods for Farsi: farsi and farsi-translit;
+and for Bulgarian: bulgarian-alt-phonetic.
 
 +++
 *** `nobreak-char-display' now also highlights Unicode hyphen chars
@@ -468,6 +469,11 @@ been shown in a specific window.
 This is handy for minibuffer-only frames, and is also used for the feature
 where mouse-1 pops up *Messages*"', which can now easily be changed.
 
+---
+** Minibuffers set `truncate-lines' to nil.
+If you want to change the value to something else, you could use
+for example minibuffer-setup-hook.
+
 
 * Editing Changes in Emacs 24.1
 
@@ -1030,7 +1036,7 @@ for buffers with dead inferior processes has been generalized.
 ** The return value of `backup-buffer' has changed.
 It is now a list of three elements, where the second element is a list
 describing the original file's SELinux context.  If Emacs or the
-system lacks SELinux cupport, the context list is (nil nil nil nil).
+system lacks SELinux support, the context list is (nil nil nil nil).
 See the "Basic SELinux support" entry under "Changes in Emacs 24.1",
 above.
 
@@ -1370,7 +1376,7 @@ This can be useful when `inhibit-quit' is set.
 
 +++
 ** The new function `server-eval-at' allows evaluation of Lisp forms on
-named Emacs server instances, using TCP sockets.
+named Emacs server instances.
 
 +++
 ** `call-process' and `call-process-region' allow a `(:file "file")' spec
diff --git a/etc/PROBLEMS b/etc/PROBLEMS
index 75627f084cd..ae3f49868b2 100644
--- a/etc/PROBLEMS
+++ b/etc/PROBLEMS
@@ -302,6 +302,12 @@ Help mode due to setting `temp-buffer-show-hook' rather than using
 
 ** Keyboard problems
 
+*** Unable to enter the M-| key on some German keyboards.
+Some users have reported that M-| suffers from "keyboard ghosting".
+This can't be fixed by Emacs, as the keypress never gets passed to it
+at all (as can be verified using "xev").  You can work around this by
+typing `ESC |' instead.
+
 *** "Compose Character" key does strange things when used as a Meta key.
 
 If you define one key to serve as both Meta and Compose Character, you