diff options
| author | Nathan Weizenbaum | 2012-04-10 13:27:44 +0200 |
|---|---|---|
| committer | Lars Magne Ingebrigtsen | 2012-04-10 13:27:44 +0200 |
| commit | 8f33b5f8734810e2feb0036bd9b0b34f51f7bc17 (patch) | |
| tree | 779988c1188a728700ab3f1518a7d4e38e101164 | |
| parent | a967e26b4011b7efb9714ef93ec503bc89117194 (diff) | |
| download | emacs-8f33b5f8734810e2feb0036bd9b0b34f51f7bc17.tar.gz emacs-8f33b5f8734810e2feb0036bd9b0b34f51f7bc17.zip | |
`python-fill-paragraph' filling fixup when font-lock is disabled
* progmodes/python.el (python-fill-paragraph): Make
python-fill-region in a multiline string work when font-lock is
disabled.
Fixes: debbugs:7018
| -rw-r--r-- | lisp/ChangeLog | 6 | ||||
| -rw-r--r-- | lisp/progmodes/python.el | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index d46de76bd4b..fee5e34942c 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2012-04-10 Nathan Weizenbaum <nweiz@google.com> | ||
| 2 | |||
| 3 | * progmodes/python.el (python-fill-paragraph): Make | ||
| 4 | python-fill-region in a multiline string work when font-lock is | ||
| 5 | disabled (bug#7018). | ||
| 6 | |||
| 1 | 2012-04-10 Laimonas Vėbra <laimonas.vebra@gmail.com> (tiny change) | 7 | 2012-04-10 Laimonas Vėbra <laimonas.vebra@gmail.com> (tiny change) |
| 2 | 8 | ||
| 3 | * language/european.el (cp775): Added oem/legacy (en)coding on | 9 | * language/european.el (cp775): Added oem/legacy (en)coding on |
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index f7566c31b41..09b89993626 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -1959,7 +1959,7 @@ the string's indentation." | |||
| 1959 | ;; paragraph in a multi-line string properly, so narrow | 1959 | ;; paragraph in a multi-line string properly, so narrow |
| 1960 | ;; to the string and then fill around (the end of) the | 1960 | ;; to the string and then fill around (the end of) the |
| 1961 | ;; current line. | 1961 | ;; current line. |
| 1962 | ((eq t (nth 3 syntax)) ; in fenced string | 1962 | ((nth 3 syntax) ; in fenced string |
| 1963 | (goto-char (nth 8 syntax)) ; string start | 1963 | (goto-char (nth 8 syntax)) ; string start |
| 1964 | (setq start (line-beginning-position)) | 1964 | (setq start (line-beginning-position)) |
| 1965 | (setq end (condition-case () ; for unbalanced quotes | 1965 | (setq end (condition-case () ; for unbalanced quotes |