diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2014-12-28 10:14:19 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2014-12-28 10:14:19 -0800 |
| commit | c12598a62e2e31f3377c52fe4b283b710ce1451e (patch) | |
| tree | fe895873e492db9dd92e8c56c81d8c0903ec4174 /lisp/emacs-lisp/lisp.el | |
| parent | 20791069fa34b486c018ba7f27982bdc6ad2a4ea (diff) | |
| parent | 39eaef9f8b5aa9481e8d7c636f27b87fe8310060 (diff) | |
| download | emacs-c12598a62e2e31f3377c52fe4b283b710ce1451e.tar.gz emacs-c12598a62e2e31f3377c52fe4b283b710ce1451e.tar.bz2 emacs-c12598a62e2e31f3377c52fe4b283b710ce1451e.zip | |
Merge from origin/emacs-24
The following commits were skipped:
39eaef9 lisp/international/mule.el (define-coding-system): Fix typos in the doc string. Add missing ChangeLog entry for the previous commit.
df932d8 lisp/international/mule.el (define-coding-system): Improve docstring.
Diffstat (limited to 'lisp/emacs-lisp/lisp.el')
0 files changed, 0 insertions, 0 deletions