Merge from emacs-24; up to 2013-01-02T10:15:31Z!michael.albinus@gmx.de

9 files changed, 73 insertions, 16 deletions

diff --git a/doc/emacs/ChangeLog b/doc/emacs/ChangeLog
index 3951150bd13..2b75a242656 100644
--- a/doc/emacs/ChangeLog
+++ b/doc/emacs/ChangeLog
@@ -1,5 +1,9 @@
 2013-08-12  Glenn Morris  <rgm@gnu.org>
 
+        * macos.texi (GNUstep Support):
+        * trouble.texi (Checklist, Contributing, Service):
+        Avoid mailto: in html output.
+
         * Makefile.in (prefix, datarootdir, datadir, PACKAGE_TARNAME)
         (docdir, dvidir, htmldir, pdfdir, psdir, GZIP_PROG, INSTALL)
         (INSTALL_DATA): New, set by configure.
diff --git a/doc/emacs/macos.texi b/doc/emacs/macos.texi
index 61c056ceb4b..50a7ea2c335 100644
--- a/doc/emacs/macos.texi
+++ b/doc/emacs/macos.texi
@@ -210,4 +210,10 @@ restart Emacs to access newly-available services.
 
 Emacs can be built and run under GNUstep, but there are still
 issues to be addressed.  Interested developers should contact
+@ifnothtml
 @email{emacs-devel@@gnu.org}.
+@end ifnothtml
+@ifhtml
+@url{http://lists.gnu.org/mailman/listinfo/emacs-devel, the
+emacs-devel mailing list}.
+@end ifhtml
diff --git a/doc/emacs/trouble.texi b/doc/emacs/trouble.texi
index d0b6b5191c1..0d5ce6820c7 100644
--- a/doc/emacs/trouble.texi
+++ b/doc/emacs/trouble.texi
@@ -658,7 +658,13 @@ absolutely sure it is best to leave it, so that the developers can
 decide for themselves.
 
 When you have finished writing your report, type @kbd{C-c C-c} and it
