/[emacs]/emacs/lisp/progmodes/cperl-mode.el
ViewVC logotype

Diff of /emacs/lisp/progmodes/cperl-mode.el

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

revision 1.56 by rms, Sat Nov 20 20:18:34 2004 UTC revision 1.57 by rms, Thu Nov 25 03:04:16 2004 UTC
# Line 4191  conditional/loop constructs." Line 4191  conditional/loop constructs."
4191          (goto-char start)          (goto-char start)
4192          (setq end (set-marker (make-marker) end)) ; indentation changes pos          (setq end (set-marker (make-marker) end)) ; indentation changes pos
4193          (or (bolp) (beginning-of-line 2))          (or (bolp) (beginning-of-line 2))
         (or (fboundp 'imenu-progress-message)  
             (message "Indenting... For feedback load `imenu'..."))  
4194          (while (and (<= (point) end) (not (eobp))) ; bol to check start          (while (and (<= (point) end) (not (eobp))) ; bol to check start
           (and (fboundp 'imenu-progress-message)  
                (imenu-progress-message  
                 pm (/ (* 100 (- (point) start)) (- end start -1))))  
4195            (setq st (point))            (setq st (point))
4196            (if (or            (if (or
4197                 (setq empty (looking-at "[ \t]*\n"))                 (setq empty (looking-at "[ \t]*\n"))
# Line 4232  conditional/loop constructs." Line 4227  conditional/loop constructs."
4227                               (skip-chars-backward " \t")                               (skip-chars-backward " \t")
4228                               (skip-chars-backward "#")                               (skip-chars-backward "#")
4229                               (setq new-comm-indent (current-column))))))))                               (setq new-comm-indent (current-column))))))))
4230          (beginning-of-line 2))          (beginning-of-line 2)))
         (if (fboundp 'imenu-progress-message)  
              (imenu-progress-message pm 100)  
           (message nil)))  
4231        ;; Now run the update hooks        ;; Now run the update hooks
4232        (and after-change-functions        (and after-change-functions
4233             cperl-update-end             cperl-update-end
# Line 4385  indentation and initial hashes.  Behaves Line 4377  indentation and initial hashes.  Behaves
4377          packages ends-ranges p marker          packages ends-ranges p marker
4378          (prev-pos 0) char fchar index index1 name (end-range 0) package)          (prev-pos 0) char fchar index index1 name (end-range 0) package)
4379      (goto-char (point-min))      (goto-char (point-min))
     (if noninteractive  
         (message "Scanning Perl for index")  
       (imenu-progress-message prev-pos 0))  
4380      (cperl-update-syntaxification (point-max) (point-max))      (cperl-update-syntaxification (point-max) (point-max))
4381      ;; Search for the function      ;; Search for the function
4382      (progn ;;save-match-data      (progn ;;save-match-data
4383        (while (re-search-forward        (while (re-search-forward
4384                (or regexp cperl-imenu--function-name-regexp-perl)                (or regexp cperl-imenu--function-name-regexp-perl)
4385                nil t)                nil t)
         (or noninteractive  
             (imenu-progress-message prev-pos))  
4386          (cond          (cond
4387           ((and                          ; Skip some noise if building tags           ((and                          ; Skip some noise if building tags
4388             (match-beginning 2)          ; package or sub             (match-beginning 2)          ; package or sub
# Line 4465  indentation and initial hashes.  Behaves Line 4452  indentation and initial hashes.  Behaves
4452            (setq index1 (cons (concat "=" name) (cdr index)))            (setq index1 (cons (concat "=" name) (cdr index)))
4453            (push index index-pod-alist)            (push index index-pod-alist)
4454            (push index1 index-unsorted-alist)))))            (push index1 index-unsorted-alist)))))
     (or noninteractive  
         (imenu-progress-message prev-pos 100))  
4455      (setq index-alist      (setq index-alist
4456            (if (default-value 'imenu-sort-function)            (if (default-value 'imenu-sort-function)
4457                (sort index-alist (default-value 'imenu-sort-function))                (sort index-alist (default-value 'imenu-sort-function))
# Line 5549  Delay of auto-help controlled by `cperl- Line 5534  Delay of auto-help controlled by `cperl-
5534    (let ((index-alist '())    (let ((index-alist '())
5535          (prev-pos 0) index index1 name package prefix)          (prev-pos 0) index index1 name package prefix)
5536      (goto-char (point-min))      (goto-char (point-min))
     (if noninteractive  
         (message "Scanning XSUB for index")  
       (imenu-progress-message prev-pos 0))  
5537      ;; Search for the function      ;; Search for the function
5538      (progn ;;save-match-data      (progn ;;save-match-data
5539        (while (re-search-forward        (while (re-search-forward
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:\\)"                "^\\([ \t]*MODULE\\>[^\n]*\\<PACKAGE[ \t]*=[ \t]*\\([a-zA-Z_][a-zA-Z_0-9:]*\\)\\>\\|\\([a-zA-Z_][a-zA-Z_0-9]*\\)(\\|[ \t]*BOOT:\\)"
5541                nil t)                nil t)
         (or noninteractive  
             (imenu-progress-message prev-pos))  
5542          (cond          (cond
5543           ((match-beginning 2)           ; SECTION           ((match-beginning 2)           ; SECTION
5544            (setq package (buffer-substring (match-beginning 2) (match-end 2)))            (setq package (buffer-substring (match-beginning 2) (match-end 2)))
# Line 5586  Delay of auto-help controlled by `cperl- Line 5566  Delay of auto-help controlled by `cperl-
5566            (setq index (imenu-example--name-and-position))            (setq index (imenu-example--name-and-position))
5567            (setcar index (concat package "::BOOT:"))            (setcar index (concat package "::BOOT:"))
5568            (push index index-alist)))))            (push index index-alist)))))
     (or noninteractive  
         (imenu-progress-message prev-pos 100))  
5569      index-alist))      index-alist))
5570    
5571  (defvar cperl-unreadable-ok nil)  (defvar cperl-unreadable-ok nil)

Legend:
Removed from v.1.56  
changed lines
  Added in v.1.57

savannah-hackers-public@gnu.org
ViewVC Help
Powered by ViewVC 1.1.26