From 175069efeb080517afefdd44a06f7a779ea8c25c Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 10 Dec 2010 15:00:25 -0500 Subject: 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. --- lisp/progmodes/gdb-mi.el | 48 +++++++++++------------------------------------- 1 file changed, 11 insertions(+), 37 deletions(-) (limited to 'lisp/progmodes/gdb-mi.el') diff --git a/lisp/progmodes/gdb-mi.el b/lisp/progmodes/gdb-mi.el index 3e80269d09c..f3f7e617376 100644 --- a/lisp/progmodes/gdb-mi.el +++ b/lisp/progmodes/gdb-mi.el @@ -1016,7 +1016,7 @@ With arg, enter name of variable to be watched in the minibuffer." 'gud-gdb-complete-command) (if (and transient-mark-mode mark-active) (buffer-substring (region-beginning) (region-end)) - (concat (if (eq major-mode 'gdb-registers-mode) "$") + (concat (if (derived-mode-p 'gdb-registers-mode) "$") (tooltip-identifier-from-point (point))))))) (set-text-properties 0 (length expr) nil expr) (gdb-input @@ -1483,14 +1483,9 @@ DOC is an optional documentation string." ;; We want to use comint because it has various nifty and familiar features. (define-derived-mode gdb-inferior-io-mode comint-mode "Inferior I/O" - "Major mode for gdb inferior-io. - -The following commands are available: -\\{gdb-inferior-io-mode-map}" - + "Major mode for gdb inferior-io." :syntax-table nil :abbrev-table nil - -(make-comint-in-buffer "gdb-inferior" (current-buffer) nil)) + (make-comint-in-buffer "gdb-inferior" (current-buffer) nil)) (defun gdb-inferior-filter (proc string) (unless (string-equal string "") @@ -2443,7 +2438,7 @@ If not in a source or disassembly buffer just set point." (mouse-minibuffer-check event) (let ((posn (event-end event))) (with-selected-window (posn-window posn) - (if (or (buffer-file-name) (eq major-mode 'gdb-disassembly-mode)) + (if (or (buffer-file-name) (derived-mode-p 'gdb-disassembly-mode)) (if (numberp (posn-point posn)) (save-excursion (goto-char (posn-point posn)) @@ -2627,15 +2622,12 @@ corresponding to the mode line clicked." nil nil mode-line))) (define-derived-mode gdb-threads-mode gdb-parent-mode "Threads" - "Major mode for GDB threads. - -\\{gdb-threads-mode-map}" + "Major mode for GDB threads." (setq gdb-thread-position (make-marker)) (add-to-list 'overlay-arrow-variable-list 'gdb-thread-position) (setq header-line-format gdb-threads-header) (set (make-local-variable 'font-lock-defaults) '(gdb-threads-font-lock-keywords)) - (run-mode-hooks 'gdb-threads-mode-hook) 'gdb-invalidate-threads) (defun gdb-thread-list-handler-custom () @@ -3161,13 +3153,10 @@ DOC is an optional documentation string." "Header line used in `gdb-memory-mode'.") (define-derived-mode gdb-memory-mode gdb-parent-mode "Memory" - "Major mode for examining memory. - -\\{gdb-memory-mode-map}" + "Major mode for examining memory." (setq header-line-format gdb-memory-header) (set (make-local-variable 'font-lock-defaults) '(gdb-memory-font-lock-keywords)) - (run-mode-hooks 'gdb-memory-mode-hook) 'gdb-invalidate-memory) (defun gdb-memory-buffer-name () @@ -3256,16 +3245,13 @@ DOC is an optional documentation string." map)) (define-derived-mode gdb-disassembly-mode gdb-parent-mode "Disassembly" - "Major mode for GDB disassembly information. - -\\{gdb-disassembly-mode-map}" + "Major mode for GDB disassembly information." ;; TODO Rename overlay variable for disassembly mode (add-to-list 'overlay-arrow-variable-list 'gdb-disassembly-position) (setq fringes-outside-margins t) (set (make-local-variable 'gdb-disassembly-position) (make-marker)) (set (make-local-variable 'font-lock-defaults) '(gdb-disassembly-font-lock-keywords)) - (run-mode-hooks 'gdb-disassembly-mode-hook) 'gdb-invalidate-disassembly) (defun gdb-disassembly-handler-custom () @@ -3323,11 +3309,8 @@ DOC is an optional documentation string." ;;; Breakpoints view (define-derived-mode gdb-breakpoints-mode gdb-parent-mode "Breakpoints" - "Major mode for gdb breakpoints. - -\\{gdb-breakpoints-mode-map}" + "Major mode for gdb breakpoints." (setq header-line-format gdb-breakpoints-header) - (run-mode-hooks 'gdb-breakpoints-mode-hook) 'gdb-invalidate-breakpoints) (defun gdb-toggle-breakpoint () @@ -3466,15 +3449,12 @@ member." "Font lock keywords used in `gdb-frames-mode'.") (define-derived-mode gdb-frames-mode gdb-parent-mode "Frames" - "Major mode for gdb call stack. - -\\{gdb-frames-mode-map}" + "Major mode for gdb call stack." (setq gdb-stack-position (make-marker)) (add-to-list 'overlay-arrow-variable-list 'gdb-stack-position) (setq truncate-lines t) ;; Make it easier to see overlay arrow. (set (make-local-variable 'font-lock-defaults) '(gdb-frames-font-lock-keywords)) - (run-mode-hooks 'gdb-frames-mode-hook) 'gdb-invalidate-frames) (defun gdb-select-frame (&optional event) @@ -3588,11 +3568,8 @@ member." map)) (define-derived-mode gdb-locals-mode gdb-parent-mode "Locals" - "Major mode for gdb locals. - -\\{gdb-locals-mode-map}" + "Major mode for gdb locals." (setq header-line-format gdb-locals-header) - (run-mode-hooks 'gdb-locals-mode-hook) 'gdb-invalidate-locals) (defun gdb-locals-buffer-name () @@ -3687,11 +3664,8 @@ member." nil nil mode-line))) (define-derived-mode gdb-registers-mode gdb-parent-mode "Registers" - "Major mode for gdb registers. - -\\{gdb-registers-mode-map}" + "Major mode for gdb registers." (setq header-line-format gdb-registers-header) - (run-mode-hooks 'gdb-registers-mode-hook) 'gdb-invalidate-registers) (defun gdb-registers-buffer-name () -- cgit v1.2.3