aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWolfgang Jenkner2012-05-06 12:19:11 +0800
committerChong Yidong2012-05-06 12:19:11 +0800
commitebfe2597a886443596e007607dd08a617e60d717 (patch)
treeb78aa7b3b2b3882f976e8522f811ac2755af9b94
parent48176e8bacea7a462e28c472b6dd7a052355b33e (diff)
downloademacs-ebfe2597a886443596e007607dd08a617e60d717.tar.gz
emacs-ebfe2597a886443596e007607dd08a617e60d717.zip
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
-rw-r--r--lisp/ChangeLog5
-rw-r--r--lisp/man.el7
2 files changed, 11 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 43045fbbbd2..2a33bffca18 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
12012-05-06 Wolfgang Jenkner <wjenkner@inode.at>
2
3 * man.el (Man-unindent): Use text-property-default-nonsticky to
4 prevent untabify from inheriting face properties (Bug#11408).
5
12012-05-05 Glenn Morris <rgm@gnu.org> 62012-05-05 Glenn Morris <rgm@gnu.org>
2 7
3 * calendar/cal-html.el: Optionally include holidays in the output. 8 * 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:
1475 (nindent 0)) 1475 (nindent 0))
1476 (narrow-to-region (car page) (car (cdr page))) 1476 (narrow-to-region (car page) (car (cdr page)))
1477 (if Man-uses-untabify-flag 1477 (if Man-uses-untabify-flag
1478 (untabify (point-min) (point-max))) 1478 ;; The space characters inserted by `untabify' inherit
1479 ;; sticky text properties, which is unnecessary and looks
1480 ;; ugly with underlining (Bug#11408).
1481 (let ((text-property-default-nonsticky
1482 (cons '(face . t) text-property-default-nonsticky)))
1483 (untabify (point-min) (point-max))))
1479 (if (catch 'unindent 1484 (if (catch 'unindent
1480 (goto-char (point-min)) 1485 (goto-char (point-min))
1481 (if (not (re-search-forward Man-first-heading-regexp nil t)) 1486 (if (not (re-search-forward Man-first-heading-regexp nil t))