[Emacs-diffs] /srv/bzr/emacs/emacs-24 r108137: Cosmetic fix for Man-unindent.

[Chong Yidong]

------------------------------------------------------------
revno: 108137
fixes bug: http://debbugs.gnu.org/11408
author: Wolfgang Jenkner <address@hidden>
committer: Chong Yidong <address@hidden>
branch nick: trunk
timestamp: Sun 2012-05-06 12:19:11 +0800
message:
  Cosmetic fix for Man-unindent.
  
  * lisp/man.el (Man-unindent): Use text-property-default-nonsticky to
  prevent untabify from inheriting face properties.
modified:
  lisp/ChangeLog
  lisp/man.el

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2012-05-05 21:31:41 +0000
+++ b/lisp/ChangeLog    2012-05-06 04:19:11 +0000
@@ -1,3 +1,8 @@
+2012-05-06  Wolfgang Jenkner  <address@hidden>
+
+       * man.el (Man-unindent): Use text-property-default-nonsticky to
+       prevent untabify from inheriting face properties (Bug#11408).
+
 2012-05-05  Glenn Morris  <address@hidden>
 
        * calendar/cal-html.el: Optionally include holidays in the output.

=== modified file 'lisp/man.el'
--- a/lisp/man.el       2012-05-04 23:16:47 +0000
+++ b/lisp/man.el       2012-05-06 04:19:11 +0000
@@ -1475,7 +1475,12 @@
            (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))