Mercurial > emacs
diff lisp/progmodes/idlw-shell.el @ 111870:b47e85affa59
Derive from prog-mode, use derived-mode-p, and fix up various
minor style issues in lisp/progmodes.
* lisp/progmodes/vhdl-mode.el (vhdl-write-file-hooks-init)
(vhdl-hs-minor-mode, vhdl-ps-print-init): Fix make-local-variable ->
make-local-hook.
* lisp/progmodes/sh-script.el (sh-require-final-newline): Remove.
(sh-set-shell): Don't set require-final-newline since it's already done
by prog-mode.
* lisp/progmodes/modula2.el (m2-mode): Don't make m2-end-comment-column
since we never set it.
* lisp/progmodes/ebrowse.el (ebrowse-set-tree-indentation):
Use read-string and standard prompt.
* lisp/progmodes/dcl-mode.el (dcl-mode-map): Move init into declaration.
* lisp/progmodes/meta-mode.el (meta-mode-abbrev-table): Merge init and decl.
(meta-common-mode-syntax-table): Rename from meta-mode-syntax-table.
(meta-common-mode-map): Rename from meta-mode-map.
Remove C-m binding, which is a user preference, not mode specific.
(meta-common-mode): New major mode; replace meta-common-initialization.
* lisp/progmodes/js.el (js-mode): Call syntax-propertize rather than messing
around with font-lock.
* lisp/progmodes/etags.el (select-tags-table-mode):
Derive from special-mode.
* lisp/progmodes/octave-mod.el (octave-mode):
* lisp/progmodes/gdb-mi.el (gdb-inferior-io-mode, gdb-threads-mode)
(gdb-memory-mode, gdb-disassembly-mode, gdb-breakpoints-mode)
(gdb-frames-mode, gdb-locals-mode, gdb-registers-mode):
Let define-derived-mode do its job.
* lisp/progmodes/cpp.el (cpp-edit-mode-map):
Move initialization into declaration.
(cpp-edit-mode): Use define-derived-mode.
(cpp-edit-load): Use derived-mode-p.
* lisp/progmodes/mixal-mode.el (mixal-mode):
* lisp/progmodes/f90.el (f90-mode):
* lisp/progmodes/cfengine.el (cfengine-mode): Don't bother setting
require-final-newline since prog-mode does it already.
* lisp/progmodes/cc-cmds.el (c-update-modeline): Use match-string.
* lisp/progmodes/asm-mode.el (asm-mode-map): Fix menu setup.
* lisp/progmodes/antlr-mode.el: Require cc-mode upfront.
(antlr-mode-syntax-table, antlr-action-syntax-table): Initialize in
the declaration.
(antlr-directory-dependencies, antlr-show-makefile-rules):
Use derived-mode-p.
(antlr-language-option): Don't assume point-min==1.
(antlr-mode): Use define-derived-mode.
* lisp/progmodes/ada-mode.el: Use derived-mode-p.
(ada-mode): Use define-derived-mode.
Use hack-local-variables-hook.
* lisp/progmodes/vhdl-mode.el (vhdl-mode):
* lisp/progmodes/verilog-mode.el (verilog-mode):
* lisp/progmodes/vera-mode.el (vera-mode):
* lisp/progmodes/sql.el (sql-mode):
* lisp/progmodes/scheme.el (scheme-mode):
* lisp/progmodes/perl-mode.el (perl-mode):
* lisp/progmodes/octave-inf.el (inferior-octave-mode):
* lisp/progmodes/autoconf.el (autoconf-mode):
* lisp/progmodes/m4-mode.el (m4-mode):
* lisp/progmodes/inf-lisp.el (inferior-lisp-mode):
* lisp/progmodes/idlwave.el (idlwave-mode):
* lisp/progmodes/icon.el (icon-mode):
* lisp/progmodes/idlw-help.el (idlwave-help-mode):
* lisp/progmodes/dcl-mode.el (dcl-mode):
* lisp/progmodes/idlw-shell.el (idlwave-shell-mode):
* lisp/progmodes/ebrowse.el (ebrowse-tree-mode, ebrowse-electric-list-mode)
(ebrowse-member-mode, ebrowse-electric-position-mode):
Use define-derived-mode.
* lisp/progmodes/xscheme.el (xscheme-start)
(local-set-scheme-interaction-buffer, scheme-interaction-mode):
* lisp/progmodes/which-func.el (which-function):
* lisp/progmodes/vhdl-mode.el (vhdl-set-style):
* lisp/progmodes/verilog-mode.el (verilog-set-compile-command)
(verilog-modify-compile-command, verilog-error-regexp-add-xemacs)
(verilog-set-define, verilog-auto-reeval-locals):
* lisp/progmodes/sql.el (sql-product-font-lock, sql-interactive-mode):
* lisp/progmodes/simula.el (simula-mode):
* lisp/progmodes/scheme.el (scheme-mode-variables, dsssl-mode):
* lisp/progmodes/python.el (python-check, python-mode):
* lisp/progmodes/prolog.el (prolog-mode-variables):
* lisp/progmodes/gud.el (gud-tooltip-activate-mouse-motions):
* lisp/progmodes/ebrowse.el (ebrowse-view-file-other-frame):
* lisp/progmodes/delphi.el (delphi-mode):
* lisp/progmodes/cc-styles.el (c-setup-paragraph-variables):
* lisp/progmodes/cc-mode.el (c-basic-common-init, c-common-init)
(c-font-lock-init): Move make-local-variable to their setq.
* lisp/progmodes/xscheme.el (exit-scheme-interaction-mode)
(xscheme-enter-interaction-mode, xscheme-enter-debugger-mode)
(xscheme-debugger-mode-p, xscheme-send-string-1):
* lisp/progmodes/tcl.el (inferior-tcl-proc, tcl-current-word)
(tcl-load-file, tcl-restart-with-file):
* lisp/progmodes/ps-mode.el (ps-run-running):
* lisp/progmodes/gdb-mi.el (gud-watch, gdb-mouse-set-clear-breakpoint):
* lisp/progmodes/js.el (js--get-all-known-symbols):
* lisp/progmodes/inf-lisp.el (inferior-lisp-proc):
* lisp/progmodes/idlwave.el (idlwave-beginning-of-statement)
(idlwave-template, idlwave-update-buffer-routine-info)
(idlwave-update-current-buffer-info)
(idlwave-get-routine-info-from-buffers, idlwave-choose)
(idlwave-scan-class-info, idlwave-fix-keywords)
(idlwave-list-buffer-load-path-shadows):
* lisp/progmodes/idlw-toolbar.el (idlwave-toolbar, idlwave-toolbar-add)
(idlwave-toolbar-remove):
* lisp/progmodes/idlw-shell.el (idlwave-shell-save-and-action)
(idlwave-shell-file-name, idlwave-shell-electric-debug-all-off)
(idlwave-shell-menu-def):
* lisp/progmodes/idlw-complete-structtag.el
(idlwave-prepare-structure-tag-completion):
* lisp/progmodes/gud.el (gud-set-buffer):
* lisp/progmodes/f90.el (f90-backslash-not-special):
* lisp/progmodes/delphi.el (delphi-find-unit): Use derived-mode-p.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Fri, 10 Dec 2010 15:00:25 -0500 |
parents | 046351ea9819 |
children | 417b1e4d63cd |
line wrap: on
line diff
--- a/lisp/progmodes/idlw-shell.el Fri Dec 10 18:29:54 2010 +0100 +++ b/lisp/progmodes/idlw-shell.el Fri Dec 10 15:00:25 2010 -0500 @@ -866,7 +866,7 @@ (defvar idlwave-shell-only-prompt-pattern nil) (defvar tool-bar-map) -(defun idlwave-shell-mode () +(define-derived-mode idlwave-shell-mode comint-mode "IDL-Shell" "Major mode for interacting with an inferior IDL process. 1. Shell Interaction @@ -947,28 +947,23 @@ 8. Keybindings ----------- \\{idlwave-shell-mode-map}" - - (interactive) + :abbrev-table idlwave-mode-abbrev-table (idlwave-setup) ; Make sure config files and paths, etc. are available. (unless (file-name-absolute-p idlwave-shell-command-history-file) (setq idlwave-shell-command-history-file (expand-file-name idlwave-shell-command-history-file idlwave-config-directory))) - ;; We don't do `kill-all-local-variables' here, because this is done by - ;; comint (setq comint-prompt-regexp idlwave-shell-prompt-pattern) (setq comint-process-echoes t) ;; Can not use history expansion because "!" is used for system variables. (setq comint-input-autoexpand nil) -; (setq comint-input-ring-size 64) - (make-local-variable 'comint-completion-addsuffix) + ;; (setq comint-input-ring-size 64) + (set (make-local-variable 'completion-ignore-case) t) - (setq comint-completion-addsuffix '("/" . "")) + (set (make-local-variable 'comint-completion-addsuffix) '("/" . "")) (setq comint-input-ignoredups t) - (setq major-mode 'idlwave-shell-mode) - (setq mode-name "IDL-Shell") (setq idlwave-shell-mode-line-info nil) (setq mode-line-format '("" @@ -1023,7 +1018,6 @@ nil 'local) (add-hook 'kill-buffer-hook 'idlwave-shell-delete-temp-files nil 'local) (add-hook 'kill-emacs-hook 'idlwave-shell-delete-temp-files) - (use-local-map idlwave-shell-mode-map) (easy-menu-add idlwave-shell-mode-menu idlwave-shell-mode-map) ;; Set the optional comint variables @@ -1054,10 +1048,7 @@ ;; with overlay-arrows. (remove-hook 'comint-output-filter-functions 'py-pdbtrack-track-stack-file) - ;; IDLWAVE syntax, and turn on abbreviations - (setq local-abbrev-table idlwave-mode-abbrev-table) - (set-syntax-table idlwave-mode-syntax-table) (set (make-local-variable 'comment-start) ";") (setq abbrev-mode t) @@ -1076,8 +1067,6 @@ ;; Turn off the non-debug toolbar buttons (open,save,etc.) (set (make-local-variable 'tool-bar-map) nil) - ;; Run the hooks. - (run-mode-hooks 'idlwave-shell-mode-hook) (idlwave-shell-send-command idlwave-shell-initial-commands nil 'hide) ;; Turn off IDL's ^d interpreting, and define a system ;; variable which knows the version of IDLWAVE @@ -3895,7 +3884,7 @@ (setq overlay-arrow-string nil) (let (buf) (cond - ((eq major-mode 'idlwave-mode) + ((derived-mode-p 'idlwave-mode) (save-buffer) (setq idlwave-shell-last-save-and-action-file (buffer-file-name))) (idlwave-shell-last-save-and-action-file @@ -4083,7 +4072,7 @@ (defun idlwave-shell-file-name (name) "If `idlwave-shell-use-truename' is non-nil, convert file name to true name. Otherwise, just expand the file name." - (let ((def-dir (if (eq major-mode 'idlwave-shell-mode) + (let ((def-dir (if (derived-mode-p 'idlwave-shell-mode) default-directory idlwave-shell-default-directory))) (if idlwave-shell-use-truename @@ -4346,7 +4335,7 @@ (while (setq buf (pop buffers)) (when (buffer-live-p buf) (set-buffer buf) - (when (and (eq major-mode 'idlwave-mode) + (when (and (derived-mode-p 'idlwave-mode) buffer-file-name idlwave-shell-electric-debug-mode) (idlwave-shell-electric-debug-mode 0)))))) @@ -4371,51 +4360,51 @@ ["Electric Debug Mode" idlwave-shell-electric-debug-mode :style toggle :selected idlwave-shell-electric-debug-mode - :included (eq major-mode 'idlwave-mode) :keys "C-c C-d C-v"] + :included (derived-mode-p 'idlwave-mode) :keys "C-c C-d C-v"] "--" ("Compile & Run" ["Save and .RUN" idlwave-shell-save-and-run - (or (eq major-mode 'idlwave-mode) + (or (derived-mode-p 'idlwave-mode) idlwave-shell-last-save-and-action-file)] ["Save and .COMPILE" idlwave-shell-save-and-compile - (or (eq major-mode 'idlwave-mode) + (or (derived-mode-p 'idlwave-mode) idlwave-shell-last-save-and-action-file)] ["Save and @Batch" idlwave-shell-save-and-batch - (or (eq major-mode 'idlwave-mode) + (or (derived-mode-p 'idlwave-mode) idlwave-shell-last-save-and-action-file)] "--" ["Goto Next Error" idlwave-shell-goto-next-error t] "--" ["Compile and Run Region" idlwave-shell-run-region - (eq major-mode 'idlwave-mode)] + (derived-mode-p 'idlwave-mode)] ["Evaluate Region" idlwave-shell-evaluate-region - (eq major-mode 'idlwave-mode)] + (derived-mode-p 'idlwave-mode)] "--" ["Execute Default Cmd" idlwave-shell-execute-default-command-line t] ["Edit Default Cmd" idlwave-shell-edit-default-command-line t]) ("Breakpoints" ["Set Breakpoint" idlwave-shell-break-here - :keys "C-c C-d C-b" :active (eq major-mode 'idlwave-mode)] + :keys "C-c C-d C-b" :active (derived-mode-p 'idlwave-mode)] ("Set Special Breakpoint" ["Set After Count Breakpoint" (progn (let ((count (string-to-number (read-string "Break after count: ")))) (if (integerp count) (idlwave-shell-break-here count)))) - :active (eq major-mode 'idlwave-mode)] + :active (derived-mode-p 'idlwave-mode)] ["Set Condition Breakpoint" (idlwave-shell-break-here '(4)) - :active (eq major-mode 'idlwave-mode)]) + :active (derived-mode-p 'idlwave-mode)]) ["Break in Module" idlwave-shell-break-in - :keys "C-c C-d C-i" :active (eq major-mode 'idlwave-mode)] + :keys "C-c C-d C-i" :active (derived-mode-p 'idlwave-mode)] ["Break in this Module" idlwave-shell-break-this-module - :keys "C-c C-d C-j" :active (eq major-mode 'idlwave-mode)] + :keys "C-c C-d C-j" :active (derived-mode-p 'idlwave-mode)] ["Clear Breakpoint" idlwave-shell-clear-current-bp t] ["Clear All Breakpoints" idlwave-shell-clear-all-bp t] ["Disable/Enable Breakpoint" idlwave-shell-toggle-enable-current-bp t] ["Goto Previous Breakpoint" idlwave-shell-goto-previous-bp - :keys "C-c C-d [" :active (eq major-mode 'idlwave-mode)] + :keys "C-c C-d [" :active (derived-mode-p 'idlwave-mode)] ["Goto Next Breakpoint" idlwave-shell-goto-next-bp - :keys "C-c C-d ]" :active (eq major-mode 'idlwave-mode)] + :keys "C-c C-d ]" :active (derived-mode-p 'idlwave-mode)] ["List All Breakpoints" idlwave-shell-list-all-bp t] ["Resync Breakpoints" idlwave-shell-bp-query t]) ("Continue/Step" @@ -4427,7 +4416,7 @@ ["... to End of Subprog" idlwave-shell-return t] ["... to End of Subprog+1" idlwave-shell-out t] ["... to Here (Cursor Line)" idlwave-shell-to-here - :keys "C-c C-d C-h" :active (eq major-mode 'idlwave-mode)]) + :keys "C-c C-d C-h" :active (derived-mode-p 'idlwave-mode)]) ("Examine Expressions" ["Print expression" idlwave-shell-print t] ["Help on expression" idlwave-shell-help-expression t] @@ -4512,7 +4501,7 @@ (save-current-buffer (dolist (buf (buffer-list)) (set-buffer buf) - (if (eq major-mode 'idlwave-mode) + (if (derived-mode-p 'idlwave-mode) (progn (easy-menu-remove idlwave-mode-debug-menu) (easy-menu-add idlwave-mode-debug-menu)))))))