Merge from emacs-24; up to 2012-12-27T17:59:21Z!rgm@gnu.org

8 files changed, 24 insertions, 10 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 348100c8408..0fff6931d00 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,3 +1,13 @@
+2013-05-09  Glenn Morris  <rgm@gnu.org>
+
+        * sending.texi (Mail Sending): Fix typo.
+
+        * windows.texi (Change Window): Fix typo.
+
+        * custom.texi (Changing a Variable): Fix typo.
+
+        * trouble.texi (Contributing): Remove obsolete info re pretesters.
+
 2013-05-05  Paul Eggert  <eggert@cs.ucla.edu>
 
         `write-region-inhibit-fsync' defaults to noninteractive (Bug#14273).
diff --git a/doc/emacs/custom.texi b/doc/emacs/custom.texi
index fae61252724..45fa45191f3 100644
--- a/doc/emacs/custom.texi
+++ b/doc/emacs/custom.texi
@@ -345,7 +345,7 @@ hidden, nor on subgroups that are hidden or not visible in the buffer.
 @kindex C-x C-c @r{(customization buffer)}
 @findex Custom-set
 @findex Custom-save
-  The command @kbd{C-c C-c} (@code{Custom-set}) is equivalent using to
+  The command @kbd{C-c C-c} (@code{Custom-set}) is equivalent to using
 the @samp{[Set for Current Session]} button.  The command @kbd{C-x
 C-s} (@code{Custom-save}) is like using the @samp{[Save for Future
 Sessions]} button.
diff --git a/doc/emacs/sending.texi b/doc/emacs/sending.texi
index 4c8af7e650e..1402d8a85be 100644
--- a/doc/emacs/sending.texi
+++ b/doc/emacs/sending.texi
@@ -374,7 +374,7 @@ This is the default, unless you have already set the variables for
 sending mail via @code{smtpmail-send-it} (see below).
 
 @item smtpmail-send-it
-Send mail using the through an external mail host, such as your
+Send mail through an external mail host, such as your
 Internet service provider's outgoing SMTP mail server.  If you have
 not told Emacs how to contact the SMTP server, it prompts for this
 information, which is saved in the @code{smtpmail-smtp-server} variable
diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi
index 1c667bc56cb..d0b6b5191c1 100644
--- a/doc/emacs/trouble.texi
+++ b/doc/emacs/trouble.texi
@@ -1138,12 +1138,9 @@ form that is clearly safe to install.
 @section Contributing to Emacs Development
 @cindex contributing to Emacs
 
-If you would like to help pretest Emacs releases to assure they work
-well, or if you would like to work on improving Emacs, please contact
-the maintainers at @email{emacs-devel@@gnu.org}.  A pretester
-should be prepared to investigate bugs as well as report them.  If you'd
-like to work on improving Emacs, please ask for suggested projects or
-suggest your own ideas.
+If you would like to work on improving Emacs, please contact
+the maintainers at @email{emacs-devel@@gnu.org}.  You can ask for
+suggested projects or suggest your own ideas.
 
 If you have already written an improvement, please tell us about it.  If
 you have not yet started work, it is useful to contact
diff --git a/doc/emacs/windows.texi b/doc/emacs/windows.texi
index 7ed0c682296..7c80cefcc7e 100644
--- a/doc/emacs/windows.texi
+++ b/doc/emacs/windows.texi
@@ -258,7 +258,7 @@ Make all windows the same height (@code{balance-windows}).
 the space that it occupied is given to an adjacent window (but not the
 minibuffer window, even if that is active at the time).  Deleting the
 window has no effect on the buffer it used to display; the buffer
-continues to exist, and you can still switch to with @kbd{C-x b}.
+continues to exist, and you can still switch to it with @kbd{C-x b}.
 
 @findex kill-buffer-and-window
 @kindex C-x 4 0
diff --git a/etc/MORE.STUFF b/etc/MORE.STUFF
index 671d8a06755..aeefe031359 100644
--- a/etc/MORE.STUFF
+++ b/etc/MORE.STUFF
@@ -41,6 +41,9 @@ a web search is often the best way to find results.
   The Emacs Wiki has an area for storing elisp files
   <URL:http://www.emacswiki.org/cgi-bin/wiki/ElispArea>.
 
+* WikEmacs
+  <URL:http://wikemacs.org> is an alternative wiki for Emacs.
+
 * Emacs slides and tutorials can be found here:
    <URL:http://web.psung.name/emacs/>
 
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index f4b67d34b56..5bbfe1a6ff7 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,7 @@
+2013-05-09  Ulrich Mueller  <ulm@gentoo.org>
+
+        * descr-text.el (describe-char): Fix %d/%x typo.  (Bug#14360)
+
 2013-05-09  Glenn Morris  <rgm@gnu.org>
 
         * international/fontset.el (vertical-centering-font-regexp):
diff --git a/lisp/descr-text.el b/lisp/descr-text.el
index 2aea0a96215..774ee92a146 100644
--- a/lisp/descr-text.el
+++ b/lisp/descr-text.el
@@ -753,7 +753,7 @@ relevant to POS."
                     (insert " by these characters:\n")
                     (while (and (<= from to)
                                 (setq glyph (lgstring-glyph gstring from)))
-                      (insert (format " %c (#x%d)\n"
+                      (insert (format " %c (#x%x)\n"
                                       (lglyph-char glyph) (lglyph-char glyph)))
                       (setq from (1+ from)))))
               (insert " by the rule:\n\t(")