diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-04-11 09:07:16 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-04-11 09:07:16 -0700 |
| commit | 7b45cc583c4f16cc070a9925431ca944f510a685 (patch) | |
| tree | 9eb72adddeab4fb7b0cebf49df81ab31f3bf8a13 /lisp/emacs-lisp/lisp-mode.el | |
| parent | ff2c76476479c43607825df01c78d8f239caefb5 (diff) | |
| parent | 0d7aad1b30de7e9deb8b3c7011d9b679e538371c (diff) | |
| download | emacs-7b45cc583c4f16cc070a9925431ca944f510a685.tar.gz | |
; Merge from origin/emacs-25
The following commits were skipped:
0d7aad1 Revert "Backport HTTPS proxy fix"
2d1a605 Backport HTTPS proxy fix
Diffstat (limited to 'lisp/emacs-lisp/lisp-mode.el')
0 files changed, 0 insertions, 0 deletions