Mercurial > hg > xemacs-beta

comparison lisp/fill.el @ 422:95016f13131a r21-2-19

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Import from CVS: tag r21-2-19
author cvs
date Mon, 13 Aug 2007 11:25:01 +0200
parents 697ef44129c6
children
comparison
equal deleted inserted replaced
421:fff06e11db74 422:95016f13131a
224 at-second 224 at-second
225 result) 225 result)
226 ;; XEmacs change 226 ;; XEmacs change
227 (if (not dont-skip-first) 227 (if (not dont-skip-first)
228 (forward-line 1)) 228 (forward-line 1))
229 (if (>= (point) to) 229 (cond ((>= (point) to)
230 (goto-char firstline) 230 (goto-char firstline))
231 (setq at-second t)) 231 ((/= (point) from)
232 (setq at-second t)))
232 (move-to-left-margin) 233 (move-to-left-margin)
233 ;; XEmacs change 234 ;; XEmacs change
234 (let ((start (point)) 235 (let ((start (point))
235 ; jhod: no longer used? 236 ; jhod: no longer used?
236 ;(eol (save-excursion (end-of-line) (point))) 237 ;(eol (save-excursion (end-of-line) (point)))
237 ) 238 )
238 (setq result 239 (setq result
239 (if (not (looking-at paragraph-start)) 240 (if (or dont-skip-first (not (looking-at paragraph-start)))
240 (cond ((and adaptive-fill-regexp (looking-at adaptive-fill-regexp)) 241 (cond ((and adaptive-fill-regexp (looking-at adaptive-fill-regexp))
241 (buffer-substring-no-properties start (match-end 0))) 242 (buffer-substring-no-properties start (match-end 0)))
242 (adaptive-fill-function (funcall adaptive-fill-function))))) 243 (adaptive-fill-function (funcall adaptive-fill-function)))))
243 (and result 244 (and result
244 (or at-second 245 (or at-second
427 (goto-char (point-min)) 428 (goto-char (point-min))
428 429
429 ;; This is the actual filling loop. 430 ;; This is the actual filling loop.
430 (let ((prefixcol 0) linebeg 431 (let ((prefixcol 0) linebeg
431 (re-break-point (if (featurep 'mule) 432 (re-break-point (if (featurep 'mule)
432 (concat "[ \n\t]\\|" word-across-newline) 433 (concat "[ \n\t]\\|" word-across-newline
434 ".\\|." word-across-newline)
433 "[ \n\t]"))) 435 "[ \n\t]")))
434 (while (not (eobp)) 436 (while (not (eobp))
435 (setq linebeg (point)) 437 (setq linebeg (point))
436 (move-to-column (1+ (current-fill-column))) 438 (move-to-column (1+ (current-fill-column)))
437 (if (eobp) 439 (if (eobp)