summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/macroexp.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-04-24 12:49:22 -0700
committerPaul Eggert <eggert@cs.ucla.edu>2016-04-24 12:49:22 -0700
commit169043d6625acab49a9a12fb046321d96036cb7d (patch)
treeed2601b80026f976d4db71157689bb705f2daa01 /lisp/emacs-lisp/macroexp.el
parent77f497d292ace3e841827a7b12a18be5f78fe425 (diff)
parent9daf1cf1dd9e1025b615a0fea4dae81871e081da (diff)
downloademacs-169043d6625acab49a9a12fb046321d96036cb7d.tar.gz
emacs-169043d6625acab49a9a12fb046321d96036cb7d.tar.bz2
emacs-169043d6625acab49a9a12fb046321d96036cb7d.zip
Merge from origin/emacs-25
9daf1cf * etc/NEWS: Improve wording of vc-git-log-output-coding-syste... 0cd2e92 Don't kill ~/ if it's the top level directory 4f40f5f describe-char: fix insert char documentation 87ee542 (vc-git-mode-line-string): Don't use `replace-regexp-in-string'
Diffstat (limited to 'lisp/emacs-lisp/macroexp.el')
0 files changed, 0 insertions, 0 deletions