aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorGlenn Morris2012-04-13 18:46:06 -0700
committerGlenn Morris2012-04-13 18:46:06 -0700
commit35dc09a19c606f9e7a078df32d030451c7c90ba1 (patch)
tree8df2ade99ad8620568094d61bba9dd4ac8856c43 /src/ChangeLog
parent327732d994c98849c765659aa2164a7482b6beab (diff)
parentad3a2b411dc2b34f5d6fa434aee3ca56fa7a88e7 (diff)
downloademacs-35dc09a19c606f9e7a078df32d030451c7c90ba1.tar.gz
emacs-35dc09a19c606f9e7a078df32d030451c7c90ba1.zip
Merge from emacs-24, up to 2012-04-10T02:06:19Z!larsi@gnus.org
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog15
1 files changed, 15 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index c23585bdab7..6d2ed01bafc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,18 @@
12012-04-14 Atsuo Ohki <ohki@gssm.otsuka.tsukuba.ac.jp> (tiny change)
2
3 * lread.c (lisp_file_lexically_bound_p):
4 Fix hang at ";-*-\n" (bug#11238).
5
62012-04-14 Eli Zaretskii <eliz@gnu.org>
7
8 * xdisp.c (find_last_unchanged_at_beg_row): Don't consider a row
9 "unchanged" if its end.pos is beyond ZV. (Bug#11199)
10
112012-04-14 Jan Djärv <jan.h.d@swipnet.se>
12
13 * nsterm.m (constrainFrameRect): Always constrain when there is only
14 one screen (Bug#10962).
15
12012-04-13 Ken Brown <kbrown@cornell.edu> 162012-04-13 Ken Brown <kbrown@cornell.edu>
2 17
3 * s/cygwin.h (PTY_OPEN): Don't try to close a bogus file descriptor. 18 * s/cygwin.h (PTY_OPEN): Don't try to close a bogus file descriptor.