aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuri Linkov2004-04-18 22:08:54 +0000
committerJuri Linkov2004-04-18 22:08:54 +0000
commit20796cbc4961a2ef06fe756f671bb16590c5b16f (patch)
tree1a254aa29c4039ec1ce127596f1a8133ce535e61
parent32e40471c90640963e37a53f04cb6c6f7e60b60b (diff)
downloademacs-20796cbc4961a2ef06fe756f671bb16590c5b16f.tar.gz
emacs-20796cbc4961a2ef06fe756f671bb16590c5b16f.zip
(canonically-space-region, fill-nobreak-p, fill-delete-newlines):
Use function `sentence-end' instead of variable `sentence-end'.
-rw-r--r--lisp/textmodes/fill.el10
1 files changed, 5 insertions, 5 deletions
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el
index aaa10fbce5f..a888003402d 100644
--- a/lisp/textmodes/fill.el
+++ b/lisp/textmodes/fill.el
@@ -155,7 +155,7 @@ Leave one space between words, two at end of sentences or after colons
155and `sentence-end-without-period'). 155and `sentence-end-without-period').
156Remove indentation from each line." 156Remove indentation from each line."
157 (interactive "*r") 157 (interactive "*r")
158 (let ((end-spc-re (concat "\\(" sentence-end "\\) *\\| +"))) 158 (let ((end-spc-re (concat "\\(" (sentence-end) "\\) *\\| +")))
159 (save-excursion 159 (save-excursion
160 (goto-char beg) 160 (goto-char beg)
161 ;; Nuke tabs; they get screwed up in a fill. 161 ;; Nuke tabs; they get screwed up in a fill.
@@ -349,7 +349,7 @@ and `fill-nobreak-invisible'."
349 (save-excursion 349 (save-excursion
350 (skip-chars-backward ". ") 350 (skip-chars-backward ". ")
351 (and (looking-at "\\.") 351 (and (looking-at "\\.")
352 (not (looking-at sentence-end)))) 352 (not (looking-at (sentence-end)))))
353 ;; Don't split a line if the rest would look like a new paragraph. 353 ;; Don't split a line if the rest would look like a new paragraph.
354 (unless use-hard-newlines 354 (unless use-hard-newlines
355 (save-excursion 355 (save-excursion
@@ -424,10 +424,10 @@ Point is moved to just past the fill prefix on the first line."
424 ;; loses on split abbrevs ("Mr.\nSmith") 424 ;; loses on split abbrevs ("Mr.\nSmith")
425 (let ((eol-double-space-re 425 (let ((eol-double-space-re
426 (cond 426 (cond
427 ((not colon-double-space) (concat sentence-end "$")) 427 ((not colon-double-space) (concat (sentence-end) "$"))
428 ;; Try to add the : inside the `sentence-end' regexp. 428 ;; Try to add the : inside the `sentence-end' regexp.
429 ((string-match "\\[[^][]*\\(\\.\\)[^][]*\\]" sentence-end) 429 ((string-match "\\[[^][]*\\(\\.\\)[^][]*\\]" (sentence-end))
430 (concat (replace-match ".:" nil nil sentence-end 1) "$")) 430 (concat (replace-match ".:" nil nil (sentence-end) 1) "$"))
431 ;; Can't find the right spot to insert the colon. 431 ;; Can't find the right spot to insert the colon.
432 (t "[.?!:][])}\"']*$"))) 432 (t "[.?!:][])}\"']*$")))
433 (sentence-end-without-space-list 433 (sentence-end-without-space-list