Mercurial > emacs
comparison lisp/textmodes/fill.el @ 89943:4c90ffeb71c5
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-15
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-218
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-220
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-221
Restore deleted tagline in etc/TUTORIAL.ru
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-222
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-228
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-229
Remove TeX output files from the archive
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-230
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-247
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-248
src/lisp.h (CYCLE_CHECK): Macro moved from xfaces.c
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-249
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-256
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-258
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-263
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-264
Update from CVS: lispref/display.texi: emacs -> Emacs.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-265
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-274
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-275
Update from CVS: man/makefile.w32-in: Revert last change
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-276
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-295
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-296
Allow restarting an existing debugger session that's exited
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-297
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-299
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-300
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-327
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-328
Update from CVS: src/.gdbinit (xsymbol): Fix last change.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-329
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-344
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-345
Tweak source regexps so that building in place won't cause problems
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-346
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-351
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-352
Update from CVS: lisp/flymake.el: New file.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-353
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-361
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-362
Support " [...]" style defaults in minibuffer-electric-default-mode
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-363
(read-number): Use canonical format for default in prompt.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-364
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-367
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-368
Improve display-supports-face-attributes-p on non-ttys
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-369
Rewrite face-differs-from-default-p
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-370
Move `display-supports-face-attributes-p' entirely into C code
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-371
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-372
Simplify face-differs-from-default-p; don't consider :stipple.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-373
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-374
(tty_supports_face_attributes_p): Ensure attributes differ from default
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-375
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-376
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-377
(Fdisplay_supports_face_attributes_p): Work around bootstrapping problem
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-378
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-380
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-381
Face merging cleanups
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-382
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-384
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-385
src/xfaces.c (push_named_merge_point): Return 0 if a cycle is detected
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-386
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-395
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-396
Tweak arch tagging to make build/install-in-place less annoying
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-397
Work around vc-arch problems when building eshell
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-398
Tweak permissions
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-399
Tweak directory permissions
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-400
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-401
More build-in-place tweaking of arch tagging
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-402
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-403
Yet more build-in-place tweaking of arch tagging
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-404
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-409
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-410
Make sure image types are initialized for lookup too
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-411
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-416
Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Mon, 28 Jun 2004 07:56:49 +0000 |
parents | 68c22ea6027c 8ecfbf14a036 |
children | b9eee0a7bef5 |
comparison
equal
deleted
inserted
replaced
89942:9cb747ae49af | 89943:4c90ffeb71c5 |
---|---|
153 Leave one space between words, two at end of sentences or after colons | 153 Leave one space between words, two at end of sentences or after colons |
154 \(depending on values of `sentence-end-double-space', `colon-double-space', | 154 \(depending on values of `sentence-end-double-space', `colon-double-space', |
155 and `sentence-end-without-period'). | 155 and `sentence-end-without-period'). |
156 Remove indentation from each line." | 156 Remove 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. |
162 ;; This is quick, but loses when a tab follows the end of a sentence. | 162 ;; This is quick, but loses when a tab follows the end of a sentence. |
163 ;; Actually, it is difficult to tell that from "Mr.\tSmith". | 163 ;; Actually, it is difficult to tell that from "Mr.\tSmith". |
347 (looking-at "\\. \\([^ ]\\|$\\)"))) | 347 (looking-at "\\. \\([^ ]\\|$\\)"))) |
348 ;; Another approach to the same problem. | 348 ;; Another approach to the same problem. |
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 |
356 (skip-chars-forward " \t") (looking-at paragraph-start))) | 356 (skip-chars-forward " \t") (looking-at paragraph-start))) |
357 (run-hook-with-args-until-success 'fill-nobreak-predicate))))) | 357 (run-hook-with-args-until-success 'fill-nobreak-predicate))))) |
422 (goto-char from) | 422 (goto-char from) |
423 ;; Make sure sentences ending at end of line get an extra space. | 423 ;; Make sure sentences ending at end of line get an extra space. |
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 |
434 (string-to-list sentence-end-without-space))) | 434 (string-to-list sentence-end-without-space))) |
435 (while (re-search-forward eol-double-space-re to t) | 435 (while (re-search-forward eol-double-space-re to t) |