projects / emacs.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 65dc07f 0b810eb)
Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Tue, 20 Aug 2019 16:01:55 +0000 (09:01 -0700)
committerGlenn Morris <rgm@gnu.org>
Tue, 20 Aug 2019 16:01:55 +0000 (09:01 -0700)
commit8f68449c9476956425881bf1534fa727d5247448
tree6647f6d286b2efdfab829f0a6715164743594084tree | snapshot
parent65dc07f563f229faadaa44312776941abbf6e1b6commit | diff
parent0b810ebc9fe65e447e37832db40ccf634e5548d9commit | diff
Merge from origin/emacs-26

0b810eb Fix a typo in char-width-table
3f00db7 Minor update in admin/notes/unicode
bcd0115 Fix lisp indent infloop on unfinished strings (Bug#37045)
5f992d1 Improve commentary in composite.el
3a04be2 ; Improve commentary in xdisp.c
15de1d1 Fix markup in dired-x.texi
bda7fc7 ; Fix typo in a doc string of speedbar.el
6f57ef9 * src/callproc.c (Fcall_process): Doc fix.

# Conflicts:
# doc/misc/dired-x.texi
# lisp/international/characters.el
# src/callproc.c
admin/notes/unicode diff1 | diff2 | blob | history
doc/misc/dired-x.texi diff1 | diff2 | blob | history
lisp/composite.el diff1 | diff2 | blob | history
lisp/emacs-lisp/lisp-mode.el diff1 | diff2 | blob | history
lisp/international/characters.el diff1 | diff2 | blob | history
lisp/speedbar.el diff1 | diff2 | blob | history
src/callproc.c diff1 | diff2 | blob | history
src/xdisp.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.