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

[Juanma Barranquero]

Index: emacs/lisp/progmodes/tcl.el
diff -c emacs/lisp/progmodes/tcl.el:1.70 emacs/lisp/progmodes/tcl.el:1.71
*** emacs/lisp/progmodes/tcl.el:1.70    Thu Nov  7 10:22:49 2002
--- emacs/lisp/progmodes/tcl.el Tue Feb  4 08:24:35 2003
***************
*** 6,12 ****
  ;; Author: Tom Tromey <address@hidden>
  ;;    Chris Lindblad <address@hidden>
  ;; Keywords: languages tcl modes
! ;; Version: $Revision: 1.70 $
  
  ;; 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.71 $
  
  ;; This file is part of GNU Emacs.
  
***************
*** 318,324 ****
  If you do a \\[tcl-eval-defun] command on some Lisp source code, what
  process do you send it to?
  
! - If you're in a process buffer (foo, bar, or *inferior-tcl*), 
    you send it to that process.
  - If you're in some other buffer (e.g., a source file), you
    send it to the process attached to buffer `inferior-tcl-buffer'.
--- 318,324 ----
  If you do a \\[tcl-eval-defun] command on some Lisp source code, what
  process do you send it to?
  
! - If you're in a process buffer (foo, bar, or *inferior-tcl*),
    you send it to that process.
  - If you're in some other buffer (e.g., a source file), you
    send it to the process attached to buffer `inferior-tcl-buffer'.
***************
*** 494,500 ****
         ;; FIXME consider using "not word or symbol", not
         ;; "whitespace".
         (cons (concat "\\(\\s-\\|^\\)"
!                      ;; FIXME Use regexp-quote? 
                       (regexp-opt tcl-keyword-list t)
                       "\\(\\s-\\|$\\)")
               2))))
--- 494,500 ----
         ;; FIXME consider using "not word or symbol", not
         ;; "whitespace".
         (cons (concat "\\(\\s-\\|^\\)"
!                      ;; FIXME Use regexp-quote?
                       (regexp-opt tcl-keyword-list t)
                       "\\(\\s-\\|$\\)")
               2))))
***************
*** 573,579 ****
  
    (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)
    (set (make-local-variable 'dabbrev-case-replace) nil)
--- 573,579 ----
  
    (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)
    (set (make-local-variable 'dabbrev-case-replace) nil)
***************
*** 789,795 ****
      (beginning-of-line)
      (let* ((indent-point (point))
           (case-fold-search nil)
!          (continued-line 
            (save-excursion
              (if (bobp)
                  nil
--- 789,795 ----
      (beginning-of-line)
      (let* ((indent-point (point))
           (case-fold-search nil)
!          (continued-line
            (save-excursion
              (if (bobp)
                  nil
***************
*** 937,949 ****
                  contain-stack (cons nil contain-stack)
                  last-depth (1+ last-depth)))
          (if (null (car contain-stack))
!             (setcar contain-stack 
                      (or (car (cdr state))
                          (save-excursion
                            (forward-sexp -1)
                            (point)))))
          (forward-line 1)
!         (setq continued-line 
                (save-excursion
                  (backward-char)
                  (= (preceding-char) ?\\)))
--- 937,949 ----
                  contain-stack (cons nil contain-stack)
                  last-depth (1+ last-depth)))
          (if (null (car contain-stack))
!             (setcar contain-stack
                      (or (car (cdr state))
                          (save-excursion
                            (forward-sexp -1)
                            (point)))))
          (forward-line 1)
!         (setq continued-line
                (save-excursion
                  (backward-char)
                  (= (preceding-char) ?\\)))
***************
*** 969,982 ****
                   (setq this-indent (- this-indent 1))))
            ;; Put chosen indentation into effect.
            (or (null this-indent)
!               (= (current-column) 
!                  (if continued-line 
                       (+ this-indent tcl-indent-level)
                     this-indent))
                (progn
                  (delete-region (point) (progn (beginning-of-line) (point)))
!                 (indent-to 
!                  (if continued-line 
                       (+ this-indent tcl-indent-level)
                     this-indent)))))))))
    )
--- 969,982 ----
                   (setq this-indent (- this-indent 1))))
            ;; Put chosen indentation into effect.
            (or (null this-indent)
!               (= (current-column)
!                  (if continued-line
                       (+ this-indent tcl-indent-level)
                     this-indent))
                (progn
                  (delete-region (point) (progn (beginning-of-line) (point)))
!                 (indent-to
!                  (if continued-line
                       (+ this-indent tcl-indent-level)
                     this-indent)))))))))
    )