Mercurial > emacs
changeset 12429:d6d785d96455
(current-fill-column): If fill-column is nil, return nil.
| author | Richard M. Stallman <rms@gnu.org> |
|---|---|
| date | Thu, 29 Jun 1995 03:21:26 +0000 |
| parents | e4c0623f4a2e |
| children | 14792ea851f9 |
| files | lisp/textmodes/fill.el |
| diffstat | 1 files changed, 16 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/textmodes/fill.el Thu Jun 29 03:18:29 1995 +0000 +++ b/lisp/textmodes/fill.el Thu Jun 29 03:21:26 1995 +0000 @@ -72,21 +72,22 @@ The fill column to use for a line is the first column at which the column number equals or exceeds the local fill-column - right-margin difference." (save-excursion - (let* ((here (progn (beginning-of-line) (point))) - (here-col 0) - (eol (progn (end-of-line) (point))) - margin fill-col change col) - ;; Look separately at each region of line with a different right-margin - (while (and (setq margin (get-text-property here 'right-margin) - fill-col (- fill-column (or margin 0)) - change (text-property-not-all here eol - 'right-margin margin)) - (progn (goto-char (1- change)) - (setq col (current-column)) - (< col fill-col))) - (setq here change - here-col col)) - (max here-col fill-col)))) + (if fill-column + (let* ((here (progn (beginning-of-line) (point))) + (here-col 0) + (eol (progn (end-of-line) (point))) + margin fill-col change col) + ;; Look separately at each region of line with a different right-margin. + (while (and (setq margin (get-text-property here 'right-margin) + fill-col (- fill-column (or margin 0)) + change (text-property-not-all + here eol 'right-margin margin)) + (progn (goto-char (1- change)) + (setq col (current-column)) + (< col fill-col))) + (setq here change + here-col col)) + (max here-col fill-col))))) (defun canonically-space-region (beg end) "Remove extra spaces between words in region.