aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert2012-04-09 15:55:58 -0700
committerPaul Eggert2012-04-09 15:55:58 -0700
commit271e61eb60721546bf373531852a88f14b840d12 (patch)
tree617ada4d9e26a7d255d8c792165b40214c65ddb3 /src/ChangeLog
parentc6046b94e58b33ddcfca8f6361ddaf780ba5cb18 (diff)
parent05920a43fc18e696b464387e781e7cfdcea5b5af (diff)
downloademacs-271e61eb60721546bf373531852a88f14b840d12.tar.gz
emacs-271e61eb60721546bf373531852a88f14b840d12.zip
Merge from trunk.
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 7027e9e5a95..5abf92bc4e1 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -11,6 +11,14 @@
11 the Emacs and Gnulib regex code is merged. 11 the Emacs and Gnulib regex code is merged.
12 (xmalloc, xrealloc): Now static. 12 (xmalloc, xrealloc): Now static.
13 13
142012-04-09 Glenn Morris <rgm@gnu.org>
15
16 * doc.c (Fsnarf_documentation): Check variables, functions are bound,
17 not just in the obarray, before snarfing them. (Bug#11036)
18
19 * Makefile.in ($(leimdir)/leim-list.el):
20 Pass EMACS rather than BUILT_EMACS.
21
142012-04-09 Teodor Zlatanov <tzz@lifelogs.com> 222012-04-09 Teodor Zlatanov <tzz@lifelogs.com>
15 23
16 * process.c (make_process): 24 * process.c (make_process):