procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Glenn Morris 2013-08-11 17:09:11 -07:00
commit 7a22490f14
9 changed files with 73 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/emacs/ChangeLog
View file

@ -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.

6
doc/emacs/macos.texi
View file

@ -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

46
doc/emacs/trouble.texi
View file

@ -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.

4
doc/lispintro/ChangeLog
View file

@ -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.

7
doc/lispintro/emacs-lisp-intro.texi
View file

@ -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.

2
doc/misc/ChangeLog
View file

@ -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.

5
doc/misc/woman.texi
View file

@ -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

5
lisp/ChangeLog
View file

@ -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

10
lisp/format.el
View file

@ -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