16e5e8e Fix last change to isearch-update (bug#23406)
b755d98 Autoload cursor-sensor-inhibit (bug#23406)
b52ebd4 org-map-entries: Fix org-agenda-prepare-buffers call
86aa409 Followup for last commit in the user manual
7004459 Improve doc string of 'set-goal-column'
ccdaf04 Fix the MSDOS build
ffe701c Remove \= from format string (bug#18190)
1c58fa1 Fix variable-pitch font on MS-Windows
c6077bf Restore follow-scroll-up/down to scrolling by the combined si...
b671e21 Revert unneeded change which harms syntactic parsing. This f...
48b24c9 Correct indentation of ids in a C++ enum after a protection k...
5c3534f * lisp/window.el (window--process-window-list): No-op if no p...
734fb3a Port dumping to NetBSD with PaX
0255a70 Don't mistake `for' inside a function for a part of array com...
# Conflicts:
# src/Makefile.in
71fb0e0 Improve last change to vc-git-mode-line-string
6858e77 Todo mode doc bug fix
e55d0db Fix revision calculation in vc-git-mode-line-string
ca87b34 ; Fix errant revert ccb75d740bfebe Add Python 3.5 keyword "await"
fa7886a Add new keywords of Python 3.5
ccb75d7 Partially revert previous change.
8ee168a ; * etc/NEWS: Update entry about color fonts on OS X with a w...
b09ca27 Say why text-quoting-style is not a user option
5a952eb Don't mention ~/.emacs.bmk literally in doc strings
c338cf3 * etc/NEWS: Explain why multicolor font display is disabled o...
c30d1b4 Port to Ubuntu 16.04 --enable-gcc-warnings
* lisp/emacs-lisp/byte-run.el (define-obsolete-face-alias):
Fix up last change.
(define-obsolete-variable-alias): Ditto.
(cherry picked from commit 28e9f4390d)
* lisp/emacs-lisp/byte-run.el (define-obsolete-face-alias):
Say more verbosely what WHEN is (bug#21225).
(define-obsolete-function-alias): Describe the WHEN parameter.
(define-obsolete-variable-alias): Ditto.
(cherry picked from commit 247c388f16)
* lisp/subr.el (with-silent-modifications): Rearrange the doc
string a bit so that the most pertinent information is at the
top (bug#21171).
(cherry picked from commit e0e70f030e)
* lisp/time.el: Add a doc string to `display-time-string',
because it's referred to in the manual, and is too mysterious
otherwise (bug#21002).
(cherry picked from commit 45559c584e)
* lisp/replace.el (query-replace): Move the mention of the
interactive prefix arg earlier so that users can find it
(bug#20654).
(cherry picked from commit bcc10761c3)
* lisp/files.el (insert-file-contents-literally): Say that the
parameters are explained in the other function (bug#18317).
(cherry picked from commit b6481b19bc)
* lisp/cus-start.el (standard): Use the same custom types for
cursor-in-non-selected-windows as for cursor-type (bug#19214).
(cherry picked from commit b66bc0cced)
* lisp/emacs-lisp/package.el (package-initialize): Be explicit
in saying that `package-initialize' obviates adjusting the
path or requiring the packages, as this is a question that
apparently comes up now and then (bug#18829).
(cherry picked from commit 619e0aedb2)
* lisp/international/fontset.el (create-fontset-from-fontset-spec):
Clarify what the optional part is (bug#18686).
(cherry picked from commit c05d186455)
* lisp/font-lock.el (font-lock-remove-keywords): Add a link to
`font-lock-add-keywords' to describe KEYWORDS (bug#18634).
(cherry picked from commit bc00dcf129)
* lisp/delsel.el (delete-selection-helper): Use non-nil
instead of t and clarify function return values (bug#18089).
(cherry picked from commit d7a5b5be9a)
* lisp/menu-bar.el (clipboard-kill-ring-save): Describe the
REGION parameter (bug#18028).
(clipboard-kill-region): Ditto.
(cherry picked from commit 33d2c67bff)
* lisp/emacs-lisp/easy-mmode.el (define-minor-mode): Wrap a
string to make it less likely that we get overlong lines
(bug#17999).
(cherry picked from commit 323b696649)
