# HG changeset patch
# User Katsumi Yamaoka <yamaoka@jpl.org>
# Date 1270504918 0
# Node ID 31459e4835b51dfa2e9107b3c1e3d27694e65bbf
# Parent  b7e386fab1a9b1836fb811c7481715915c9542dd# Parent  3b312d7aa88e1e36d9e07fc466fc0008d41079da
Merge from mainline.

diff -r b7e386fab1a9 -r 31459e4835b5 lisp/ChangeLog
--- a/lisp/ChangeLog	Mon Apr 05 10:14:31 2010 +0000
+++ b/lisp/ChangeLog	Mon Apr 05 22:01:58 2010 +0000
@@ -1,3 +1,7 @@
+2010-04-05  Juanma Barranquero  <lekktu@gmail.com>
+
+	* help.el (describe-mode): Return nil.
+
 2010-04-04  John Wiegley  <jwiegley@gmail.com>
 
 	* ido.el (ido-use-virtual-buffers): New variable to indicate
diff -r b7e386fab1a9 -r 31459e4835b5 lisp/help.el
--- a/lisp/help.el	Mon Apr 05 10:14:31 2010 +0000
+++ b/lisp/help.el	Mon Apr 05 22:01:58 2010 +0000
@@ -872,7 +872,9 @@
               (insert (format-mode-line mode nil nil buffer))
               (add-text-properties start (point) '(face bold)))))
 	(princ " mode:\n")
-	(princ (documentation major-mode))))))
+	(princ (documentation major-mode)))))
+  ;; For the sake of IELM and maybe others
+  nil)
 
 
 (defun describe-minor-mode (minor-mode)