Mercurial > emacs
view lisp/dirtrack.el @ 110305:b10051866f51
New syntax-propertize functionality.
* lisp/font-lock.el (font-lock-syntactic-keywords): Make obsolete.
(font-lock-fontify-syntactic-keywords-region): Move handling of
font-lock-syntactically-fontified to...
(font-lock-default-fontify-region): ...here.
Let syntax-propertize-function take precedence.
(font-lock-fontify-syntactically-region): Cal syntax-propertize.
* lisp/emacs-lisp/regexp-opt.el (regexp-opt-depth): Skip named groups.
* lisp/emacs-lisp/syntax.el (syntax-propertize-function)
(syntax-propertize-chunk-size, syntax-propertize--done)
(syntax-propertize-extend-region-functions): New vars.
(syntax-propertize-wholelines, syntax-propertize-multiline)
(syntax-propertize--shift-groups, syntax-propertize-via-font-lock)
(syntax-propertize): New functions.
(syntax-propertize-rules): New macro.
(syntax-ppss-flush-cache): Set syntax-propertize--done.
(syntax-ppss): Call syntax-propertize.
* lisp/progmodes/ada-mode.el (ada-set-syntax-table-properties)
(ada-after-change-function, ada-initialize-syntax-table-properties)
(ada-handle-syntax-table-properties): Only define when
syntax-propertize is not available.
(ada-mode): Use syntax-propertize-function.
* lisp/progmodes/autoconf.el (autoconf-mode):
Use syntax-propertize-function.
(autoconf-font-lock-syntactic-keywords): Remove.
* lisp/progmodes/cfengine.el (cfengine-mode):
Use syntax-propertize-function.
(cfengine-font-lock-syntactic-keywords): Remove.
* lisp/progmodes/cperl-mode.el (cperl-mode): Use syntax-propertize-function.
* lisp/progmodes/fortran.el (fortran-mode): Use syntax-propertize-function.
(fortran--font-lock-syntactic-keywords): New var.
(fortran-line-length): Update syntax-propertize-function and
fortran--font-lock-syntactic-keywords.
* lisp/progmodes/gud.el (gdb-script-syntax-propertize-function): New var;
replaces gdb-script-font-lock-syntactic-keywords.
(gdb-script-mode): Use it.
* lisp/progmodes/js.el (js--regexp-literal): Define while compiling.
(js-syntax-propertize-function): New var; replaces
js-font-lock-syntactic-keywords.
(js-mode): Use it.
* lisp/progmodes/make-mode.el (makefile-syntax-propertize-function):
New var; replaces makefile-font-lock-syntactic-keywords.
(makefile-mode): Use it.
(makefile-imake-mode): Adjust.
* lisp/progmodes/mixal-mode.el (mixal-syntax-propertize-function): New var;
replaces mixal-font-lock-syntactic-keywords.
(mixal-mode): Use it.
* lisp/progmodes/octave-mod.el (octave-syntax-propertize-sqs): New function
to replace octave-font-lock-close-quotes.
(octave-syntax-propertize-function): New function to replace
octave-font-lock-syntactic-keywords.
(octave-mode): Use it.
* lisp/progmodes/perl-mode.el (perl-syntax-propertize-function): New fun to
replace perl-font-lock-syntactic-keywords.
(perl-syntax-propertize-special-constructs): New fun to replace
perl-font-lock-special-syntactic-constructs.
(perl-font-lock-syntactic-face-function): New fun.
(perl-mode): Use it.
* lisp/progmodes/python.el (python-syntax-propertize-function): New var to
replace python-font-lock-syntactic-keywords.
(python-mode): Use it.
(python-quote-syntax): Simplify and adjust to new use.
* lisp/progmodes/ruby-mode.el (ruby-here-doc-beg-re):
Define while compiling.
(ruby-here-doc-end-re, ruby-here-doc-beg-match)
(ruby-font-lock-syntactic-keywords, ruby-comment-beg-syntax)
(syntax-ppss, ruby-in-ppss-context-p, ruby-in-here-doc-p)
(ruby-here-doc-find-end, ruby-here-doc-beg-syntax)
(ruby-here-doc-end-syntax): Only define when
syntax-propertize is not available.
(ruby-syntax-propertize-function, ruby-syntax-propertize-heredoc):
New functions.
(ruby-in-ppss-context-p): Update to new syntax of heredocs.
(electric-indent-chars): Silence bytecompiler.
(ruby-mode): Use prog-mode, syntax-propertize-function, and
electric-indent-chars.
* lisp/progmodes/sh-script.el (sh-st-symbol): Remove.
(sh-font-lock-close-heredoc, sh-font-lock-open-heredoc): Add eol arg.
(sh-font-lock-flush-syntax-ppss-cache, sh-font-lock-here-doc): Remove.
(sh-font-lock-quoted-subshell): Assume we've already matched $(.
(sh-font-lock-paren): Set syntax-multiline.
(sh-font-lock-syntactic-keywords): Remove.
(sh-syntax-propertize-function): New function to replace it.
(sh-mode): Use it.
* lisp/progmodes/simula.el (simula-syntax-propertize-function): New var to
replace simula-font-lock-syntactic-keywords.
(simula-mode): Use it.
* lisp/progmodes/tcl.el (tcl-syntax-propertize-function): New var to
replace tcl-font-lock-syntactic-keywords.
(tcl-mode): Use it.
* lisp/progmodes/vhdl-mode.el (vhdl-mode): Use syntax-propertize-function
if available.
(vhdl-fontify-buffer): Adjust.
* lisp/textmodes/bibtex.el (bibtex-mode): Use syntax-propertize-function.
* lisp/textmodes/reftex.el (font-lock-syntactic-keywords): Don't declare
since we don't use it.
* lisp/textmodes/sgml-mode.el (sgml-syntax-propertize-function): New var to
replace sgml-font-lock-syntactic-keywords.
(sgml-mode): Use it.
* lisp/textmodes/tex-mode.el (tex-common-initialization, doctex-mode):
Use syntax-propertize-function.
* lisp/textmodes/texinfo.el (texinfo-syntax-propertize-function): New fun
to replace texinfo-font-lock-syntactic-keywords.
(texinfo-mode): Use it.
* test/indent/octave.m: Remove some `fixindent' not needed any more.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Sat, 11 Sep 2010 01:13:42 +0200 |
parents | ffe7f17f895f |
children | 2b266010d0b7 |
line wrap: on
line source
;;; dirtrack.el --- Directory Tracking by watching the prompt ;; Copyright (C) 1996, 2001, 2002, 2003, 2004, 2005, ;; 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. ;; Author: Peter Breton <pbreton@cs.umb.edu> ;; Created: Sun Nov 17 1996 ;; Keywords: processes ;; This file is part of GNU Emacs. ;; GNU Emacs is free software: you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation, either version 3 of the License, or ;; (at your option) any later version. ;; GNU Emacs is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. ;; You should have received a copy of the GNU General Public License ;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. ;;; Commentary: ;; Shell directory tracking by watching the prompt. ;; ;; This is yet another attempt at a directory-tracking package for ;; Emacs shell-mode. However, this package makes one strong assumption: ;; that you can customize your shell's prompt to contain the ;; current working directory. Most shells do support this, including ;; almost every type of Bourne and C shell on Unix, the native shells on ;; Windows95 (COMMAND.COM) and Windows NT (CMD.EXE), and most 3rd party ;; Windows shells. If you cannot do this, or do not wish to, this package ;; will be useless to you. ;; ;; Installation: ;; ;; 1) Set your shell's prompt to contain the current working directory. ;; You may need to consult your shell's documentation to find out how to ;; do this. ;; ;; Note that directory tracking is done by matching regular expressions, ;; therefore it is *VERY IMPORTANT* for your prompt to be easily ;; distinguishable from other output. If your prompt regexp is too general, ;; you will see error messages from the dirtrack filter as it attempts to cd ;; to non-existent directories. ;; ;; 2) Set the variable `dirtrack-list' to an appropriate value. This ;; should be a list of two elements: the first is a regular expression ;; which matches your prompt up to and including the pathname part. ;; The second is a number which tells which regular expression group to ;; match to extract only the pathname. If you use a multi-line prompt, ;; add 't' as a third element. Note that some of the functions in ;; 'comint.el' assume a single-line prompt (eg, comint-bol). ;; ;; Determining this information may take some experimentation. Using ;; `dirtrack-debug-mode' may help; it causes the directory-tracking ;; filter to log messages to the buffer `dirtrack-debug-buffer'. ;; ;; 3) Activate `dirtrack-mode'. You may wish to turn ordinary shell ;; tracking off by calling `shell-dirtrack-mode'. ;; ;; Examples: ;; ;; 1) On Windows NT, my prompt is set to emacs$S$P$G. ;; 'dirtrack-list' is set to (list "^emacs \\([a-zA-Z]:.*\\)>" 1) ;; ;; 2) On Solaris running bash, my prompt is set like this: ;; PS1="\w\012emacs@\h(\!) [\t]% " ;; 'dirtrack-list' is set to (list "^\\([/~].*\\)\nemacs@[^%]+% *" 1 t) ;; ;; I'd appreciate other examples from people who use this package. ;; ;; Here's one from Stephen Eglen: ;; ;; Running under tcsh: ;; (setq-default dirtrack-list '("^%E \\([^ ]+\\)" 1)) ;; ;; It might be worth mentioning in your file that emacs sources start up ;; files of the form: ~/.emacs_<SHELL> where <SHELL> is the name of the ;; shell. So for example, I have the following in ~/.emacs_tcsh: ;; ;; set prompt = "%%E %~ %h% " ;; ;; This produces a prompt of the form: ;; %E /var/spool 10% ;; ;; This saves me from having to use the %E prefix in other non-emacs ;; shells. ;; ;; A final note: ;; ;; I run LOTS of shell buffers through Emacs, sometimes as different users ;; (eg, when logged in as myself, I'll run a root shell in the same Emacs). ;; If you do this, and the shell prompt contains a ~, Emacs will interpret ;; this relative to the user which owns the Emacs process, not the user ;; who owns the shell buffer. This may cause dirtrack to behave strangely ;; (typically it reports that it is unable to cd to a directory ;; with a ~ in it). ;; ;; The same behavior can occur if you use dirtrack with remote filesystems ;; (using telnet, rlogin, etc) as Emacs will be checking the local ;; filesystem, not the remote one. This problem is not specific to dirtrack, ;; but also affects file completion, etc. ;;; Code: (eval-when-compile (require 'comint) (require 'shell)) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Customization Variables ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (defgroup dirtrack nil "Directory tracking by watching the prompt." :prefix "dirtrack-" :group 'shell) (defcustom dirtrack-list (list "^emacs \\([a-zA-Z]:.*\\)>" 1) "List for directory tracking. First item is a regexp that describes where to find the path in a prompt. Second is a number, the regexp group to match. Optional third item is whether the prompt is multi-line. If nil or omitted, prompt is assumed to be on a single line." :group 'dirtrack :type '(sexp (regexp :tag "Prompt Expression") (integer :tag "Regexp Group") (boolean :tag "Multiline Prompt"))) (make-variable-buffer-local 'dirtrack-list) (defcustom dirtrack-debug nil "If non-nil, the function `dirtrack' will report debugging info." :group 'dirtrack :type 'boolean) (defcustom dirtrack-debug-buffer "*Directory Tracking Log*" "Buffer in which to write directory tracking debug information." :group 'dirtrack :type 'string) (defcustom dirtrack-directory-function (if (memq system-type (list 'ms-dos 'windows-nt 'cygwin)) 'dirtrack-windows-directory-function 'file-name-as-directory) "Function to apply to the prompt directory for comparison purposes." :group 'dirtrack :type 'function) (defcustom dirtrack-canonicalize-function (if (memq system-type (list 'ms-dos 'windows-nt 'cygwin)) 'downcase 'identity) "Function to apply to the default directory for comparison purposes." :group 'dirtrack :type 'function) (defcustom dirtrack-directory-change-hook nil "Hook that is called when a directory change is made." :group 'dirtrack :type 'hook) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;; Functions ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; (defun dirtrack-windows-directory-function (dir) "Return a canonical directory for comparison purposes. Such a directory is all lowercase, has forward-slashes as delimiters, and ends with a forward slash." (file-name-as-directory (downcase (subst-char-in-string ?\\ ?/ dir)))) (defun dirtrack-cygwin-directory-function (dir) "Return a canonical directory taken from a Cygwin path for comparison purposes." (if (string-match "/cygdrive/\\([A-Z]\\)\\(.*\\)" dir) (concat (match-string 1 dir) ":" (match-string 2 dir)) dir)) ;;;###autoload (define-minor-mode dirtrack-mode "Enable or disable Dirtrack directory tracking in a shell buffer. This method requires that your shell prompt contain the full current working directory at all times, and that `dirtrack-list' is set to match the prompt. This is an alternative to `shell-dirtrack-mode', which works differently, by tracking `cd' and similar commands which change the shell working directory." nil nil nil (if dirtrack-mode (add-hook 'comint-preoutput-filter-functions 'dirtrack nil t) (remove-hook 'comint-preoutput-filter-functions 'dirtrack t))) (define-obsolete-function-alias 'dirtrack-toggle 'dirtrack-mode "23.1") (define-obsolete-variable-alias 'dirtrackp 'dirtrack-mode "23.1") (define-minor-mode dirtrack-debug-mode "Enable or disable Dirtrack debugging." nil nil nil (if dirtrack-debug-mode (display-buffer (get-buffer-create dirtrack-debug-buffer)))) (define-obsolete-function-alias 'dirtrack-debug-toggle 'dirtrack-debug-mode "23.1") (define-obsolete-variable-alias 'dirtrack-debug 'dirtrack-debug-mode "23.1") (defun dirtrack-debug-message (string) "Insert string at the end of `dirtrack-debug-buffer'." (when dirtrack-debug-mode (with-current-buffer (get-buffer-create dirtrack-debug-buffer) (goto-char (point-max)) (insert (concat string "\n"))))) ;;;###autoload (defun dirtrack (input) "Determine the current directory by scanning the process output for a prompt. The prompt to look for is the first item in `dirtrack-list'. You can toggle directory tracking by using the function `dirtrack-mode'. If directory tracking does not seem to be working, you can use the function `dirtrack-debug-mode' to turn on debugging output." (unless (or (null dirtrack-mode) (eq (point) (point-min))) ; no output? (let (prompt-path (current-dir default-directory) (dirtrack-regexp (nth 0 dirtrack-list)) (match-num (nth 1 dirtrack-list)) ;; Currently unimplemented, it seems. --Stef (multi-line (nth 2 dirtrack-list))) (save-excursion ;; No match (if (not (string-match dirtrack-regexp input)) (dirtrack-debug-message (format "Input `%s' failed to match `dirtrack-list'" input)) (setq prompt-path (match-string match-num input)) ;; Empty string (if (not (> (length prompt-path) 0)) (dirtrack-debug-message "Match is empty string") ;; Transform prompts into canonical forms (setq prompt-path (funcall dirtrack-directory-function prompt-path) current-dir (funcall dirtrack-canonicalize-function current-dir)) (dirtrack-debug-message (format "Prompt is %s\nCurrent directory is %s" prompt-path current-dir)) ;; Compare them (if (or (string= current-dir prompt-path) (string= current-dir (abbreviate-file-name prompt-path))) (dirtrack-debug-message (format "Not changing directory")) ;; It's possible that Emacs will think the directory ;; won't exist (eg, rlogin buffers) (if (file-accessible-directory-p prompt-path) ;; Change directory (and (shell-process-cd prompt-path) (run-hooks 'dirtrack-directory-change-hook) (dirtrack-debug-message (format "Changing directory to %s" prompt-path))) (warn "Directory %s does not exist" prompt-path))) ))))) input) (provide 'dirtrack) ;; arch-tag: 168de071-be88-4937-aff6-2aba9f328d5a ;;; dirtrack.el ends here