[Emacs-diffs] master updated (3c3aad7 -> 0be6fb8)

[Dmitry Gutov]

dgutov pushed a change to branch master.

      from  3c3aad7   When VC detects a conflict, specify which file
      adds  9776972   Rename "search path" to "library roots"
      adds  55ad7fc   Abolish temporary buffer management for xref
      adds  3a37d99   Move and rename xref-find-regexp to the project package
      adds  aeae587   ; project-library-roots: Update docstring
      adds  cad0490   Remove dirs in vc project roots from the the vc project 
library roots
      adds  e4c190b   Make sure that the ignore file exists
       new  1c72afb   Fold `project-ask-user' into `project-current'
       new  0be6fb8   Merge branch 'project-next'


Summary of changes:
 lisp/emacs-lisp/cl-seq.el      |    2 +-
 lisp/progmodes/elisp-mode.el   |   13 ++-
 lisp/progmodes/etags.el        |    7 +-
 lisp/progmodes/project.el      |  197 ++++++++++++++++++++++++++++-----------
 lisp/progmodes/xref.el         |  108 +++++-----------------
 lisp/vc/vc.el                  |    5 +-
 test/automated/cl-lib-tests.el |    8 +-
 7 files changed, 186 insertions(+), 154 deletions(-)