Mercurial > emacs
comparison lisp/progmodes/tcl.el @ 111449:132f2dfd549f
Merge from emacs-23
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Tue, 09 Nov 2010 15:07:10 -0500 |
parents | 56b71cddc9c5 d30a1f654ca5 |
children | b47e85affa59 |
comparison
equal
deleted
inserted
replaced
111448:321fbae3e04d | 111449:132f2dfd549f |
---|---|
605 (set (make-local-variable 'dabbrev-case-fold-search) nil) | 605 (set (make-local-variable 'dabbrev-case-fold-search) nil) |
606 (set (make-local-variable 'dabbrev-case-replace) nil) | 606 (set (make-local-variable 'dabbrev-case-replace) nil) |
607 (set (make-local-variable 'dabbrev-abbrev-skip-leading-regexp) "[$!]") | 607 (set (make-local-variable 'dabbrev-abbrev-skip-leading-regexp) "[$!]") |
608 (set (make-local-variable 'dabbrev-abbrev-char-regexp) "\\sw\\|\\s_") | 608 (set (make-local-variable 'dabbrev-abbrev-char-regexp) "\\sw\\|\\s_") |
609 | 609 |
610 ;; This can only be set to t in Emacs 19 and XEmacs. | |
611 ;; Emacs 18 and Epoch lose. | |
612 (set (make-local-variable 'parse-sexp-ignore-comments) t) | 610 (set (make-local-variable 'parse-sexp-ignore-comments) t) |
613 ;; XEmacs has defun-prompt-regexp, but I don't believe | 611 ;; XEmacs has defun-prompt-regexp, but I don't believe |
614 ;; that it works for end-of-defun -- only for | 612 ;; that it works for end-of-defun -- only for |
615 ;; beginning-of-defun. | 613 ;; beginning-of-defun. |
616 (set (make-local-variable 'defun-prompt-regexp) tcl-omit-ws-regexp) | 614 (set (make-local-variable 'defun-prompt-regexp) tcl-omit-ws-regexp) |
617 ;; The following doesn't work in Lucid Emacs 19.6, but maybe | |
618 ;; it will appear in later versions. | |
619 (set (make-local-variable 'add-log-current-defun-function) | 615 (set (make-local-variable 'add-log-current-defun-function) |
620 'tcl-add-log-defun) | 616 'tcl-add-log-defun) |
621 | 617 |
622 (easy-menu-add tcl-mode-menu) | 618 (easy-menu-add tcl-mode-menu) |
623 ;; Append Tcl menu to popup menu for XEmacs. | 619 ;; Append Tcl menu to popup menu for XEmacs. |
1199 | 1195 |
1200 (defun tcl-hairy-scan-for-comment (state end always-stop) | 1196 (defun tcl-hairy-scan-for-comment (state end always-stop) |
1201 "Determine if point is in a comment. | 1197 "Determine if point is in a comment. |
1202 Returns a list of the form `(FLAG . STATE)'. STATE can be used | 1198 Returns a list of the form `(FLAG . STATE)'. STATE can be used |
1203 as input to future invocations. FLAG is nil if not in comment, | 1199 as input to future invocations. FLAG is nil if not in comment, |
1204 t otherwise. If in comment, leaves point at beginning of comment. | 1200 t otherwise. If in comment, leaves point at beginning of comment." |
1205 | |
1206 This function does not work in Emacs 18. | |
1207 See also `tcl-simple-scan-for-comment', a | |
1208 simpler version that is often right, and works in Emacs 18." | |
1209 (let ((bol (save-excursion | 1201 (let ((bol (save-excursion |
1210 (goto-char end) | 1202 (goto-char end) |
1211 (line-beginning-position))) | 1203 (line-beginning-position))) |
1212 real-comment | 1204 real-comment |
1213 last-cstart) | 1205 last-cstart) |