From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Thu, 14 Jul 2011 17:43:29 +0000 (+0200)
Subject: * man.el (Man-fontify-manpage): Fix message when formatting the man page.
X-Git-Tag: emacs-pretest-24.0.90~104^2~272
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2f5c602485ff9bd41b9d791b371f279a6379effa;p=emacs.git

* man.el (Man-fontify-manpage): Fix message when formatting the man page.

Fixes: debbugs:7929
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index ec8f794f211..66783b9a5ed 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2011-07-14  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* man.el (Man-fontify-manpage): Fix message when formatting the
+	man page (bug#7929).
+
 2011-07-14  Eli Zaretskii  <eliz@gnu.org>
 
 	* buff-menu.el (Buffer-menu-buffer+size): Accept an additional
diff --git a/lisp/man.el b/lisp/man.el
index 8782b22c804..ed24e35f0ea 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -1108,7 +1108,7 @@ Same for the ANSI bold and normal escape sequences."
       (put-text-property (match-beginning 0)
 			 (match-end 0)
 			 'face Man-overstrike-face)))
-  (message "%s man page formatted" Man-arguments))
+  (message "%s man page formatted" (Man-page-from-arguments Man-arguments)))
 
 (defun Man-highlight-references (&optional xref-man-type)
   "Highlight the references on mouse-over.
@@ -1260,16 +1260,7 @@ manpage command."
  	      (let ((args Man-arguments))
 		(kill-buffer (current-buffer))
 		(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 " ")))
-			" ")))
+		       (Man-page-from-arguments args)))
 	    (set-buffer-modified-p nil))))
 	;; Restore case-fold-search before calling
 	;; Man-notify-when-ready because it may switch buffers.
@@ -1281,6 +1272,18 @@ manpage command."
 	    (error "%s" err-mess))
 	))))
 
+(defun Man-page-from-arguments (args)
+  ;; 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 up manual mode in buffer and build alists