* lisp/hl-line.el (hl-line-make-overlay): New fun.  Set priority.
(hl-line-highlight, global-hl-line-highlight): Use it.
(hl-line-overlay): Use defvar-local.

Conflicts:
	lisp/ChangeLog
Fix Bug#16183 about `global-hl-line-sticky-flag'.

* hl-line.el (global-hl-line-overlay): Make a local variable.
(global-hl-line-overlays): New variable to store all overlays.
(global-hl-line-mode): Don't delete overlays from the current
buffer when `global-hl-line-sticky-flag' is non-nil.
(global-hl-line-highlight): Add new overlays to
`global-hl-line-overlays'.
(global-hl-line-unhighlight-all): New function to delete all
overlays when turning off `global-hl-line-mode'.

Conflicts:
	lisp/ChangeLog
Fix bug 15980

* minibuffer.el (completion--try-word-completion): When both a
hyphen and a space are possible candidates for the character
following a word, display both candidates.

Conflicts:
	lisp/ChangeLog
Fix bug #16129 with slow and incorrect redisplay in follow-mode.

 src/xdisp.c (redisplay_window): Don't skip window redisplay if the
 last value of point is not equal to buffer's point.

Conflicts:
	src/ChangeLog
	src/xdisp.c
check-for-aquamacs-crashes: remove debug code, force bash
always use /bin/bash as a shell