summaryrefslogtreecommitdiff
path: root/lisp/emacs-lisp/cl-generic.el
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2015-03-03 14:41:30 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2015-03-03 14:41:30 -0800
commit37ad855a38786722833d06dfe78786acc7e9f412 (patch)
treede0f0c7aac92eb2c321c1d6ec3254250316d1035 /lisp/emacs-lisp/cl-generic.el
parent36a50f38fbbcf5cc0cafc44af9d1bfcd6c13fc25 (diff)
parentf1601063f29c99be77d2513320ed6d2494926c1d (diff)
downloademacs-37ad855a38786722833d06dfe78786acc7e9f412.tar.gz
emacs-37ad855a38786722833d06dfe78786acc7e9f412.tar.bz2
emacs-37ad855a38786722833d06dfe78786acc7e9f412.zip
Merge from origin/emacs-24
f160106 Avoid assertion violations in Rmail due to newline cache 1b0ebbd browse-url-firefox: update for firefox 36's removal of -remote 1817892 Avoid erratic behavior of menu-bar tooltips on w32 (Bug#19925) 0260932 Bump python.el version b0adfc7 Spelling fixes 35f047c * src/fileio.c (Fmake_temp_name): Doc tweaks. 6f2971a * lisp/comint.el (comint-line-beginning-position): Revert searching 65d8ac7 Mention in admin/notes/repo how to mark commits not to be merged. 86fe750 # Remove NEWS temporary markup 4fa778b erc.el: Add old version header for package.el compatibilty 9366f05 Tramp: Disable paging with PAGER=cat Conflicts: admin/notes/repo etc/NEWS lisp/ChangeLog lisp/erc/ChangeLog src/ChangeLog
Diffstat (limited to 'lisp/emacs-lisp/cl-generic.el')
0 files changed, 0 insertions, 0 deletions