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

[Bastien Guerry]

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

Index: help-fns.el
===================================================================
RCS file: /sources/emacs/emacs/lisp/help-fns.el,v
retrieving revision 1.113
retrieving revision 1.114
diff -u -b -r1.113 -r1.114
--- help-fns.el 8 Jan 2008 20:44:59 -0000       1.113
+++ help-fns.el 12 Feb 2008 07:10:49 -0000      1.114
@@ -267,7 +267,8 @@
                  (symbol-function real-function)
                function))
         file-name string
-        (beg (if (commandp def) "an interactive " "a ")))
+        (beg (if (commandp def) "an interactive " "a "))
+         (pt1 (with-current-buffer (help-buffer) (point))))
     (setq string
          (cond ((or (stringp def)
                     (vectorp def))
@@ -348,8 +349,12 @@
          (re-search-backward "`\\([^`']+\\)'" nil t)
          (help-xref-button 1 'help-function-def real-function file-name))))
     (princ ".")
-    (terpri)
+    (with-current-buffer (help-buffer)
+      (fill-region-as-paragraph (save-excursion (goto-char pt1) (forward-line 
0) (point))
+                                (point)))
+    (terpri)(terpri)
     (when (commandp function)
+      (let ((pt2 (with-current-buffer (help-buffer) (point))))
       (if (and (eq function 'self-insert-command)
               (eq (key-binding "a") 'self-insert-command)
               (eq (key-binding "b") 'self-insert-command)
@@ -369,7 +374,7 @@
            (princ "'"))
 
          (when keys
-           (princ (if remapped " which is bound to " "It is bound to "))
+              (princ (if remapped ", which is bound to " "It is bound to "))
            ;; If lots of ordinary text characters run this command,
            ;; don't mention them one by one.
            (if (< (length non-modified-keys) 10)
@@ -383,7 +388,9 @@
                (princ "many ordinary text characters"))))
          (when (or remapped keys non-modified-keys)
            (princ ".")
-           (terpri)))))
+              (terpri))))
+        (with-current-buffer (help-buffer) (fill-region-as-paragraph pt2 
(point)))
+        (terpri)))
     (let* ((arglist (help-function-arglist def))
           (doc (documentation function))
           (usage (help-split-fundoc doc function)))