| commit | 88b65c6357f91b9080ab4b8ca398ddd6203c3247 | |
| author | Paul Eggert <eggert@cs.ucla.edu> | |
| Sun, 1 Jan 2017 09:02:48 +0000 (1 01:02 -0800) | ||
| committer | Paul Eggert <eggert@cs.ucla.edu> | |
| Sun, 1 Jan 2017 09:02:48 +0000 (1 01:02 -0800) | ||
| tree | bec14e4a5ad9051ad310273db7fcc1d2164488b7 | treesnapshot (tar.gz zip) |
| parent | 61848d2da32bb889d714fcddcb7dfd6dfa1b502d | commitdiff |
| parent | e8f0d7dcadd2b35f62f7a14b96df15e5314d7f6e | commitdiff |
; Merge from origin/emacs-25
The following commits were skipped:
e8f0d7d Backport: Remove an ambiguity from defvar's doc string. Fixe...
af1b102 * lisp/emacs-lisp/inline.el: Fix apply-conversion (bug#25280)
The following commits were skipped:
e8f0d7d Backport: Remove an ambiguity from defvar's doc string. Fixe...
af1b102 * lisp/emacs-lisp/inline.el: Fix apply-conversion (bug#25280)