-will be sent to the Emacs maintainers at @email{bug-gnu-emacs@@gnu.org}.
+will be sent to the Emacs maintainers at
+@ifnothtml
+@email{bug-gnu-emacs@@gnu.org}.
+@end ifnothtml
+@ifhtml
+@url{http://lists.gnu.org/mailman/listinfo/bug-gnu-emacs, bug-gnu-emacs}.
+@end ifhtml
 (If you want to suggest an improvement or new feature, use the same
 address.)  If you cannot send mail from inside Emacs, you can copy the
 text of your report to your normal mail client (if your system
@@ -1138,15 +1144,26 @@ form that is clearly safe to install.
 @section Contributing to Emacs Development
 @cindex contributing to Emacs
 
-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 would like to work on improving Emacs, please contact the maintainers at
+@ifnothtml
+@email{emacs-devel@@gnu.org}.
+@end ifnothtml
+@ifhtml
+@url{http://lists.gnu.org/mailman/listinfo/emacs-devel, the
+emacs-devel mailing list}.
+@end ifhtml
+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
-@email{emacs-devel@@gnu.org} before you start; it might be
-possible to suggest ways to make your extension fit in better with the
-rest of Emacs.
+@ifnothtml
+@email{emacs-devel@@gnu.org}
+@end ifnothtml
+@ifhtml
+@url{http://lists.gnu.org/mailman/listinfo/emacs-devel, emacs-devel}
+@end ifhtml
+before you start; it might be possible to suggest ways to make your
+extension fit in better with the rest of Emacs.
 
 The development version of Emacs can be downloaded from the
 repository where it is actively maintained by a group of developers.
@@ -1164,10 +1181,17 @@ ways to find it:
 
 @itemize @bullet
 @item
-Send a message to the mailing list
-@email{help-gnu-emacs@@gnu.org}, or post your request on
-newsgroup @code{gnu.emacs.help}.  (This mailing list and newsgroup
-interconnect, so it does not matter which one you use.)
+Send a message to
+@ifnothtml
+the mailing list @email{help-gnu-emacs@@gnu.org},
+@end ifnothtml
+@ifhtml
+@url{http://lists.gnu.org/mailman/listinfo/help-gnu-emacs, the
+help-gnu-emacs mailing list},
+@end ifhtml
+or post your request on newsgroup @code{gnu.emacs.help}.  (This
+mailing list and newsgroup interconnect, so it does not matter which
+one you use.)
 
 @item
 Look in the service directory for someone who might help you for a fee.
diff --git a/doc/lispintro/ChangeLog b/doc/lispintro/ChangeLog
index 932e54de553..db02a257a3a 100644
--- a/doc/lispintro/ChangeLog
+++ b/doc/lispintro/ChangeLog
@@ -1,5 +1,9 @@
 2013-08-12  Glenn Morris  <rgm@gnu.org>
 
+        * emacs-lisp-intro.texi (Complete copy-region-as-kill): Fix typo.
+
+        * emacs-lisp-intro.texi (Thank You): Avoid mailto: in html output.
+
         * Makefile.in (prefix, datarootdir, datadir, PACKAGE_TARNAME)
         (docdir, dvidir, htmldir, pdfdir, psdir, GZIP_PROG, INSTALL)
         (INSTALL_DATA): New, set by configure.
diff --git a/doc/lispintro/emacs-lisp-intro.texi b/doc/lispintro/emacs-lisp-intro.texi
index 2160d7ba5a9..18ea8e87e19 100644
--- a/doc/lispintro/emacs-lisp-intro.texi
+++ b/doc/lispintro/emacs-lisp-intro.texi
@@ -954,7 +954,12 @@ encouragement.  My mistakes are my own.
 
 @flushright
 Robert J. Chassell
+@ifnothtml
 @email{bob@@gnu.org}
+@end ifnothtml
+@ifhtml
+bob@@gnu.org
+@end ifhtml
 @end flushright
 
 @c ================ Beginning of main text ================
@@ -8312,7 +8317,7 @@ As usual, this function can be divided into its component parts:
 
 The arguments are @code{beg} and @code{end} and the function is
 interactive with @code{"r"}, so the two arguments must refer to the
-beginning and end of the region.  If you have been reading though this
+beginning and end of the region.  If you have been reading through this
 document from the beginning, understanding these parts of a function is
 almost becoming routine.
 
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog
index 0ca3d049330..940a3fe5143 100644
--- a/doc/misc/ChangeLog
+++ b/doc/misc/ChangeLog
@@ -1,5 +1,7 @@
 2013-08-12  Glenn Morris  <rgm@gnu.org>
 
+        * woman.texi (Top): Avoid mailto: in html output.
+
         * Makefile.in (prefix, datarootdir, datadir, PACKAGE_TARNAME)
         (docdir, dvidir, htmldir, pdfdir, psdir, GZIP_PROG, INSTALL)
         (INSTALL_DATA): New, set by configure.
diff --git a/doc/misc/woman.texi b/doc/misc/woman.texi
index 44a8b5573fa..8005d58ce8a 100644
--- a/doc/misc/woman.texi
+++ b/doc/misc/woman.texi
@@ -67,7 +67,12 @@ modify this GNU manual.''
 @display
 As distributed with Emacs @value{EMACSVER}.
 
+@ifnothtml
 @email{F.J.Wright@@qmw.ac.uk, Francis J. Wright}
+@end ifnothtml
+@ifhtml
+Francis J. Wright
+@end ifhtml
 @uref{http://centaur.maths.qmw.ac.uk/, School of Mathematical Sciences}
 Queen Mary and Westfield College (University of London)
 Mile End Road, London E1 4NS, UK
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 48b31a2d06d..1b7aceb5979 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2013-08-12  Glenn Morris  <rgm@gnu.org>
+
+        * format.el (format-annotate-function):
+        Handle read-only text properties in the source.  (Bug#14887)
+
 2013-08-11  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
         * net/eww.el (eww-display-html): Ignore coding system errors.  One
diff --git a/lisp/format.el b/lisp/format.el
index 221eaadcdd8..fc8dcb97b01 100644
--- a/lisp/format.el
+++ b/lisp/format.el
@@ -225,10 +225,12 @@ For most purposes, consider using `format-encode-region' instead."
                 (setq selective-display sel-disp)
                 (set-buffer-multibyte multibyte)
                 (setq buffer-file-coding-system coding-system))
-              (copy-to-buffer copy-buf from to)
-              (set-buffer copy-buf)
-              (format-insert-annotations write-region-annotations-so-far from)
-              (format-encode-run-method to-fn (point-min) (point-max) orig-buf)
+              (let ((inhibit-read-only t)) ; bug#14887
+                (copy-to-buffer copy-buf from to)
+                (set-buffer copy-buf)
+                (format-insert-annotations write-region-annotations-so-far from)
+                (format-encode-run-method to-fn (point-min) (point-max)
+                                          orig-buf))
               (when (buffer-live-p copy-buf)
                 (with-current-buffer copy-buf
                   ;; Set write-region-post-annotation-function to