[Emacs-diffs] /srv/bzr/emacs/trunk r105209: Only output the man page name on failures

[Lars Magne Ingebrigtsen]

------------------------------------------------------------
revno: 105209
fixes bug(s): http://debbugs.gnu.org/6935
committer: Lars Magne Ingebrigtsen <address@hidden>
branch nick: trunk
timestamp: Thu 2011-07-14 19:39:00 +0200
message:
  Only output the man page name on failures
  
  * man.el (Man-bgproc-sentinel): Skip any arguments and only output
  the man page name.
modified:
  lisp/ChangeLog
  lisp/man.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2011-07-14 17:28:42 +0000
+++ b/lisp/ChangeLog    2011-07-14 17:39:00 +0000
@@ -10,6 +10,9 @@
 
 2011-07-14  Lars Magne Ingebrigtsen  <address@hidden>
 
+       * 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).
 

=== modified file 'lisp/man.el'
--- a/lisp/man.el       2011-07-03 01:35:35 +0000
+++ b/lisp/man.el       2011-07-14 17:39:00 +0000
@@ -1257,12 +1257,20 @@
          (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.