diff options
| author | Glenn Morris | 2010-11-08 23:41:57 -0800 |
|---|---|---|
| committer | Glenn Morris | 2010-11-08 23:41:57 -0800 |
| commit | 14121c5280ed98bc16f401dbf0991277fb996b50 (patch) | |
| tree | 9ee5c66bd5f1e83a6ce5f5ff46c66044678f61e1 | |
| parent | aef8d045c965e503c11af5de22d68f136f7e5513 (diff) | |
| download | emacs-14121c5280ed98bc16f401dbf0991277fb996b50.tar.gz emacs-14121c5280ed98bc16f401dbf0991277fb996b50.zip | |
* lisp/progmodes/tcl.el (tcl-hairy-scan-for-comment): Doc fix.
| -rw-r--r-- | lisp/ChangeLog | 4 | ||||
| -rw-r--r-- | lisp/progmodes/tcl.el | 10 |
2 files changed, 5 insertions, 9 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog index f182e6d0ddd..f4cf656fbf2 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2010-11-09 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * progmodes/tcl.el (tcl-hairy-scan-for-comment): Doc fix. | ||
| 4 | |||
| 1 | 2010-11-08 Stefan Monnier <monnier@iro.umontreal.ca> | 5 | 2010-11-08 Stefan Monnier <monnier@iro.umontreal.ca> |
| 2 | 6 | ||
| 3 | * minibuffer.el (minibuffer-completion-help): Specify the end of the | 7 | * minibuffer.el (minibuffer-completion-help): Specify the end of the |
diff --git a/lisp/progmodes/tcl.el b/lisp/progmodes/tcl.el index 58b8be8c7ba..cb69d49fcbd 100644 --- a/lisp/progmodes/tcl.el +++ b/lisp/progmodes/tcl.el | |||
| @@ -606,15 +606,11 @@ Commands: | |||
| 606 | (set (make-local-variable 'dabbrev-abbrev-skip-leading-regexp) "[$!]") | 606 | (set (make-local-variable 'dabbrev-abbrev-skip-leading-regexp) "[$!]") |
| 607 | (set (make-local-variable 'dabbrev-abbrev-char-regexp) "\\sw\\|\\s_") | 607 | (set (make-local-variable 'dabbrev-abbrev-char-regexp) "\\sw\\|\\s_") |
| 608 | 608 | ||
| 609 | ;; This can only be set to t in Emacs 19 and XEmacs. | ||
| 610 | ;; Emacs 18 and Epoch lose. | ||
| 611 | (set (make-local-variable 'parse-sexp-ignore-comments) t) | 609 | (set (make-local-variable 'parse-sexp-ignore-comments) t) |
| 612 | ;; XEmacs has defun-prompt-regexp, but I don't believe | 610 | ;; XEmacs has defun-prompt-regexp, but I don't believe |
| 613 | ;; that it works for end-of-defun -- only for | 611 | ;; that it works for end-of-defun -- only for |
| 614 | ;; beginning-of-defun. | 612 | ;; beginning-of-defun. |
| 615 | (set (make-local-variable 'defun-prompt-regexp) tcl-omit-ws-regexp) | 613 | (set (make-local-variable 'defun-prompt-regexp) tcl-omit-ws-regexp) |
| 616 | ;; The following doesn't work in Lucid Emacs 19.6, but maybe | ||
| 617 | ;; it will appear in later versions. | ||
| 618 | (set (make-local-variable 'add-log-current-defun-function) | 614 | (set (make-local-variable 'add-log-current-defun-function) |
| 619 | 'tcl-add-log-defun) | 615 | 'tcl-add-log-defun) |
| 620 | 616 | ||
| @@ -1200,11 +1196,7 @@ semicolon, opening brace, or opening bracket on the same line." | |||
| 1200 | "Determine if point is in a comment. | 1196 | "Determine if point is in a comment. |
| 1201 | Returns a list of the form `(FLAG . STATE)'. STATE can be used | 1197 | Returns a list of the form `(FLAG . STATE)'. STATE can be used |
| 1202 | as input to future invocations. FLAG is nil if not in comment, | 1198 | as input to future invocations. FLAG is nil if not in comment, |
| 1203 | t otherwise. If in comment, leaves point at beginning of comment. | 1199 | t otherwise. If in comment, leaves point at beginning of comment." |
| 1204 | |||
| 1205 | This function does not work in Emacs 18. | ||
| 1206 | See also `tcl-simple-scan-for-comment', a | ||
| 1207 | simpler version that is often right, and works in Emacs 18." | ||
| 1208 | (let ((bol (save-excursion | 1200 | (let ((bol (save-excursion |
| 1209 | (goto-char end) | 1201 | (goto-char end) |
| 1210 | (beginning-of-line) | 1202 | (beginning-of-line) |