# HG changeset patch # User Juanma Barranquero # Date 1123596089 0 # Node ID a045a3e5b4678f49d76d77fcdd5909f15267a53b # Parent ff03de091b63f2c83abcc82c4ed9cddfc22c6fa4 (fill-nonuniform-paragraphs): Improve argument/docstring consistency. (canonically-space-region, fill-context-prefix, fill-french-nobreak-p, fill-delete-newlines, fill-comment-paragraph, justify-current-line): "?\ " -> "?\s". diff -r ff03de091b63 -r a045a3e5b467 lisp/textmodes/fill.el --- a/lisp/textmodes/fill.el Tue Aug 09 13:53:35 2005 +0000 +++ b/lisp/textmodes/fill.el Tue Aug 09 14:01:29 2005 +0000 @@ -163,7 +163,7 @@ ;; This is quick, but loses when a tab follows the end of a sentence. ;; Actually, it is difficult to tell that from "Mr.\tSmith". ;; Blame the typist. - (subst-char-in-region beg end ?\t ?\ ) + (subst-char-in-region beg end ?\t ?\s) (while (and (< (point) end) (re-search-forward end-spc-re end t)) (delete-region @@ -282,7 +282,7 @@ (string-match comment-start-skip first-line-prefix))) first-line-prefix - (make-string (string-width first-line-prefix) ?\ )))) + (make-string (string-width first-line-prefix) ?\s)))) ;; But either way, reject it if it indicates the start ;; of a paragraph when text follows it. (if (not (eq 0 (string-match paragraph-start @@ -312,7 +312,7 @@ (backward-char 1) (or (looking-at "[([{,A+,b+(B]") ;; Don't cut right after a single-letter word. - (and (memq (preceding-char) '(?\t ?\ )) + (and (memq (preceding-char) '(?\t ?\s)) (eq (char-syntax (following-char)) ?w))))))) (defcustom fill-nobreak-predicate nil @@ -439,10 +439,10 @@ (sentence-end-without-space-list (string-to-list sentence-end-without-space))) (while (re-search-forward eol-double-space-re to t) - (or (>= (point) to) (memq (char-before) '(?\t ?\ )) + (or (>= (point) to) (memq (char-before) '(?\t ?\s)) (memq (char-after (match-beginning 0)) sentence-end-without-space-list) - (insert-and-inherit ?\ )))) + (insert-and-inherit ?\s)))) (goto-char from) (if enable-multibyte-characters @@ -471,7 +471,7 @@ (goto-char from) (skip-chars-forward " \t") ;; Then change all newlines to spaces. - (subst-char-in-region from to ?\n ?\ ) + (subst-char-in-region from to ?\n ?\s) (if (and nosqueeze (not (eq justify 'full))) nil (canonically-space-region (or squeeze-after (point)) to) @@ -830,10 +830,10 @@ (if has-code-and-comment (concat (if (not indent-tabs-mode) - (make-string (current-column) ?\ ) + (make-string (current-column) ?\s) (concat (make-string (/ (current-column) tab-width) ?\t) - (make-string (% (current-column) tab-width) ?\ ))) + (make-string (% (current-column) tab-width) ?\s))) (buffer-substring (point) comin)) (buffer-substring (line-beginning-position) comin)))) beg end) @@ -1223,7 +1223,7 @@ (while (> count 0) (skip-chars-forward " ") (insert-and-inherit - (make-string (/ curr-fracspace nspaces) ?\ )) + (make-string (/ curr-fracspace nspaces) ?\s)) (search-forward " " nil t) (setq count (1- count) curr-fracspace @@ -1282,8 +1282,8 @@ When calling from a program, pass range to fill as first two arguments. -Optional third and fourth arguments JUSTIFY and MAIL-FLAG: -JUSTIFY to justify paragraphs (prefix arg), +Optional third and fourth arguments JUSTIFYP and CITATION-REGEXP: +JUSTIFYP to justify paragraphs (prefix arg). When filling a mail message, pass a regexp for CITATION-REGEXP which will match the prefix of a line which is a citation marker plus whitespace, but no other kind of prefix.