From e663e4d645238c6ecea55a9cf3cb9ae464efe2ce Mon Sep 17 00:00:00 2001 From: Jai Flack Date: Sun, 17 Sep 2023 14:08:07 +1000 Subject: [PATCH] Update for new emacs --- Makefile | 2 +- matlab-load.el | 158 ++++++++++++++++++++++++++++++++++++++----------- 2 files changed, 125 insertions(+), 35 deletions(-) diff --git a/Makefile b/Makefile index c235167..12dbacf 100644 --- a/Makefile +++ b/Makefile @@ -11,7 +11,7 @@ top="$(CURDIR)"/ ede_FILES=Project.ede Makefile EMACS=emacs -EMACSFLAGS=-batch --no-site-file --eval '(setq debug-on-error t)' +EMACSFLAGS=-batch --no-site-file --eval '(setq debug-on-error t)' --eval "(require 'autoload)" LOADPATH= ./ LOADDEFS=matlab-load.el LOADDIRS=. diff --git a/matlab-load.el b/matlab-load.el index 4f9e374..08a09dc 100644 --- a/matlab-load.el +++ b/matlab-load.el @@ -45,7 +45,7 @@ Bind the viss bookmark functions to F2 related keys. (autoload 'matlab-is-matlab-file "matlab" "\ Enter `matlab-mode' when file content looks like a MATLAB *.m file or for empty files *.m files when `matlab-mode-for-new-mfiles' -indicates as such." nil nil) +indicates as such.") (add-to-list 'magic-mode-alist '(matlab-is-matlab-file . matlab-mode)) @@ -72,27 +72,27 @@ Convenient template insertion commands: \\[matlab-stringify-region] - Convert plain text in region to a string with correctly quoted chars. Variables: - `matlab-indent-level' Level to indent blocks. + `matlab-indent-level' Level to indent blocks. `matlab-continuation-indent-level' Level to indent after ... continuation - `matlab-case-indent-level' Level to unindent case statements. + `matlab-case-indent-level' Level to unindent case statements. `matlab-indent-past-arg1-functions' Regexp of functions to indent past the first argument on continuation lines. `matlab-maximum-indents' List of maximum indents during lineups. `matlab-comment-column' Goal column for on-line comments. - `fill-column' Column used in auto-fill. + `fill-column' Column used in auto-fill. `matlab-indent-function-body' If non-nil, indents body of MATLAB functions. - `matlab-functions-have-end' If non-nil, MATLAB functions terminate with end. + `matlab-functions-have-end' If non-nil, MATLAB functions terminate with end. `matlab-fill-code' Non-nil, auto-fill code in auto-fill-mode. `matlab-fill-strings' Non-nil, auto-fill strings in auto-fill-mode. `matlab-verify-on-save-flag' Non-nil, enable code checks on save. - `matlab-vers-on-startup' If t, show version on start-up. + `matlab-vers-on-startup' If t, show version on start-up. `matlab-handle-simulink' If t, enable simulink keyword highlighting. All Key Bindings: \\{matlab-mode-map} -\(fn)" t nil) +\(fn)" t) (register-definition-prefixes "matlab" '("gud-matlab-debug-active" "matlab-" "ml-fl-anchor-limit")) @@ -220,13 +220,13 @@ Start the MATLAB netshell server." t nil) ;;; Generated autoloads from matlab-shell.el (autoload 'matlab-mode-determine-matlabroot "matlab-shell" "\ -Return the MATLABROOT for the 'matlab-shell-command'." nil nil) +Return the MATLABROOT for the 'matlab-shell-command'.") (autoload 'matlab-shell "matlab-shell" "\ Create a buffer with MATLAB running as a subprocess. MATLAB shell cannot work on the MS Windows platform because MATLAB is not -a console application." t nil) +a console application." t) (register-definition-prefixes "matlab-shell" '("gud-matlab-marker-regexp-prefix" "matlab-")) @@ -237,16 +237,17 @@ a console application." t nil) ;;; Generated autoloads from matlab-shell-gud.el (autoload 'matlab-shell-mode-gud-enable-bindings "matlab-shell-gud" "\ -Enable GUD features for `matlab-shell' in the current buffer." nil nil) +Enable GUD features for `matlab-shell' in the current buffer.") (autoload 'matlab-shell-gud-startup "matlab-shell-gud" "\ -Configure GUD when a new `matlab-shell' is initialized." nil nil) +Configure GUD when a new `matlab-shell' is initialized.") (autoload 'mlg-reset-breakpoints "matlab-shell-gud" "\ -Remove all cached breakpoints." nil nil) +Remove all cached breakpoints.") (autoload 'matlab-shell-gud-minor-mode "matlab-shell-gud" "\ Minor mode activated when `matlab-shell' K>> prompt is active. + This minor mode makes MATLAB buffers read only so simple keystrokes activate debug commands. It also enables tooltips to appear when the mouse hovers over a symbol when debugging. @@ -254,29 +255,33 @@ mouse hovers over a symbol when debugging. Debug commands are: \\[matlab-shell-gud-mode-edit] - Edit file (toggle read-only) Allows editing file without causing MATLAB to exit debug mode. - \\[gud-break] - Add breakpoint (ebstop in FILE at point) - \\[gud-remove] - Remove breakpoint (ebclear in FILE at point) - \\[gud-list-breakpoints] - List breakpoints (ebstatus) - \\[gud-step] - Step (dbstep in) - \\[gud-next] - Next (dbstep) - \\[gud-finish] - Finish function (dbstep out) - \\[gud-cont] - Continue (dbcont) + \\[mlgud-break] - Add breakpoint (ebstop in FILE at point) + \\[mlgud-remove] - Remove breakpoint (ebclear in FILE at point) + \\[mlgud-list-breakpoints] - List breakpoints (ebstatus) + \\[mlgud-step] - Step (dbstep in) + \\[mlgud-next] - Next (dbstep) + \\[mlgud-finish] - Finish function (dbstep out) + \\[mlgud-cont] - Continue (dbcont) \\[matlab-shell-gud-show-symbol-value] - Evaluate expression \\[mlg-show-stack] - Where am I (ebstack) - \\[gud-stop-subjob] - Quit (dbquit) + \\[mlgud-stop-subjob] - Quit (dbquit) -If called interactively, toggle `Matlab-Shell-Gud minor mode'. -If the prefix argument is positive, enable the mode, and if it is -zero or negative, disable the mode. +This is a minor mode. If called interactively, toggle the +`Matlab-Shell-Gud minor mode' mode. If the prefix argument is +positive, enable the mode, and if it is zero or negative, disable +the mode. If called from Lisp, toggle the mode if ARG is `toggle'. Enable the mode if ARG is nil, omitted, or is a positive number. Disable the mode if ARG is a negative number. +To check whether the minor mode is enabled in the current buffer, +evaluate `matlab-shell-gud-minor-mode'. + The mode's hook is called both when the mode is enabled and when it is disabled. -\(fn &optional ARG)" t nil) +\(fn &optional ARG)" t) (put 'global-matlab-shell-gud-minor-mode 'globalized-minor-mode t) @@ -293,8 +298,11 @@ or call the function `global-matlab-shell-gud-minor-mode'.") (autoload 'global-matlab-shell-gud-minor-mode "matlab-shell-gud" "\ Toggle Matlab-Shell-Gud minor mode in all buffers. With prefix ARG, enable Global Matlab-Shell-Gud minor mode if ARG is -positive; otherwise, disable it. If called from Lisp, enable the -mode if ARG is omitted or nil. +positive; otherwise, disable it. + +If called from Lisp, toggle the mode if ARG is `toggle'. +Enable the mode if ARG is nil, omitted, or is a positive number. +Disable the mode if ARG is a negative number. Matlab-Shell-Gud minor mode is enabled in all buffers where `(lambda nil Should we turn on in this buffer? Only if in a MATLAB mode. (when @@ -304,7 +312,64 @@ do it. See `matlab-shell-gud-minor-mode' for more information on Matlab-Shell-Gud minor mode. -\(fn &optional ARG)" t nil) +\(fn &optional ARG)" t) + +(autoload 'matlab-shell-inactive-gud-minor-mode "matlab-shell-gud" "\ +Minor mode activated when `matlab-shell' K>> prompt is inactive. + +\\ +Debug commands are: + \\[mlgud-break] - Add breakpoint (ebstop in FILE at point) + \\[mlgud-remove] - Remove breakpoint (ebclear in FILE at point) + \\[mlgud-list-breakpoints] - List breakpoints (ebstatus) + +This is a minor mode. If called interactively, toggle the +`Matlab-Shell-Inactive-Gud minor mode' mode. If the prefix +argument is positive, enable the mode, and if it is zero or +negative, disable the mode. + +If called from Lisp, toggle the mode if ARG is `toggle'. Enable +the mode if ARG is nil, omitted, or is a positive number. +Disable the mode if ARG is a negative number. + +To check whether the minor mode is enabled in the current buffer, +evaluate `matlab-shell-inactive-gud-minor-mode'. + +The mode's hook is called both when the mode is enabled and when +it is disabled. + +\(fn &optional ARG)" t) + +(put 'global-matlab-shell-inactive-gud-minor-mode 'globalized-minor-mode t) + +(defvar global-matlab-shell-inactive-gud-minor-mode nil "\ +Non-nil if Global Matlab-Shell-Inactive-Gud minor mode is enabled. +See the `global-matlab-shell-inactive-gud-minor-mode' command +for a description of this minor mode. +Setting this variable directly does not take effect; +either customize it (see the info node `Easy Customization') +or call the function `global-matlab-shell-inactive-gud-minor-mode'.") + +(custom-autoload 'global-matlab-shell-inactive-gud-minor-mode "matlab-shell-gud" nil) + +(autoload 'global-matlab-shell-inactive-gud-minor-mode "matlab-shell-gud" "\ +Toggle Matlab-Shell-Inactive-Gud minor mode in all buffers. +With prefix ARG, enable Global Matlab-Shell-Inactive-Gud minor mode if +ARG is positive; otherwise, disable it. + +If called from Lisp, toggle the mode if ARG is `toggle'. +Enable the mode if ARG is nil, omitted, or is a positive number. +Disable the mode if ARG is a negative number. + +Matlab-Shell-Inactive-Gud minor mode is enabled in all buffers where +`(lambda nil Should we turn on in this buffer? Only if in a MATLAB +mode. (when (eq major-mode 'matlab-mode) +\(matlab-shell-inactive-gud-minor-mode 1)))' would do it. + +See `matlab-shell-inactive-gud-minor-mode' for more information on +Matlab-Shell-Inactive-Gud minor mode. + +\(fn &optional ARG)" t) (register-definition-prefixes "matlab-shell-gud" '("gud-matlab-" "matlab-" "mlg-")) @@ -327,10 +392,35 @@ Entry to this mode runs the normal hook `matlab-shell-help-mode-hook'. Commands: \\{matlab-shell-help-mode-map} -\(fn)" t nil) +\(fn)" t) (register-definition-prefixes "matlab-topic" '("matlab-shell-")) +;;;*** + +;;;### (autoloads nil "mlgud" "mlgud.el" (0 0 0 0)) +;;; Generated autoloads from mlgud.el + +(defvar mlgud-tooltip-mode nil "\ +Non-nil if Mlgud-Tooltip mode is enabled. +See the `mlgud-tooltip-mode' command +for a description of this minor mode. +Setting this variable directly does not take effect; +either customize it (see the info node `Easy Customization') +or call the function `mlgud-tooltip-mode'.") + +(custom-autoload 'mlgud-tooltip-mode "mlgud" nil) + +(autoload 'mlgud-tooltip-mode "mlgud" "\ +Toggle the display of MLGUD tooltips. +With a prefix argument ARG, enable the feature if ARG is +positive, and disable it otherwise. If called from Lisp, enable +it if ARG is omitted or nil. + +\(fn &optional ARG)" t) + +(register-definition-prefixes "mlgud" '("mlgud-")) + ;;;*** ;;;### (autoloads nil "mlint" "mlint.el" (0 0 0 0)) @@ -341,7 +431,7 @@ Toggle mlint minor mode, a mode for showing mlint errors. With prefix ARG, turn mlint minor mode on iff ARG is positive. \\{mlint-minor-mode-map\\} -\(fn &optional ARG)" t nil) +\(fn &optional ARG)" t) (register-definition-prefixes "mlint" '("mlint-")) @@ -352,9 +442,9 @@ With prefix ARG, turn mlint minor mode on iff ARG is positive. ;;; Generated autoloads from semantic-matlab.el (autoload 'semantic-default-matlab-setup "semantic-matlab" "\ -Set up a buffer for parsing of MATLAB files." nil nil) +Set up a buffer for parsing of MATLAB files.") -(register-definition-prefixes "semantic-matlab" '("matlab-" "semantic-")) +(register-definition-prefixes "semantic-matlab" '("matlab-semantic-" "semantic-")) ;;;*** @@ -362,7 +452,7 @@ Set up a buffer for parsing of MATLAB files." nil nil) ;;;;;; (0 0 0 0)) ;;; Generated autoloads from semanticdb-matlab.el -(register-definition-prefixes "semanticdb-matlab" '("matlab-mode" "semantic")) +(register-definition-prefixes "semanticdb-matlab" '("semantic")) ;;;*** @@ -382,7 +472,7 @@ FILE_FUNCTION - Show setion if filename is a function. On class prediction - when filling in an empty file, if the filename and directory it is in match, for example @foo/foo.m then foo should be a classdef. -\(fn DICT)" nil nil) +\(fn DICT)") ;;;*** @@ -392,7 +482,7 @@ directory it is in match, for example @foo/foo.m then foo should be a classdef. (autoload 'tlc-mode "tlc" "\ -\(fn)" t nil) +\(fn)" t) (add-to-list 'auto-mode-alist '("\\.tlc\\'" . tlc-mode))