Only output the man page name on failures

* man.el (Man-bgproc-sentinel): Skip any arguments and only output
the man page name.

Fixes: debbugs:6935

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 936dab89ae54c1c0b0886c665fac08c032c37baf..ec8f794f211af36d34ee9af458095cfe40b96a8e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -10,6 +10,9 @@
 
 2011-07-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 
+       * man.el (Man-bgproc-sentinel): Skip any arguments and only output
+       the man page name (bug#7929).
+
        * image.el (put-image): Mention the `put-image' overlay property
        (bug#7834).
 

diff --git a/lisp/man.el b/lisp/man.el
index b5a70395e596f67f7a18b4a11d56cfe6d00fcd59..8782b22c80453f9f064b86e62882155ed83a60ba 100644 (file)
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -1257,12 +1257,20 @@ manpage command."
          (Man-mode)
 
          (if (not Man-page-list)
-             (let ((args Man-arguments))
+             (let ((args Man-arguments))
                (kill-buffer (current-buffer))
-               (error "Can't find the %s manpage" args)))
-
-          (set-buffer-modified-p nil)
-          ))
+               (error "Can't find the %s manpage"
+                      ;; Skip arguments and only print the page name.
+                      (mapconcat
+                       'identity
+                       (delete nil
+                               (mapcar
+                                (lambda (elem)
+                                  (and (not (string-match "^-" elem))
+                                       elem))
+                                (split-string args " ")))
+                       " ")))
+           (set-buffer-modified-p nil))))
        ;; Restore case-fold-search before calling
        ;; Man-notify-when-ready because it may switch buffers.