Mercurial > emacs
changeset 108446:c3217524a4c1
Merge from mainline.
| author | Katsumi Yamaoka <yamaoka@jpl.org> |
|---|---|
| date | Mon, 05 Apr 2010 14:19:20 +0000 |
| parents | d6e3aa27b97d (current diff) 2acfb2283cec (diff) |
| children | 79bd972a5a7d |
| files | |
| diffstat | 3 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Sun Apr 04 11:40:27 2010 +0000 +++ b/lisp/ChangeLog Mon Apr 05 14:19:20 2010 +0000 @@ -1,3 +1,7 @@ +2010-04-05 Juanma Barranquero <lekktu@gmail.com> + + * help.el (describe-mode): Return nil (for IELM's sake). + 2010-04-04 John Wiegley <jwiegley@gmail.com> * ido.el (ido-use-virtual-buffers): New variable to indicate
--- a/lisp/help.el Sun Apr 04 11:40:27 2010 +0000 +++ b/lisp/help.el Mon Apr 05 14:19:20 2010 +0000 @@ -872,7 +872,8 @@ (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))))) + nil) (defun describe-minor-mode (minor-mode)
--- a/src/xfns.c Sun Apr 04 11:40:27 2010 +0000 +++ b/src/xfns.c Mon Apr 05 14:19:20 2010 +0000 @@ -3156,6 +3156,7 @@ XTextProperty text; int bytes, stringp; int do_free_text_value = 0; + long pid = (long) getpid (); text.value = x_encode_text (Vsystem_name, Qcompound_text, 0, &bytes, &stringp, @@ -3170,7 +3171,6 @@ if (do_free_text_value) xfree (text.value); - long pid = (long)getpid(); XChangeProperty (FRAME_X_DISPLAY (f), FRAME_OUTER_WINDOW (f), XInternAtom (FRAME_X_DISPLAY (f),