master updated (2340243a31 -> 1d5eb67c6a)

[Lars Ingebrigtsen]

larsi pushed a change to branch master.

      from  2340243a31 Fix GTK build
       new  1e42c2c5fc Remove window-max-characters-per-line
       new  1d5eb67c6a Add a new user option battery-update-functions


Summary of changes:
 doc/emacs/display.texi   |  4 +++-
 doc/lispref/display.texi | 14 --------------
 doc/lispref/windows.texi |  9 ---------
 etc/NEWS                 | 12 ++++++------
 lisp/battery.el          | 43 ++++++++++++++++++++++++++++++++++++++++--
 lisp/fringe.el           |  2 +-
 lisp/window.el           | 49 ------------------------------------------------
 src/window.c             |  2 +-
 8 files changed, 52 insertions(+), 83 deletions(-)