diff options
| author | Fabián Ezequiel Gallina | 2012-05-17 00:03:16 -0300 |
|---|---|---|
| committer | Fabián Ezequiel Gallina | 2012-05-17 00:03:16 -0300 |
| commit | 589cefd7664e38a242d795ea8254bb51c6246f29 (patch) | |
| tree | 84d52c778e58a171cf3e2a23a8310d12c986f9d5 /lisp/progmodes/python.el | |
| parent | 4cafacb52a62b81ea1396e540ead833c81ac20a4 (diff) | |
| download | emacs-589cefd7664e38a242d795ea8254bb51c6246f29.tar.gz emacs-589cefd7664e38a242d795ea8254bb51c6246f29.zip | |
increased forward-comment COUNT variable value in all calls
Diffstat (limited to 'lisp/progmodes/python.el')
| -rw-r--r-- | lisp/progmodes/python.el | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/lisp/progmodes/python.el b/lisp/progmodes/python.el index 66da1a1388b..24fb37259b3 100644 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el | |||
| @@ -519,7 +519,7 @@ These make `python-indent-calculate-indentation' subtract the value of | |||
| 519 | (not (python-info-ppss-context 'comment)) | 519 | (not (python-info-ppss-context 'comment)) |
| 520 | (progn | 520 | (progn |
| 521 | (goto-char (line-end-position)) | 521 | (goto-char (line-end-position)) |
| 522 | (forward-comment -1) | 522 | (forward-comment -9999) |
| 523 | (eq ?: (char-before)))) | 523 | (eq ?: (char-before)))) |
| 524 | (setq found-block t))) | 524 | (setq found-block t))) |
| 525 | (if (not found-block) | 525 | (if (not found-block) |
| @@ -531,7 +531,7 @@ These make `python-indent-calculate-indentation' subtract the value of | |||
| 531 | (not (eobp))) | 531 | (not (eobp))) |
| 532 | (forward-line 1)) | 532 | (forward-line 1)) |
| 533 | (forward-line 1) | 533 | (forward-line 1) |
| 534 | (forward-comment 1) | 534 | (forward-comment 9999) |
| 535 | (let ((indent-offset (current-indentation))) | 535 | (let ((indent-offset (current-indentation))) |
| 536 | (when (> indent-offset 0) | 536 | (when (> indent-offset 0) |
| 537 | (setq python-indent-offset indent-offset)))))))) | 537 | (setq python-indent-offset indent-offset)))))))) |
| @@ -578,7 +578,7 @@ START is the buffer position where the sexp starts." | |||
| 578 | (let ((block-regexp (python-rx block-start)) | 578 | (let ((block-regexp (python-rx block-start)) |
| 579 | (block-start-line-end ":[[:space:]]*$")) | 579 | (block-start-line-end ":[[:space:]]*$")) |
| 580 | (back-to-indentation) | 580 | (back-to-indentation) |
| 581 | (while (and (forward-comment -1) (not (bobp)))) | 581 | (while (and (forward-comment -9999) (not (bobp)))) |
| 582 | (back-to-indentation) | 582 | (back-to-indentation) |
| 583 | (when (or (python-info-continuation-line-p) | 583 | (when (or (python-info-continuation-line-p) |
| 584 | (and (not (looking-at block-regexp)) | 584 | (and (not (looking-at block-regexp)) |
| @@ -601,7 +601,7 @@ START is the buffer position where the sexp starts." | |||
| 601 | 'after-beginning-of-block) | 601 | 'after-beginning-of-block) |
| 602 | ;; After normal line | 602 | ;; After normal line |
| 603 | ((setq start (save-excursion | 603 | ((setq start (save-excursion |
| 604 | (while (and (forward-comment -1) (not (bobp)))) | 604 | (while (and (forward-comment -9999) (not (bobp)))) |
| 605 | (python-nav-sentence-start) | 605 | (python-nav-sentence-start) |
| 606 | (point-marker))) | 606 | (point-marker))) |
| 607 | 'after-line) | 607 | 'after-line) |
| @@ -692,7 +692,7 @@ START is the buffer position where the sexp starts." | |||
| 692 | indentation)) | 692 | indentation)) |
| 693 | ('inside-paren | 693 | ('inside-paren |
| 694 | (or (save-excursion | 694 | (or (save-excursion |
| 695 | (forward-comment 1) | 695 | (forward-comment 9999) |
| 696 | (when (and (looking-at (regexp-opt '(")" "]" "}"))) | 696 | (when (and (looking-at (regexp-opt '(")" "]" "}"))) |
| 697 | (not (forward-char 1)) | 697 | (not (forward-char 1)) |
| 698 | (not (python-info-ppss-context 'paren))) | 698 | (not (python-info-ppss-context 'paren))) |
| @@ -707,10 +707,10 @@ START is the buffer position where the sexp starts." | |||
| 707 | (narrow-to-region | 707 | (narrow-to-region |
| 708 | (line-beginning-position) | 708 | (line-beginning-position) |
| 709 | (line-end-position)) | 709 | (line-end-position)) |
| 710 | (forward-comment 1)) | 710 | (forward-comment 9999)) |
| 711 | (if (looking-at "$") | 711 | (if (looking-at "$") |
| 712 | (+ (current-indentation) python-indent-offset) | 712 | (+ (current-indentation) python-indent-offset) |
| 713 | (forward-comment 1) | 713 | (forward-comment 9999) |
| 714 | (current-column))) | 714 | (current-column))) |
| 715 | (if (progn | 715 | (if (progn |
| 716 | (back-to-indentation) | 716 | (back-to-indentation) |
| @@ -946,7 +946,7 @@ decorators are not included. Return non-nil if point is moved to the | |||
| 946 | (let ((found)) | 946 | (let ((found)) |
| 947 | (dotimes (i (- arg) found) | 947 | (dotimes (i (- arg) found) |
| 948 | (python-end-of-defun-function) | 948 | (python-end-of-defun-function) |
| 949 | (forward-comment 1) | 949 | (forward-comment 9999) |
| 950 | (goto-char (line-end-position)) | 950 | (goto-char (line-end-position)) |
| 951 | (when (not (eobp)) | 951 | (when (not (eobp)) |
| 952 | (setq found | 952 | (setq found |
| @@ -970,7 +970,7 @@ Returns nil if point is not in a def or class." | |||
| 970 | (not (eobp)) | 970 | (not (eobp)) |
| 971 | (or (not (current-word)) | 971 | (or (not (current-word)) |
| 972 | (> (current-indentation) beg-defun-indent)))) | 972 | (> (current-indentation) beg-defun-indent)))) |
| 973 | (forward-comment 1) | 973 | (forward-comment 9999) |
| 974 | (goto-char (line-beginning-position)))) | 974 | (goto-char (line-beginning-position)))) |
| 975 | 975 | ||
| 976 | (defun python-nav-sentence-start () | 976 | (defun python-nav-sentence-start () |
| @@ -1308,7 +1308,7 @@ the output." | |||
| 1308 | (with-temp-buffer | 1308 | (with-temp-buffer |
| 1309 | (insert output-buffer) | 1309 | (insert output-buffer) |
| 1310 | (goto-char (point-min)) | 1310 | (goto-char (point-min)) |
| 1311 | (forward-comment 1) | 1311 | (forward-comment 9999) |
| 1312 | (buffer-substring-no-properties | 1312 | (buffer-substring-no-properties |
| 1313 | (or | 1313 | (or |
| 1314 | (and (looking-at python-shell-prompt-output-regexp) | 1314 | (and (looking-at python-shell-prompt-output-regexp) |
| @@ -2145,7 +2145,7 @@ not inside a defun." | |||
| 2145 | (widen) | 2145 | (widen) |
| 2146 | (save-excursion | 2146 | (save-excursion |
| 2147 | (goto-char (line-end-position)) | 2147 | (goto-char (line-end-position)) |
| 2148 | (forward-comment -1) | 2148 | (forward-comment -9999) |
| 2149 | (while (python-beginning-of-defun-function 1 t) | 2149 | (while (python-beginning-of-defun-function 1 t) |
| 2150 | (when (or (not min-indent) | 2150 | (when (or (not min-indent) |
| 2151 | (< (current-indentation) min-indent)) | 2151 | (< (current-indentation) min-indent)) |