]> git.eshelyaron.com Git - emacs.git/commit
projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 70d62e0 0304f53)
Merge from origin/emacs-27
authorGlenn Morris <rgm@gnu.org>
Thu, 13 Feb 2020 15:50:30 +0000 (07:50 -0800)
committerGlenn Morris <rgm@gnu.org>
Thu, 13 Feb 2020 15:50:30 +0000 (07:50 -0800)
commita13d1f953980b516470d03ab23250760c581c05b
treeb65338d7378342801134c038cb04f5b13bb3c275tree | snapshot
parent70d62e0cd131eb1d6e039af447e48a049096854bcommit | diff
parent0304f530761bee1c217bbf8fe7839cdfe8767a51commit | diff
Merge from origin/emacs-27

0304f53076 (origin/emacs-27) doc/misc/org.texi: Fix @dircategory
027da652a4 Fix display of minibuffer prompt in ido.el
5a21aaff46 rx: Use longest match for all-string 'or' forms (bug#37659)
2b12c2b6f2 Make sure not to mark directories
ff4ed4a0ff ; Add a TODO
3a5129a1c9 vc-hg-dir-status-files: Fix when DIR is not repository root

# Conflicts:
# etc/NEWS
doc/misc/org.texi diff1 | diff2 | blob | history
etc/NEWS.27 diff1 | | blob | history
lisp/vc/vc-hg.el diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.