diff options
| author | Joakim Verona | 2012-01-23 15:10:06 +0100 |
|---|---|---|
| committer | Joakim Verona | 2012-01-23 15:10:06 +0100 |
| commit | 0322b140eead7c94de7f0f6d19a90bd15690b4eb (patch) | |
| tree | 950c011783cc896d0450084cb5155e54548bfe5b /lisp/progmodes/cc-cmds.el | |
| parent | d5114bfea3ea4c37c57e2af0f3b095be9fcd8bac (diff) | |
| parent | cb5850f27c1b4d26957d58e2da2314dd12498671 (diff) | |
| download | emacs-0322b140eead7c94de7f0f6d19a90bd15690b4eb.tar.gz emacs-0322b140eead7c94de7f0f6d19a90bd15690b4eb.zip | |
upstream
Diffstat (limited to 'lisp/progmodes/cc-cmds.el')
| -rw-r--r-- | lisp/progmodes/cc-cmds.el | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/lisp/progmodes/cc-cmds.el b/lisp/progmodes/cc-cmds.el index 76b9f304164..509bb203f78 100644 --- a/lisp/progmodes/cc-cmds.el +++ b/lisp/progmodes/cc-cmds.el | |||
| @@ -4382,11 +4382,8 @@ Optional prefix ARG means justify paragraph as well." | |||
| 4382 | (let ((fill-paragraph-function | 4382 | (let ((fill-paragraph-function |
| 4383 | ;; Avoid infinite recursion. | 4383 | ;; Avoid infinite recursion. |
| 4384 | (if (not (eq fill-paragraph-function 'c-fill-paragraph)) | 4384 | (if (not (eq fill-paragraph-function 'c-fill-paragraph)) |
| 4385 | fill-paragraph-function)) | 4385 | fill-paragraph-function))) |
| 4386 | (start-point (point-marker))) | 4386 | (c-mask-paragraph t nil 'fill-paragraph arg)) |
| 4387 | (c-mask-paragraph | ||
| 4388 | t nil (lambda () (fill-region-as-paragraph (point-min) (point-max) arg))) | ||
| 4389 | (goto-char start-point)) | ||
| 4390 | ;; Always return t. This has the effect that if filling isn't done | 4387 | ;; Always return t. This has the effect that if filling isn't done |
| 4391 | ;; above, it isn't done at all, and it's therefore effectively | 4388 | ;; above, it isn't done at all, and it's therefore effectively |
| 4392 | ;; disabled in normal code. | 4389 | ;; disabled in normal code. |