[Emacs-diffs] trunk r113806: Merge from emacs-24; up to r111397

[Glenn Morris]

------------------------------------------------------------
revno: 113806 [merge]
revision-id: address@hidden
parent: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Sun 2013-08-11 17:09:11 -0700
message:
  Merge from emacs-24; up to r111397
modified:
  .bzrignore                     bzrignore-20091227212532-2lrlpwjsfm9i221p-1
  doc/emacs/ChangeLog            changelog-20091113204419-o5vbwnq5f7feedwu-6227
  doc/emacs/macos.texi           macos.texi-20091113204419-o5vbwnq5f7feedwu-6261
  doc/emacs/trouble.texi         
trouble.texi-20091113204419-o5vbwnq5f7feedwu-6279
  doc/lispintro/ChangeLog        changelog-20091113204419-o5vbwnq5f7feedwu-6128
  doc/lispintro/emacs-lisp-intro.texi 
emacslispintro.texi-20091113204419-o5vbwnq5f7feedwu-6143
  doc/misc/ChangeLog             changelog-20091113204419-o5vbwnq5f7feedwu-6331
  doc/misc/woman.texi            woman.texi-20091113204419-o5vbwnq5f7feedwu-6330
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/format.el                 format.el-20091113204419-o5vbwnq5f7feedwu-852

=== modified file '.bzrignore'
--- a/.bzrignore        2013-06-22 02:41:14 +0000
+++ b/.bzrignore        2013-08-12 00:09:11 +0000
@@ -29,7 +29,8 @@
 conftest*
 core
 DOC
-emacs-*/
+# make-dist output.
+./emacs-*
 GPATH
 GRTAGS
 GTAGS
@@ -95,9 +96,9 @@
 leim/changed.misc
 leim/changed.tit
 leim/stamp-subdir
-lib/.deps/
+lib/.deps
 lib/Makefile.in
-lib/deps/
+lib/deps
 lib/alloca.h
 lib/arg-nonnull.h
 lib/c++defs.h
@@ -113,7 +114,7 @@
 lib/stdint.h
 lib/stdlib.h
 lib/string.h
-lib/sys/
+lib/sys
 lib/SYS
 lib/time.h
 lib/unistd.h

=== modified file 'doc/emacs/ChangeLog'
--- a/doc/emacs/ChangeLog       2013-08-12 00:04:15 +0000
+++ b/doc/emacs/ChangeLog       2013-08-12 00:09:11 +0000
@@ -1,5 +1,9 @@
 2013-08-12  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'doc/emacs/macos.texi'
--- a/doc/emacs/macos.texi      2013-07-31 12:04:25 +0000
+++ b/doc/emacs/macos.texi      2013-08-12 00:09:11 +0000
@@ -210,4 +210,10 @@
 
 Emacs can be built and run under GNUstep, but there are still
 issues to be addressed.  Interested developers should contact
address@hidden
 @email{emacs-devel@@gnu.org}.
address@hidden ifnothtml
address@hidden
address@hidden://lists.gnu.org/mailman/listinfo/emacs-devel, the
+emacs-devel mailing list}.
address@hidden ifhtml

=== modified file 'doc/emacs/trouble.texi'
--- a/doc/emacs/trouble.texi    2013-05-09 02:44:12 +0000
+++ b/doc/emacs/trouble.texi    2013-08-12 00:09:11 +0000
@@ -658,7 +658,13 @@
 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
address@hidden
address@hidden@@gnu.org}.
address@hidden ifnothtml
address@hidden
address@hidden://lists.gnu.org/mailman/listinfo/bug-gnu-emacs, bug-gnu-emacs}.
address@hidden 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 @@
 @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
address@hidden
address@hidden@@gnu.org}.
address@hidden ifnothtml
address@hidden
address@hidden://lists.gnu.org/mailman/listinfo/emacs-devel, the
+emacs-devel mailing list}.
address@hidden 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
address@hidden@@gnu.org} before you start; it might be
-possible to suggest ways to make your extension fit in better with the
-rest of Emacs.
address@hidden
address@hidden@@gnu.org}
address@hidden ifnothtml
address@hidden
address@hidden://lists.gnu.org/mailman/listinfo/emacs-devel, emacs-devel}
address@hidden 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 @@
 
 @itemize @bullet
 @item
-Send a message to the mailing list
address@hidden@@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
address@hidden
+the mailing list @email{help-gnu-emacs@@gnu.org},
address@hidden ifnothtml
address@hidden
address@hidden://lists.gnu.org/mailman/listinfo/help-gnu-emacs, the
+help-gnu-emacs mailing list},
address@hidden 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.

=== modified file 'doc/lispintro/ChangeLog'
--- a/doc/lispintro/ChangeLog   2013-08-12 00:04:15 +0000
+++ b/doc/lispintro/ChangeLog   2013-08-12 00:09:11 +0000
@@ -1,5 +1,9 @@
 2013-08-12  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'doc/lispintro/emacs-lisp-intro.texi'
--- a/doc/lispintro/emacs-lisp-intro.texi       2013-08-07 13:58:41 +0000
+++ b/doc/lispintro/emacs-lisp-intro.texi       2013-08-12 00:09:11 +0000
@@ -954,7 +954,12 @@
 
 @flushright
 Robert J. Chassell
address@hidden
 @email{bob@@gnu.org}
address@hidden ifnothtml
address@hidden
+bob@@gnu.org
address@hidden ifhtml
 @end flushright
 
 @c ================ Beginning of main text ================
@@ -8312,7 +8317,7 @@
 
 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.
 

=== modified file 'doc/misc/ChangeLog'
--- a/doc/misc/ChangeLog        2013-08-12 00:04:15 +0000
+++ b/doc/misc/ChangeLog        2013-08-12 00:09:11 +0000
@@ -1,5 +1,7 @@
 2013-08-12  Glenn Morris  <address@hidden>
 
+       * 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.

=== modified file 'doc/misc/woman.texi'
--- a/doc/misc/woman.texi       2013-07-25 07:10:56 +0000
+++ b/doc/misc/woman.texi       2013-08-12 00:09:11 +0000
@@ -67,7 +67,12 @@
 @display
 As distributed with Emacs @value{EMACSVER}.
 
address@hidden
 @email{F.J.Wright@@qmw.ac.uk, Francis J. Wright}
address@hidden ifnothtml
address@hidden
+Francis J. Wright
address@hidden 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

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2013-08-11 21:51:10 +0000
+++ b/lisp/ChangeLog    2013-08-12 00:09:11 +0000
@@ -1,3 +1,8 @@
+2013-08-12  Glenn Morris  <address@hidden>
+
+       * format.el (format-annotate-function):
+       Handle read-only text properties in the source.  (Bug#14887)
+
 2013-08-11  Lars Magne Ingebrigtsen  <address@hidden>
 
        * net/eww.el (eww-display-html): Ignore coding system errors.  One

=== modified file 'lisp/format.el'
--- a/lisp/format.el    2013-01-01 09:11:05 +0000
+++ b/lisp/format.el    2013-07-27 00:29:42 +0000
@@ -225,10 +225,12 @@
                (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