master updated (4d2aa420bd -> 1a3bad431d)

[Philip Kaludercic]

zge pushed a change to branch master.

      from  4d2aa420bd Fix core string lookup with modifiers on XI2
       new  ea54062fdf Generalise buffer matching from project.el
       new  59ecf25fc8 * window.el (display-buffer-assq-regexp): Use 
buffer-match
       new  1a3bad431d Update project-kill-buffer-conditions to match 
buffer-match-p


Summary of changes:
 lisp/progmodes/project.el | 40 +++++++++++++++++++-------------
 lisp/subr.el              | 59 +++++++++++++++++++++++++++++++++++++++++++++++
 lisp/window.el            | 15 ++++--------
 3 files changed, 87 insertions(+), 27 deletions(-)