From: Paul Eggert Date: Tue, 3 Mar 2015 22:35:41 +0000 (-0800) Subject: Merge from origin/emacs-24 X-Git-Tag: emacs-25.0.90~2564^2~240 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2c82deee7fbb951a90ed3246350fbf9390af038a;p=emacs.git Merge from origin/emacs-24 c0ba590 Fix vertical-motion and posn-at-point when word-wrap is a323b93 Better multi-line input support in comint.el 008a04a todo-mode.el: Restore point on setting item done (Bug#19727) 9615c0d doc/misc/erc.texi: fix typo c648717 Update ERC docs and update MAINTANERS to include myself d825f66 Fix filling circle/ellipse in Artist Mode (Bug#19763) Conflicts: admin/ChangeLog doc/misc/ChangeLog doc/misc/erc.texi lisp/ChangeLog src/ChangeLog --- 2c82deee7fbb951a90ed3246350fbf9390af038a diff --cc admin/ChangeLog index 9a160446b35,0f70469fc0c..bcc43c52af2 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@@ -1,4 -1,8 +1,9 @@@ -2015-02-04 Kelvin White ++2015-03-03 Kelvin White + + * MAINTAINERS: Add myself to section 2 + -2015-02-02 Glenn Morris ++2015-03-03 Glenn Morris +2015-03-03 Glenn Morris * admin.el (manual-meta-string): Use bug-gnu-emacs@gnu email address rather than webmasters@gnu. diff --cc doc/misc/ChangeLog index 4e9c119379d,0e43b9ffe4d..c00cb2f722a --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@@ -1,135 -1,22 +1,142 @@@ -2015-02-04 Kelvin White ++2015-03-03 Kelvin White + + * erc.texi (Advanced Usage, Options): Add descriptions and examples + for erc-format-nick-function and erc-rename-buffers options. + (Connecting): fix typo + -2014-12-29 Michael Albinus ++2015-03-03 Michael Albinus +2015-03-02 Daniel Colascione - Sync with Tramp 2.2.11. + * cl.texi (Iteration Clauses): Mention iterator support. + +2015-02-25 Tassilo Horn + + * reftex.texi (Multifile Documents): Document + reftex-include-file-commands. + (Options): Mention that non-customize changes might require + calling reftex-compile-variables. + +2015-02-21 Paul Eggert + + * texinfo.tex: Update from gnulib. + +2015-02-10 Lars Ingebrigtsen + + * eww.texi (Basics): Mention eww-toggle-fonts. + +2015-02-05 Glenn Morris + + * auth.texi (Multiple GMail accounts with Gnus): Markup fix. + +2015-02-05 Teodor Zlatanov + + * auth.texi (Multiple GMail accounts with Gnus): Add FAQ. + +2015-02-05 Lars Ingebrigtsen + + * gnus.texi (Using IMAP): Fix menu node name. + +2015-02-05 Trevor Murphy + + * gnus.texi (Support for IMAP Extensions): Document the Gmail label + extension. + +2015-02-04 Paul Eggert + + * texinfo.tex: Update from gnulib. + +2015-01-23 Thomas Fitzsimmons + + * eudc.texi (LDAP Configuration): Rename from LDAP Requirements + and provide configuration examples. + +2015-01-17 Stefan Monnier + * eieio.texi (Slot Options): Document :protection as unsupported. + +2015-01-01 Michael Albinus + + Sync with Tramp 2.2.11. * trampver.texi: Update release number. -2014-11-10 Tassilo Horn +2014-12-31 Paul Eggert - * gnus.texi (HTML): Update section so that it mentions shr and w3m. - Also link the full EWW manual that explains more on shr, too. + Less 'make' chatter for Emacs doc + * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_) + (am__v_GEN_0, am__v_GEN_1): New macros, from ../../src/Makefile.in. + (ENVADD, $(buildinfodir)/%.info, %.html, ${buildinfodir}/ccmode.info) + (${buildinfodir}/efaq%.info, efaq%.html): + Use them. - * gnus-faq.texi (FAQ 4 - Reading messages, FAQ 4-16): Add Q&A on how to - increase contrast when displaying HTML mail with shr. +2014-12-31 Filipp Gunbin + + * info.texi (Create Info buffer): Mention info-display-manual prefix. + +2014-12-29 Paul Eggert + + * efaq.texi (Displaying the current file name in the titlebar): + Prefer (system-name) to system-name. + * smtpmail.texi (Server workarounds): Fix grammar. + +2014-12-18 Eric Abrahamsen + + * gnus.texi (Gnus Registry Setup): Explain pruning changes. + Mention gnus-registry-prune-factor. Explain sorting changes and + gnus-registry-default-sort-function. Correct file extension. + +2014-12-17 Jay Belanger + + * calc.texi (About This Manual): Update instructions + for building the manual. + +2014-12-15 Alan Mackenzie + + "Advice" is a mass noun. Amend text accordingly. + * cl.texi (Obsolete Macros): Replace "an advice" with "advice". + +2014-12-12 Paul Eggert + + * texinfo.tex: Update from gnulib. + +2014-12-08 Andrey Kotlarski + + * eww.texi (Basics): Document managing multiple eww buffers. + +2014-12-05 Lars Magne Ingebrigtsen + + * eww.texi (Basics): Document eww PDF viewing. + +2014-11-23 Ivan Shmakov + + * eww.texi (Advanced): Mention the Desktop stuff (bug#18010). + +2014-11-23 Michael Albinus + + * tramp.texi (Remote processes): Let-bind environment variables to + `process-environment' when running `process-file' or + `start-file-process'. + +2014-11-19 Ivan Shmakov + + * eww.texi (Basics): Document `eww-history-limit'. + +2014-11-14 Paul Eggert + + * org.texi (The date/time prompt, Matching tags and properties): + Use leading zero with 24-hour times less than 10:00. + +2014-11-13 Lars Magne Ingebrigtsen + + * eww.texi (Variable Index): Mention `eww-after-render-hook'. + +2014-11-10 Lars Magne Ingebrigtsen + + * eww.texi (Basics): Document `eww-readable'. + +2014-11-10 Katsumi Yamaoka + + * gnus.texi (Top): Add missing `HTML' menu. + (HTML): Fix xref to FAQ 4-16. 2014-11-09 Glenn Morris diff --cc lisp/ChangeLog index 8083fb85cea,6c3caa826e8..cd042da8e92 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,4 -1,31 +1,32 @@@ -2015-02-05 Juri Linkov ++2015-03-03 Juri Linkov + + Revert the previous change of comint-line-beginning-position callers, + and modify comint-line-beginning-position instead. + + * comint.el (comint-history-isearch-search) + (comint-history-isearch-message, comint-history-isearch-wrap): + Use comint-line-beginning-position instead of field-beginning. + (comint-send-input): Use either end-of-line or field-end + depending on comint-use-prompt-regexp. + (comint-line-beginning-position): Search backward + for comint-prompt-regexp if comint-use-prompt-regexp is non-nil. + Use field-beginning instead of line-beginning-position + if comint-use-prompt-regexp is nil. (Bug#19710) + -2015-02-04 Robert Pluim (tiny change) ++2015-03-03 Robert Pluim (tiny change) + + * calendar/todo-mode.el (todo-item-done): When done items are + hidden, restore point to its location prior to invoking this + command. (Bug#19727) + -2015-02-04 Eli Zaretskii ++2015-03-03 Eli Zaretskii + + * textmodes/artist.el (artist-ellipse-compute-fill-info): Use + mapcar, not mapc, to create the other half of fill-info. + (Bug#19763) + -2015-02-04 Nicolas Petton ++2015-03-03 Nicolas Petton +2015-03-03 Nicolas Petton * emacs-lisp/authors.el (authors-ignored-files) (authors-renamed-files-alist): Additions. diff --cc src/ChangeLog index 0a05b544d98,135f28fb20f..5bfb1809139 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,4 -1,11 +1,12 @@@ -2015-02-05 Eli Zaretskii ++2015-03-03 Eli Zaretskii + + * xdisp.c (move_it_in_display_line_to): Handle the case where the + last character of a screen line is whitespace, and we are under + word-wrap with overflow-newline-into-fringe turned on. + (Bug#19769) + -2015-02-03 Eli Zaretskii ++2015-03-03 Eli Zaretskii +2015-03-03 Eli Zaretskii * xdisp.c (handle_stop, handle_single_display_spec) (next-element_from_image): Don't reset the