aboutsummaryrefslogtreecommitdiffstats
path: root/lisp/ChangeLog
diff options
context:
space:
mode:
authorJoakim Verona2013-08-23 09:06:30 +0200
committerJoakim Verona2013-08-23 09:06:30 +0200
commit46ed8fdec3e2cf1f1dbb583a6ff22e27f6941ee4 (patch)
tree7b7c23822ed0ff1ef50793926df5c0cff1326be7 /lisp/ChangeLog
parent5b3399e3bbd8ce641e15f3234e65b9a68940eb98 (diff)
parent7fd5f65e89638e74471efd71ce62bed626cbe591 (diff)
downloademacs-46ed8fdec3e2cf1f1dbb583a6ff22e27f6941ee4.tar.gz
emacs-46ed8fdec3e2cf1f1dbb583a6ff22e27f6941ee4.zip
merge from trunk
Diffstat (limited to 'lisp/ChangeLog')
-rw-r--r--lisp/ChangeLog6
1 files changed, 6 insertions, 0 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 0bba2e5fb58..b74f4886f37 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
12013-08-23 Martin Rudalics <rudalics@gmx.at>
2
3 * window.el (display-buffer-pop-up-frame): Call
4 pop-up-frame-function with BUFFER current so `make-frame' will
5 use it as the new frame's buffer (Bug#15133).
6
12013-08-22 Stefan Monnier <monnier@iro.umontreal.ca> 72013-08-22 Stefan Monnier <monnier@iro.umontreal.ca>
2 8
3 * calendar/timeclock.el: Minor cleanups. 9 * calendar/timeclock.el: Minor cleanups.