comparison lisp/paragraphs.el @ 5473:ac37a5f7e5be

Merge with trunk.
author Mats Lidell <matsl@xemacs.org>
date Thu, 17 Mar 2011 23:42:59 +0100
parents 308d34e9f07d ed74d2ca7082
children 4dee0387b9de
comparison
equal deleted inserted replaced
5472:e79980ee5efe 5473:ac37a5f7e5be
314 (and use-hard-newlines 314 (and use-hard-newlines
315 (not (get-text-property (1- start) 'hard))))) 315 (not (get-text-property (1- start) 'hard)))))
316 (forward-char 1)) 316 (forward-char 1))
317 (if (< (point) (point-max)) 317 (if (< (point) (point-max))
318 (goto-char start)))) 318 (goto-char start))))
319 (if-fboundp #'constrain-to-field 319 (if-fboundp 'constrain-to-field
320 (constrain-to-field nil opoint t) 320 (constrain-to-field nil opoint t)
321 (error 321 (error
322 'void-function 322 'void-function
323 "constrain-to-field not available; is xemacs-base installed?")) 323 "constrain-to-field not available; is xemacs-base installed?"))
324 ;; Return the number of steps that could not be done. 324 ;; Return the number of steps that could not be done.
433 (let ((par-end (save-excursion (end-of-paragraph-text) (point)))) 433 (let ((par-end (save-excursion (end-of-paragraph-text) (point))))
434 (if (re-search-forward sentence-end par-end t) 434 (if (re-search-forward sentence-end par-end t)
435 (skip-chars-backward " \t\n") 435 (skip-chars-backward " \t\n")
436 (goto-char par-end))) 436 (goto-char par-end)))
437 (setq arg (1- arg))) 437 (setq arg (1- arg)))
438 (if-fboundp #'constrain-to-field 438 (if-fboundp 'constrain-to-field
439 (constrain-to-field nil opoint t) 439 (constrain-to-field nil opoint t)
440 (error 440 (error
441 'void-function 441 'void-function
442 "constrain-to-field not available; is xemacs-base installed?")))) 442 "constrain-to-field not available; is xemacs-base installed?"))))
443 443