1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-02-06 23:51:24 -08:00

* longlines.el (longlines-wrap-line, longlines-encode-region): Preserve text properties.

Fixes: debbugs:1425
This commit is contained in:
Chong Yidong 2012-11-30 14:56:51 +08:00
parent 171b09490b
commit ccf520bb26
2 changed files with 12 additions and 3 deletions

View file

@ -1,3 +1,8 @@
2012-11-30 Chong Yidong <cyd@gnu.org>
* longlines.el (longlines-wrap-line, longlines-encode-region):
Preserve text properties (Bug#1425).
2012-11-30 OKAZAKI Tetsurou <okazaki.tetsurou@gmail.com> (tiny change)
* vc/vc.el (vc-register): Allow registering a file which is

View file

@ -278,7 +278,7 @@ end of the buffer."
If wrapping is performed, point remains on the line. If the line does
not need to be wrapped, move point to the next line and return t."
(if (longlines-set-breakpoint)
(progn (insert-before-markers ?\n)
(progn (insert-before-markers-and-inherit ?\n)
(backward-char 1)
(delete-char -1)
(forward-char 1)
@ -384,8 +384,12 @@ compatibility with `format-alist', and is ignored."
(mod (buffer-modified-p)))
(goto-char (min beg end))
(while (search-forward "\n" reg-max t)
(unless (get-text-property (match-beginning 0) 'hard)
(replace-match " ")))
(let ((pos (match-beginning 0)))
(unless (get-text-property pos 'hard)
(goto-char (1+ pos))
(insert-and-inherit " ")
(delete-region pos (1+ pos))
(remove-text-properties pos (1+ pos) 'hard))))
(set-buffer-modified-p mod)
end)))