[Emacs-diffs] Changes to emacs/lisp/help.el,v

[Bastien Guerry]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Bastien Guerry <bastien1>       08/02/12 07:10:49

Index: help.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/help.el,v
retrieving revision 1.335
retrieving revision 1.336
diff -u -b -r1.335 -r1.336
--- help.el     16 Jan 2008 15:55:14 -0000      1.335
+++ help.el     12 Feb 2008 07:10:49 -0000      1.336
@@ -745,8 +745,7 @@
       (with-help-window (help-buffer)
        (princ (help-key-description key untranslated))
        (princ (format "\
-%s runs the command %S
-  which is "
+%s runs the command %S, which is "
                       mouse-msg defn))
        (describe-function-1 defn)
        (when up-event
@@ -757,12 +756,11 @@
 
 ----------------- up-event %s----------------
 
-<%S>%s%s runs the command %S
-  which is "
+<%S>%s%s runs the command %S, which is "
                           (if mouse-1-tricky "(short click) " "")
                           ev-type mouse-msg
                           (if mouse-1-remapped
-                              " is remapped to <mouse-2>\nwhich" "")
+                               " is remapped to <mouse-2>, which" "")
                           defn-up))
            (describe-function-1 defn-up))
          (unless (or (null defn-up-tricky)
@@ -773,8 +771,7 @@
 ----------------- up-event (long click) ----------------
 
 Pressing <%S>%s for longer than %d milli-seconds
-runs the command %S
-  which is "
+runs the command %S, which is "
                           ev-type mouse-msg
                           mouse-1-click-follows-link
                           defn-up-tricky))