diff options
| author | Lars Magne Ingebrigtsen | 2011-07-02 23:42:49 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2011-07-02 23:42:49 +0200 |
| commit | a8392169cdc28291a99509e22c0b076d256b33c7 (patch) | |
| tree | 3fd20309a81abf3843a460b9c413d5a9d2a0f44c | |
| parent | 6dd56db46dbe42fe09c317a7c9b4600a23b4060f (diff) | |
| download | emacs-a8392169cdc28291a99509e22c0b076d256b33c7.tar.gz emacs-a8392169cdc28291a99509e22c0b076d256b33c7.zip | |
* textmodes/fill.el (fill-region): Remove the "Ordinarily" from
the doc string, since it appears that using `fill-column' always
controls the width (bug#7845).
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/textmodes/fill.el | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9a154c06a3d..ed3ae3623c8 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2011-07-02 Lars Magne Ingebrigtsen <larsi@gnus.org> | 1 | 2011-07-02 Lars Magne Ingebrigtsen <larsi@gnus.org> |
| 2 | 2 | ||
| 3 | * textmodes/fill.el (fill-region): Remove the "Ordinarily" from | ||
| 4 | the doc string, since it appears that using `fill-column' always | ||
| 5 | controls the width (bug#7845). | ||
| 6 | |||
| 3 | * simple.el (shell-command-on-region): Say where the error output | 7 | * simple.el (shell-command-on-region): Say where the error output |
| 4 | went if `shell-command-default-error-buffer' is set (bug#6857). | 8 | went if `shell-command-default-error-buffer' is set (bug#6857). |
| 5 | 9 | ||
diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el index a85ed982ab0..b264cc30850 100644 --- a/lisp/textmodes/fill.el +++ b/lisp/textmodes/fill.el | |||
| @@ -988,7 +988,7 @@ can take care of filling. JUSTIFY is used as in `fill-paragraph'." | |||
| 988 | (defun fill-region (from to &optional justify nosqueeze to-eop) | 988 | (defun fill-region (from to &optional justify nosqueeze to-eop) |
| 989 | "Fill each of the paragraphs in the region. | 989 | "Fill each of the paragraphs in the region. |
| 990 | A prefix arg means justify as well. | 990 | A prefix arg means justify as well. |
| 991 | Ordinarily the variable `fill-column' controls the width. | 991 | The `fill-column' variable controls the width. |
| 992 | 992 | ||
| 993 | Noninteractively, the third argument JUSTIFY specifies which | 993 | Noninteractively, the third argument JUSTIFY specifies which |
| 994 | kind of justification to do: `full', `left', `right', `center', | 994 | kind of justification to do: `full', `left', `right', `center', |