[Emacs-diffs] Changes to emacs/lisp/progmodes/tcl.el

[Richard M. Stallman]

Index: emacs/lisp/progmodes/tcl.el
diff -c emacs/lisp/progmodes/tcl.el:1.67 emacs/lisp/progmodes/tcl.el:1.68
*** emacs/lisp/progmodes/tcl.el:1.67    Fri Mar 29 07:47:57 2002
--- emacs/lisp/progmodes/tcl.el Mon Apr  1 15:18:48 2002
***************
*** 6,12 ****
  ;; Author: Tom Tromey <address@hidden>
  ;;    Chris Lindblad <address@hidden>
  ;; Keywords: languages tcl modes
! ;; Version: $Revision: 1.67 $
  
  ;; This file is part of GNU Emacs.
  
--- 6,12 ----
  ;; Author: Tom Tromey <address@hidden>
  ;;    Chris Lindblad <address@hidden>
  ;; Keywords: languages tcl modes
! ;; Version: $Revision: 1.68 $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 506,511 ****
--- 506,516 ----
      ()
    (tcl-set-font-lock-keywords))
  
+ 
+ (defvar tcl-imenu-generic-expression
+   '((nil "^proc[ \t]+\\([-A-Za-z0-9_:+*]+\\)" 1))
+   "Imenu generic expression for `tcl-mode'.  See `imenu-generic-expression'.")
+ 
  
  
  ;;
***************
*** 549,556 ****
    (set (make-local-variable 'paragraph-start) "$\\|")
    (set (make-local-variable 'paragraph-separate) paragraph-start)
  
!   (set (make-local-variable 'paragraph-ignore-fill-prefix) t)
!   (set (make-local-variable 'fill-paragraph-function) 'tcl-do-fill-paragraph)
  
    (set (make-local-variable 'indent-line-function) 'tcl-indent-line)
    (set (make-local-variable 'comment-indent-function) 'tcl-comment-indent)
--- 554,563 ----
    (set (make-local-variable 'paragraph-start) "$\\|")
    (set (make-local-variable 'paragraph-separate) paragraph-start)
  
!   (unless (and (boundp 'filladapt-mode) filladapt-mode)
!     (set (make-local-variable 'paragraph-ignore-fill-prefix) t)
!     (set (make-local-variable 'fill-paragraph-function)
!        'tcl-do-fill-paragraph))
  
    (set (make-local-variable 'indent-line-function) 'tcl-indent-line)
    (set (make-local-variable 'comment-indent-function) 'tcl-comment-indent)
***************
*** 571,578 ****
         (font-lock-syntactic-keywords . tcl-font-lock-syntactic-keywords)
         (parse-sexp-lookup-properties . t)))
  
!   (set (make-local-variable 'imenu-create-index-function)
!        'tcl-imenu-create-index-function)
    
    ;; Settings for new dabbrev code.
    (set (make-local-variable 'dabbrev-case-fold-search) nil)
--- 578,585 ----
         (font-lock-syntactic-keywords . tcl-font-lock-syntactic-keywords)
         (parse-sexp-lookup-properties . t)))
  
!   (set (make-local-variable 'imenu-generic-expression)
!        'tcl-imenu-generic-expression)
    
    ;; Settings for new dabbrev code.
    (set (make-local-variable 'dabbrev-case-fold-search) nil)
***************
*** 987,1009 ****
  ;; Interfaces to other packages.
  ;;
  
- (defun tcl-imenu-create-index-function ()
-   "Generate alist of indices for `imenu'."
-   (let ((re (concat tcl-proc-regexp "\\([^ \t\n{]+\\)"))
-       alist prev-pos)
-     (goto-char (point-min))
-     (imenu-progress-message prev-pos 0)
-     (save-match-data
-       (while (re-search-forward re nil t)
-       (imenu-progress-message prev-pos)
-       ;; Position on start of proc name, not beginning of line.
-       (setq alist (cons
-                    (cons (buffer-substring (match-beginning 2) (match-end 2))
-                          (match-beginning 2))
-                    alist))))
-     (imenu-progress-message prev-pos 100)
-     (nreverse alist)))
- 
  ;; FIXME Definition of function is very ad-hoc.  Should use
  ;; beginning-of-defun.  Also has incestuous knowledge about the
  ;; format of tcl-proc-regexp.
--- 994,999 ----
***************
*** 1108,1114 ****
  (define-derived-mode inferior-tcl-mode comint-mode "Inferior Tcl"
    "Major mode for interacting with Tcl interpreter.
  
! A Tcl process can be started with M-x inferior-tcl.
  
  Entry to this mode runs the normal hooks `comint-mode-hook' and
  `inferior-tcl-mode-hook', in that order.
--- 1098,1104 ----
  (define-derived-mode inferior-tcl-mode comint-mode "Inferior Tcl"
    "Major mode for interacting with Tcl interpreter.
  
! You can start a Tcl process with \\[inferior-tcl].
  
  Entry to this mode runs the normal hooks `comint-mode-hook' and
  `inferior-tcl-mode-hook', in that order.