diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-08-23 11:31:45 -0400 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2013-08-23 11:31:45 -0400 |
| commit | e3a6636351364fe32463d3a8196e5fc564c66422 (patch) | |
| tree | 821ae2f2221a9781c1319f923c636823de6075eb /lisp | |
| parent | b9808e77188e098818cc7e6242a4f920ae854c31 (diff) | |
| download | emacs-e3a6636351364fe32463d3a8196e5fc564c66422.tar.gz | |
* lisp/textmodes/fill.el (fill-match-adaptive-prefix): Don't throw away
text-properties.
Fixes: debbugs:15155
Diffstat (limited to 'lisp')
| -rw-r--r-- | lisp/ChangeLog | 3 | ||||
| -rw-r--r-- | lisp/textmodes/fill.el | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index bef5c61330f..df9fce72dd9 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,5 +1,8 @@ 2013-08-23 Stefan Monnier <monnier@iro.umontreal.ca> + * textmodes/fill.el (fill-match-adaptive-prefix): Don't throw away + text-properties (bug#15155). + * calc/calc-keypd.el (calc-keypad-execute): `x-flush-mouse-queue' doesn't exist any more. (calc-keypad-redraw): Remove unused var `pad'. diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el index 5b6d5f359e6..119b4b04593 100644 --- a/lisp/textmodes/fill.el +++ b/lisp/textmodes/fill.el @@ -220,7 +220,7 @@ Remove indentation from each line." (let ((str (or (and adaptive-fill-function (funcall adaptive-fill-function)) (and adaptive-fill-regexp (looking-at adaptive-fill-regexp) - (match-string-no-properties 0))))) + (match-string 0))))) (if (>= (+ (current-left-margin) (length str)) (current-fill-column)) ;; Death to insanely long prefixes. nil |