1 files changed, 16 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index b223382b271..d1348485002 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,19 @@
+2011-05-12  Eli Zaretskii  <eliz@gnu.org>
+
+        * smerge-mode.el (smerge-resolve): Use null-device rather than a
+        literal "/dev/null".
+
+2011-05-12  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/lisp.el (lisp-complete-symbol, lisp-completion-at-point):
+        Fix typo.
+
+2011-05-12  Ralph Schleicher  <rs@ralph-schleicher.de>
+
+        * progmodes/which-func.el (which-function):
+        Use add-log-current-defun instead of add-log-current-defun-function,
+        which might not be defined (Bug#8260).
+
 2011-05-12  Glenn Morris  <rgm@gnu.org>
 
         * emacs-lisp/bytecomp.el (byte-compile-file-form-defmumble):