diff options
author | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-01 18:14:22 -0700 |
---|---|---|
committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-05-01 18:14:22 -0700 |
commit | 595195a10e5dd568bf249f5fb6778ae3d7037cd5 (patch) | |
tree | e973d6ef419ca9c48563b03587184e58ee0df5ed /lisp/emacs-lisp/lisp-mode.el | |
parent | d6ec146ff9b66a1849932f90f3a5edade28d4579 (diff) | |
parent | d8affa3dc5267c5da120ac09e14a81e0afed8fe8 (diff) | |
download | emacs-595195a10e5dd568bf249f5fb6778ae3d7037cd5.tar.gz emacs-595195a10e5dd568bf249f5fb6778ae3d7037cd5.tar.bz2 emacs-595195a10e5dd568bf249f5fb6778ae3d7037cd5.zip |
Merge from origin/emacs-25
d8affa3 Use ‘T *restrict’ proto, not ‘T[restrict]’
d38d2a8 Fix documentation of 'url-retrieve-synchronously'
586b213 * lisp/url/url.el (url-retrieve-synchronously): Doc fix. (Bu...
# Conflicts:
# doc/misc/url.texi
# lisp/url/url.el
Diffstat (limited to 'lisp/emacs-lisp/lisp-mode.el')
0 files changed, 0 insertions, 0 deletions