Mercurial > emacs
comparison lisp/textmodes/fill.el @ 74907:4bbe5394a104
(fill-paragraph): Check for a minibuffer
rather than for being in a minibuffer window.
author | Richard M. Stallman <rms@gnu.org> |
---|---|
date | Tue, 26 Dec 2006 02:54:41 +0000 |
parents | 9ac7844e1b6e |
children | 7c208589663c |
comparison
equal
deleted
inserted
replaced
74906:6d70d64d3b02 | 74907:4bbe5394a104 |
---|---|
760 (interactive (progn | 760 (interactive (progn |
761 (barf-if-buffer-read-only) | 761 (barf-if-buffer-read-only) |
762 (list (if current-prefix-arg 'full)))) | 762 (list (if current-prefix-arg 'full)))) |
763 ;; First try fill-paragraph-function. | 763 ;; First try fill-paragraph-function. |
764 (or (and (or fill-paragraph-function | 764 (or (and (or fill-paragraph-function |
765 (and (window-minibuffer-p (selected-window)) | 765 (and (minibufferp (current-buffer)) |
766 (= 1 (point-min)))) | 766 (= 1 (point-min)))) |
767 (let ((function (or fill-paragraph-function | 767 (let ((function (or fill-paragraph-function |
768 ;; In the minibuffer, don't count the width | 768 ;; In the minibuffer, don't count the width |
769 ;; of the prompt. | 769 ;; of the prompt. |
770 'fill-minibuffer-function)) | 770 'fill-minibuffer-function)) |