diff options
| author | Glenn Morris <rgm@gnu.org> | 2018-05-15 09:09:48 -0700 |
|---|---|---|
| committer | Glenn Morris <rgm@gnu.org> | 2018-05-15 09:09:48 -0700 |
| commit | 3ee1841f288b5b9cf9301945d10db2b45688bcf8 (patch) | |
| tree | a1168744379c82fa3c0a92e14373fcc3897fb435 /lisp/emacs-lisp | |
| parent | b3956d85c71c30af732a8bc035ed39421bafe11d (diff) | |
| parent | b98cf9cdabd710f89eb57645a163fd52db338404 (diff) | |
| download | emacs-3ee1841f288b5b9cf9301945d10db2b45688bcf8.tar.gz emacs-3ee1841f288b5b9cf9301945d10db2b45688bcf8.tar.bz2 emacs-3ee1841f288b5b9cf9301945d10db2b45688bcf8.zip | |
Merge from origin/emacs-26
b98cf9c ; Fix a typo in the Emacs manual
700fcd7 * doc/emacs/help.texi: Fix paren typo.
c9c0e40 More minor changes in shell-related nodes of Emacs manual
e6bf19c Fix inaccuracies in "Shell Ring" node of Emacs manual
087681b8 Improve documentation of kmacro commands and variables.
be2e8cb * doc/man/emacs.1.in: Document --fg-daemon and --bg-daemon.
1d9e66a Don't check non-X frames for z order (Bug#31373)
7dc028e Check NSWindow is actually a frame
Conflicts:
src/nsfns.m
Diffstat (limited to 'lisp/emacs-lisp')
0 files changed, 0 insertions, 0 deletions