[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/lisp/progmodes/tcl.el
From: |
Stefan Monnier |
Subject: |
[Emacs-diffs] Changes to emacs/lisp/progmodes/tcl.el |
Date: |
Sat, 17 May 2003 18:43:51 -0400 |
Index: emacs/lisp/progmodes/tcl.el
diff -c emacs/lisp/progmodes/tcl.el:1.73 emacs/lisp/progmodes/tcl.el:1.74
*** emacs/lisp/progmodes/tcl.el:1.73 Tue May 6 13:39:21 2003
--- emacs/lisp/progmodes/tcl.el Sat May 17 18:43:51 2003
***************
*** 1,12 ****
;;; tcl.el --- Tcl code editing commands for Emacs
! ;; Copyright (C) 1994, 1998, 1999, 2000, 2001, 2002 Free Software
Foundation, Inc.
;; Maintainer: FSF
;; Author: Tom Tromey <address@hidden>
;; Chris Lindblad <address@hidden>
;; Keywords: languages tcl modes
! ;; Version: $Revision: 1.73 $
;; This file is part of GNU Emacs.
--- 1,12 ----
;;; tcl.el --- Tcl code editing commands for Emacs
! ;; Copyright (C) 1994,98,1999,2000,01,02,2003 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Author: Tom Tromey <address@hidden>
;; Chris Lindblad <address@hidden>
;; Keywords: languages tcl modes
! ;; Version: $Revision: 1.74 $
;; This file is part of GNU Emacs.
***************
*** 122,141 ****
(defcustom tcl-indent-level 4
"*Indentation of Tcl statements with respect to containing block."
- :group 'tcl
:type 'integer)
(defcustom tcl-continued-indent-level 4
"*Indentation of continuation line relative to first line of command."
- :group 'tcl
:type 'integer)
(defcustom tcl-auto-newline nil
"*Non-nil means automatically newline before and after braces you insert."
- :group 'tcl
:type 'boolean)
! (defcustom tcl-tab-always-indent t
"*Control effect of TAB key.
If t (the default), always indent current line.
If nil and point is not in the indentation area at the beginning of
--- 122,138 ----
(defcustom tcl-indent-level 4
"*Indentation of Tcl statements with respect to containing block."
:type 'integer)
(defcustom tcl-continued-indent-level 4
"*Indentation of continuation line relative to first line of command."
:type 'integer)
(defcustom tcl-auto-newline nil
"*Non-nil means automatically newline before and after braces you insert."
:type 'boolean)
! (defcustom tcl-tab-always-indent tab-always-indent
"*Control effect of TAB key.
If t (the default), always indent current line.
If nil and point is not in the indentation area at the beginning of
***************
*** 149,155 ****
4. Move forward to end of line, indenting if necessary.
5. Create an empty comment.
6. Move backward to start of comment, indenting if necessary."
- :group 'tcl
:type '(choice (const :tag "Always" t)
(const :tag "Beginning only" nil)
(const :tag "Maybe move or make or delete comment" 'tcl)))
--- 146,151 ----
***************
*** 163,189 ****
made depending on the number of hashes inserted; or nil, meaning that
no quoting should be done. Any other value for this variable is
taken to mean `smart'. The default is nil."
- :group 'tcl
:type '(choice (const backslash) (const quote) (const smart) (const nil)))
(defcustom tcl-help-directory-list nil
"*List of topmost directories containing TclX help files."
- :group 'tcl
:type '(repeat directory))
(defcustom tcl-use-smart-word-finder t
"*If not nil, use smart way to find current word, for Tcl help feature."
- :group 'tcl
:type 'boolean)
(defcustom tcl-application "wish"
"*Name of Tcl program to run in inferior Tcl mode."
- :group 'tcl
:type 'string)
(defcustom tcl-command-switches nil
"*List of switches to supply to the `tcl-application' program."
- :group 'tcl
:type '(repeat string))
(defcustom tcl-prompt-regexp "^\\(% \\|\\)"
--- 159,180 ----
***************
*** 192,198 ****
The default is \"^\\(% \\|\\)\", which will match the default primary
and secondary prompts for tclsh and wish."
- :group 'tcl
:type 'regexp)
(defcustom inferior-tcl-source-command "source %s\n"
--- 183,188 ----
***************
*** 201,207 ****
and should result in a Tcl expression that will command the
inferior Tcl to load that file. The filename will be appropriately
quoted for Tcl."
- :group 'tcl
:type 'string)
;;
--- 191,196 ----
***************
*** 878,884 ****
(contain-stack (list (point)))
(case-fold-search nil)
outer-loop-done inner-loop-done state ostate
! this-indent last-sexp continued-line
(next-depth 0)
last-depth)
(save-excursion
--- 867,873 ----
(contain-stack (list (point)))
(case-fold-search nil)
outer-loop-done inner-loop-done state ostate
! this-indent continued-line
(next-depth 0)
last-depth)
(save-excursion
***************
*** 898,906 ****
(setq state (parse-partial-sexp (point) (progn (end-of-line) (point))
nil nil state))
(setq next-depth (car state))
- (if (and (car (cdr (cdr state)))
- (>= (car (cdr (cdr state))) 0))
- (setq last-sexp (car (cdr (cdr state)))))
(if (or (nth 4 ostate))
(tcl-indent-line))
(if (or (nth 3 state))
--- 887,892 ----
***************
*** 917,924 ****
(setq indent-stack (cdr indent-stack)
contain-stack (cdr contain-stack)
last-depth (1- last-depth)))
- (if (/= last-depth next-depth)
- (setq last-sexp nil))
;; Add levels for any parens that were started in this line.
(while (< last-depth next-depth)
(setq indent-stack (cons nil indent-stack)
--- 903,908 ----