From: Wolfgang Jenkner <wjenkner@inode.at>
Date: Sun, 6 May 2012 04:19:11 +0000 (+0800)
Subject: Cosmetic fix for Man-unindent.
X-Git-Tag: emacs-24.2.90~471^2~178
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=ebfe2597a886443596e007607dd08a617e60d717;p=emacs.git

Cosmetic fix for Man-unindent.

* lisp/man.el (Man-unindent): Use text-property-default-nonsticky to
prevent untabify from inheriting face properties.

Fixes: debbugs:11408
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 43045fbbbd2..2a33bffca18 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-05-06  Wolfgang Jenkner  <wjenkner@inode.at>
+
+	* man.el (Man-unindent): Use text-property-default-nonsticky to
+	prevent untabify from inheriting face properties (Bug#11408).
+
 2012-05-05  Glenn Morris  <rgm@gnu.org>
 
 	* calendar/cal-html.el: Optionally include holidays in the output.
diff --git a/lisp/man.el b/lisp/man.el
index dd64613c495..ca7df4cd1a4 100644
--- a/lisp/man.el
+++ b/lisp/man.el
@@ -1475,7 +1475,12 @@ The following key bindings are currently in effect in the buffer:
 	    (nindent 0))
 	(narrow-to-region (car page) (car (cdr page)))
 	(if Man-uses-untabify-flag
-	    (untabify (point-min) (point-max)))
+	    ;; The space characters inserted by `untabify' inherit
+	    ;; sticky text properties, which is unnecessary and looks
+	    ;; ugly with underlining (Bug#11408).
+	    (let ((text-property-default-nonsticky
+		   (cons '(face . t) text-property-default-nonsticky)))
+	      (untabify (point-min) (point-max))))
 	(if (catch 'unindent
 	      (goto-char (point-min))
 	      (if (not (re-search-forward Man-first-heading-regexp nil t))