summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/lisp.el
diff options
context:
space:
mode:
authorFabián Ezequiel Gallina <fgallina@gnu.org>2015-01-28 01:03:22 -0300
committerFabián Ezequiel Gallina <fgallina@gnu.org>2015-01-28 01:03:22 -0300
commite57f766d3c97162258ec24b2b4986cdc0e98d352 (patch)
tree9c11646ca10753a1ab6e25f9e866c1326d0acf8e /lisp/emacs-lisp/lisp.el
parent63efa6c6a559a23be863cad0c08457a2d29a0a67 (diff)
parent2a57b7e5b42175031efb8b4348638a05cb1c52a2 (diff)
downloademacs-e57f766d3c97162258ec24b2b4986cdc0e98d352.tar.gz
emacs-e57f766d3c97162258ec24b2b4986cdc0e98d352.tar.bz2
emacs-e57f766d3c97162258ec24b2b4986cdc0e98d352.zip
Merge from origin/emacs-24
2a57b7e Fixes: debbugs:18756 Conflicts: lisp/ChangeLog
Diffstat (limited to 'lisp/emacs-lisp/lisp.el')
0 files changed, 0 insertions, 0 deletions