diff options
| author | Richard M. Stallman | 2004-11-25 03:04:16 +0000 |
|---|---|---|
| committer | Richard M. Stallman | 2004-11-25 03:04:16 +0000 |
| commit | 335dd1f105c93aa87d253354a0985bfde2415bfb (patch) | |
| tree | 9fa41e3ff45011a0bbe9e98ba428d297de02e9bd | |
| parent | 5988691b0425d1952aa32734ee4eb0fb8341faf9 (diff) | |
| download | emacs-335dd1f105c93aa87d253354a0985bfde2415bfb.tar.gz emacs-335dd1f105c93aa87d253354a0985bfde2415bfb.zip | |
(cperl-indent-region, cperl-imenu--create-perl-index, cperl-xsub-scan):
Don't print progress messages.
| -rw-r--r-- | lisp/progmodes/cperl-mode.el | 24 |
1 files changed, 1 insertions, 23 deletions
diff --git a/lisp/progmodes/cperl-mode.el b/lisp/progmodes/cperl-mode.el index 831917f1197..accdad515f2 100644 --- a/lisp/progmodes/cperl-mode.el +++ b/lisp/progmodes/cperl-mode.el | |||
| @@ -4191,12 +4191,7 @@ conditional/loop constructs." | |||
| 4191 | (goto-char start) | 4191 | (goto-char start) |
| 4192 | (setq end (set-marker (make-marker) end)) ; indentation changes pos | 4192 | (setq end (set-marker (make-marker) end)) ; indentation changes pos |
| 4193 | (or (bolp) (beginning-of-line 2)) | 4193 | (or (bolp) (beginning-of-line 2)) |
| 4194 | (or (fboundp 'imenu-progress-message) | ||
| 4195 | (message "Indenting... For feedback load `imenu'...")) | ||
| 4196 | (while (and (<= (point) end) (not (eobp))) ; bol to check start | 4194 | (while (and (<= (point) end) (not (eobp))) ; bol to check start |
| 4197 | (and (fboundp 'imenu-progress-message) | ||
| 4198 | (imenu-progress-message | ||
| 4199 | pm (/ (* 100 (- (point) start)) (- end start -1)))) | ||
| 4200 | (setq st (point)) | 4195 | (setq st (point)) |
| 4201 | (if (or | 4196 | (if (or |
| 4202 | (setq empty (looking-at "[ \t]*\n")) | 4197 | (setq empty (looking-at "[ \t]*\n")) |
| @@ -4232,10 +4227,7 @@ conditional/loop constructs." | |||
| 4232 | (skip-chars-backward " \t") | 4227 | (skip-chars-backward " \t") |
| 4233 | (skip-chars-backward "#") | 4228 | (skip-chars-backward "#") |
| 4234 | (setq new-comm-indent (current-column)))))))) | 4229 | (setq new-comm-indent (current-column)))))))) |
| 4235 | (beginning-of-line 2)) | 4230 | (beginning-of-line 2))) |
| 4236 | (if (fboundp 'imenu-progress-message) | ||
| 4237 | (imenu-progress-message pm 100) | ||
| 4238 | (message nil))) | ||
| 4239 | ;; Now run the update hooks | 4231 | ;; Now run the update hooks |
| 4240 | (and after-change-functions | 4232 | (and after-change-functions |
| 4241 | cperl-update-end | 4233 | cperl-update-end |
| @@ -4385,17 +4377,12 @@ indentation and initial hashes. Behaves usually outside of comment." | |||
| 4385 | packages ends-ranges p marker | 4377 | packages ends-ranges p marker |
| 4386 | (prev-pos 0) char fchar index index1 name (end-range 0) package) | 4378 | (prev-pos 0) char fchar index index1 name (end-range 0) package) |
| 4387 | (goto-char (point-min)) | 4379 | (goto-char (point-min)) |
| 4388 | (if noninteractive | ||
| 4389 | (message "Scanning Perl for index") | ||
| 4390 | (imenu-progress-message prev-pos 0)) | ||
| 4391 | (cperl-update-syntaxification (point-max) (point-max)) | 4380 | (cperl-update-syntaxification (point-max) (point-max)) |
| 4392 | ;; Search for the function | 4381 | ;; Search for the function |
| 4393 | (progn ;;save-match-data | 4382 | (progn ;;save-match-data |
| 4394 | (while (re-search-forward | 4383 | (while (re-search-forward |
| 4395 | (or regexp cperl-imenu--function-name-regexp-perl) | 4384 | (or regexp cperl-imenu--function-name-regexp-perl) |
| 4396 | nil t) | 4385 | nil t) |
| 4397 | (or noninteractive | ||
| 4398 | (imenu-progress-message prev-pos)) | ||
| 4399 | (cond | 4386 | (cond |
| 4400 | ((and ; Skip some noise if building tags | 4387 | ((and ; Skip some noise if building tags |
| 4401 | (match-beginning 2) ; package or sub | 4388 | (match-beginning 2) ; package or sub |
| @@ -4465,8 +4452,6 @@ indentation and initial hashes. Behaves usually outside of comment." | |||
| 4465 | (setq index1 (cons (concat "=" name) (cdr index))) | 4452 | (setq index1 (cons (concat "=" name) (cdr index))) |
| 4466 | (push index index-pod-alist) | 4453 | (push index index-pod-alist) |
| 4467 | (push index1 index-unsorted-alist))))) | 4454 | (push index1 index-unsorted-alist))))) |
| 4468 | (or noninteractive | ||
| 4469 | (imenu-progress-message prev-pos 100)) | ||
| 4470 | (setq index-alist | 4455 | (setq index-alist |
| 4471 | (if (default-value 'imenu-sort-function) | 4456 | (if (default-value 'imenu-sort-function) |
| 4472 | (sort index-alist (default-value 'imenu-sort-function)) | 4457 | (sort index-alist (default-value 'imenu-sort-function)) |
| @@ -5549,16 +5534,11 @@ Delay of auto-help controlled by `cperl-lazy-help-time'." | |||
| 5549 | (let ((index-alist '()) | 5534 | (let ((index-alist '()) |
| 5550 | (prev-pos 0) index index1 name package prefix) | 5535 | (prev-pos 0) index index1 name package prefix) |
| 5551 | (goto-char (point-min)) | 5536 | (goto-char (point-min)) |
| 5552 | (if noninteractive | ||
| 5553 | (message "Scanning XSUB for index") | ||
| 5554 | (imenu-progress-message prev-pos 0)) | ||
| 5555 | ;; Search for the function | 5537 | ;; Search for the function |
| 5556 | (progn ;;save-match-data | 5538 | (progn ;;save-match-data |
| 5557 | (while (re-search-forward | 5539 | (while (re-search-forward |
| 5558 | "^\\([ \t]*MODULE\\>[^\n]*\\<PACKAGE[ \t]*=[ \t]*\\([a-zA-Z_][a-zA-Z_0-9:]*\\)\\>\\|\\([a-zA-Z_][a-zA-Z_0-9]*\\)(\\|[ \t]*BOOT:\\)" | 5540 | "^\\([ \t]*MODULE\\>[^\n]*\\<PACKAGE[ \t]*=[ \t]*\\([a-zA-Z_][a-zA-Z_0-9:]*\\)\\>\\|\\([a-zA-Z_][a-zA-Z_0-9]*\\)(\\|[ \t]*BOOT:\\)" |
| 5559 | nil t) | 5541 | nil t) |
| 5560 | (or noninteractive | ||
| 5561 | (imenu-progress-message prev-pos)) | ||
| 5562 | (cond | 5542 | (cond |
| 5563 | ((match-beginning 2) ; SECTION | 5543 | ((match-beginning 2) ; SECTION |
| 5564 | (setq package (buffer-substring (match-beginning 2) (match-end 2))) | 5544 | (setq package (buffer-substring (match-beginning 2) (match-end 2))) |
| @@ -5586,8 +5566,6 @@ Delay of auto-help controlled by `cperl-lazy-help-time'." | |||
| 5586 | (setq index (imenu-example--name-and-position)) | 5566 | (setq index (imenu-example--name-and-position)) |
| 5587 | (setcar index (concat package "::BOOT:")) | 5567 | (setcar index (concat package "::BOOT:")) |
| 5588 | (push index index-alist))))) | 5568 | (push index index-alist))))) |
| 5589 | (or noninteractive | ||
| 5590 | (imenu-progress-message prev-pos 100)) | ||
| 5591 | index-alist)) | 5569 | index-alist)) |
| 5592 | 5570 | ||
| 5593 | (defvar cperl-unreadable-ok nil) | 5571 | (defvar cperl-unreadable-ok nil) |