Mercurial > emacs
changeset 67673:947510e65020
* longlines.el (longlines-mode): Wrap while widened.
(longlines-decode-region, longlines-encode-region): Compute max
just once.
| author | Chong Yidong <cyd@stupidchicken.com> |
|---|---|
| date | Mon, 19 Dec 2005 14:30:56 +0000 |
| parents | ea51bc4acb2e |
| children | e7b90ba8a38a |
| files | lisp/ChangeLog lisp/longlines.el |
| diffstat | 2 files changed, 18 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Mon Dec 19 09:56:00 2005 +0000 +++ b/lisp/ChangeLog Mon Dec 19 14:30:56 2005 +0000 @@ -1,3 +1,9 @@ +2005-12-19 Chong Yidong <cyd@stupidchicken.com> + + * longlines.el (longlines-mode): Wrap while widened. + (longlines-decode-region, longlines-encode-region): Compute max + just once. + 2005-12-19 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> * cus-edit.el (mac): New group. @@ -21,6 +27,7 @@ * emacs-lisp/cl-extra.el (cl-macroexpand-all): Fix code-walk for lexical-let when encountering ((lambda (...) ...) ...). +>>>>>>> 1.8828 2005-12-17 Chong Yidong <cyd@stupidchicken.com> * progmodes/sh-script.el (sh-mode):
--- a/lisp/longlines.el Mon Dec 19 09:56:00 2005 +0000 +++ b/lisp/longlines.el Mon Dec 19 14:30:56 2005 +0000 @@ -1,6 +1,6 @@ ;;; longlines.el --- automatically wrap long lines -;; Copyright (C) 2000, 2001, 2005 Free Software Foundation, Inc. +;; Copyright (C) 2000, 2001, 2004, 2005 Free Software Foundation, Inc. ;; Authors: Kai Grossjohann <Kai.Grossjohann@CS.Uni-Dortmund.DE> ;; Alex Schroeder <alex@gnu.org> @@ -127,8 +127,8 @@ ;; longlines-wrap-lines that we'll never encounter from here (save-restriction (widen) - (longlines-decode-buffer)) - (longlines-wrap-region (point-min) (point-max)) + (longlines-decode-buffer) + (longlines-wrap-region (point-min) (point-max))) (set-buffer-modified-p mod)) (when (and longlines-show-hard-newlines (not longlines-showing)) @@ -327,10 +327,11 @@ (if (null beg) (setq beg (point))) (if (null end) (setq end (mark t))) (save-excursion - (goto-char (min beg end)) - (while (search-forward "\n" (max beg end) t) - (set-hard-newline-properties - (match-beginning 0) (match-end 0))))) + (let ((reg-max (max beg end))) + (goto-char (min beg end)) + (while (search-forward "\n" reg-max t) + (set-hard-newline-properties + (match-beginning 0) (match-end 0)))))) (defun longlines-decode-buffer () "Turn all newlines in the buffer into hard newlines." @@ -341,9 +342,10 @@ Hard newlines are left intact. The optional argument BUFFER exists for compatibility with `format-alist', and is ignored." (save-excursion - (let ((mod (buffer-modified-p))) + (let ((reg-max (max beg end)) + (mod (buffer-modified-p))) (goto-char (min beg end)) - (while (search-forward "\n" (max (max beg end)) t) + (while (search-forward "\n" reg-max t) (unless (get-text-property (match-beginning 0) 'hard) (replace-match " "))) (set-buffer-modified-p mod)