master updated (4509cda5c94 -> f38bcf37dc4)

[Dmitry Gutov]

dgutov pushed a change to branch master.

      from  4509cda5c94 Update Android port
       new  155154f6f11 ; * lisp/progmodes/project.el (project-find-file-in): 
Update docstring.
       new  9dff654432e * src/fileio.c (Ffile_name_concat): Improve docstring.
       new  f38bcf37dc4 (project-find-file): Allow current file name "other 
project"'s future history


Summary of changes:
 lisp/progmodes/project.el | 16 +++++++++++++---
 src/fileio.c              |  4 ++--
 2 files changed, 15 insertions(+), 5 deletions(-)