diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2017-09-25 11:16:05 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2017-09-25 11:16:05 -0700 |
commit | 0c06b93c1e467debd401eb0b3be4652fde14fa95 (patch) | |
tree | 9fac5e948a58a4526dcc5ce6160b48197ea03f7d /lisp/emacs-lisp/lisp-mode.el | |
parent | c4e6ff097c946b46e3a659982c61e25093bde1a7 (diff) | |
parent | 96aaeaaffac8a93d9c8126ba77ad217a3f323fce (diff) | |
download | emacs-0c06b93c1e467debd401eb0b3be4652fde14fa95.tar.gz emacs-0c06b93c1e467debd401eb0b3be4652fde14fa95.tar.bz2 emacs-0c06b93c1e467debd401eb0b3be4652fde14fa95.zip |
Merge from origin/emacs-26
96aaeaaffa ; * src/lcms.c: Minor stylistic changes in comments.
c3df816585 Fix compilation warning in etags.c
5490ccc5eb Add lisp variable lcms-d65-xyz
dee96f4a17 * lisp/emacs-lisp/cl-macs.el (cl-letf): Fix Edebug spec (b...
12e864eb30 Avoid MinGW64 compiler warnings in unexw32.c
625cee5316 Start emacs-26 release branch
# Conflicts:
# README
# configure.ac
# msdos/sed2v2.inp
# nt/README.W32
Diffstat (limited to 'lisp/emacs-lisp/lisp-mode.el')
0 files changed, 0 insertions, 0 deletions