Hello All,
I made a couple merge requests but Uwe told me that there are apparently
issues merging on sourceforge atm. Here are the links to the two merge
requests, just for reference:
+ https://sourceforge.net/p/matlab-emacs/src/merge-requests/3/
+ https://sourceforge.net/p/matlab-emacs/src/merge-requests/4/
The first one was a fix for the fact that emacs 29.1 has removed
font-lock-reference-face and we are to use font-lock-constant-face instead.
The second is a small fix I had to do to let me work with matlab-shell
over a TRAMP session. The issue was that it was initially calling
emacsinit.m addressed to the local machine, which matlab of course can't
find. I just changed "/home/<user-login-name>/" to "~/" in the command
and it reads the right emacsinit file. This still requires that
matlab-mode and emacs be installed in the exact same location on the
remote machine as on the local machine. It's not ideal, but it serves my
purposes for now.
I'm sending a single patch file for both the merge requests here.
Best,
Nidish
--
Dr. Nidish Narayanaa Balaji
Humboldt Postdoctoral Fellow
Institute of Aircraft Propulsion Systems
Department of Aerospace Engineering and Geodesy
University of Stuttgart
Pfaffenwaldring 6
D-70569 Stuttgart
Tel.: +49 711 685 69433
e-mail: nidish.bal...@ila.uni-stuttgart.de
diff --git a/matlab-shell.el b/matlab-shell.el
index ee80555..07c6223 100644
--- a/matlab-shell.el
+++ b/matlab-shell.el
@@ -1003,7 +1003,7 @@ Sends commands to the MATLAB shell to initialize the MATLAB process."
(ecca (if ecc (format "emacs.set('clientcmd', '%s');" ecc) ""))
(args (list nsa ecca))
(cmd (format "run('%s');%s" initcmd (apply 'concat args))))
- (matlab-shell-send-command cmd)
+ (matlab-shell-send-command (string-replace (expand-file-name "~/") "~/" cmd))
)
;; Setup is misconfigured - we need emacsinit because it tells us how to debug
diff --git a/matlab-topic.el b/matlab-topic.el
index 18ac917..db2ac13 100644
--- a/matlab-topic.el
+++ b/matlab-topic.el
@@ -29,12 +29,12 @@
(defvar matlab-shell-topic-mouse-face-keywords
'(;; These are subtopic fields...
- ("^\\(\\w+/\\w+\\)[ \t]+-" 1 font-lock-reference-face)
+ ("^\\(\\w+/\\w+\\)[ \t]+-" 1 font-lock-constant-face)
;; These are functions...
("^[ \t]+\\(\\w+\\)[ \t]+-" 1 font-lock-function-name-face)
;; Here is a See Also line...
("[ \t]+See also "
- ("\\(\\w+\\)\\([,.]\\| and\\|$\\) *" nil nil (1 font-lock-reference-face))))
+ ("\\(\\w+\\)\\([,.]\\| and\\|$\\) *" nil nil (1 font-lock-constant-face))))
"These are keywords we also want to put mouse-faces on.")
(defvar matlab-shell-topic-font-lock-keywords
@@ -59,7 +59,7 @@
(1 font-lock-variable-name-face))
)
;; Reference uppercase words
- ("\\<\\([A-Z]+[0-9]*\\)\\>" 1 font-lock-reference-face)))
+ ("\\<\\([A-Z]+[0-9]*\\)\\>" 1 font-lock-constant-face)))
"Keywords for regular help buffers.")
;; View-major-mode is an emacs20 thing. This gives us a small compatibility
diff --git a/matlab.el b/matlab.el
index 0bf3106..8ca0ee2 100644
--- a/matlab.el
+++ b/matlab.el
@@ -1019,7 +1019,7 @@ This matcher will handle a range of variable features."
(matlab-font-lock-regexp-opt matlab-constants-keyword-list)
1 'matlab-math-face)
;; Imaginary number support
- '("\\<[0-9]\\.?\\(i\\|j\\)\\_>" 1 font-lock-reference-face)
+ '("\\<[0-9]\\.?\\(i\\|j\\)\\_>" 1 font-lock-constant-face)
)
"Basic Expressions to highlight in MATLAB mode or shell.")
@@ -1100,10 +1100,10 @@ This matcher will handle a range of variable features."
\\(\\([^\n,;%(]+\\|([^\n%)]+)\\)+\\)"
(1 font-lock-keyword-face)
(2 font-lock-variable-name-face append)
- (3 font-lock-reference-face append))
+ (3 font-lock-constant-face append))
;; Items after a switch statements are cool
'("\\_<\\(case\\|switch\\)\\_>\\s-+\\({[^}\n]+}\\|[^,%\n]+\\)"
- (2 font-lock-reference-face))
+ (2 font-lock-constant-face))
;; set_param and waitfor have input variables that can be highlighted.
(list (concat matlab-indent-past-arg1-functions "\\s-*")
'("(\\s-*\\(\\(?:\\w\\|\\.\\)+\\)\\s-*\\(,\\|)\\)" nil nil
@@ -1168,14 +1168,14 @@ This matcher will handle a range of variable features."
(list (concat "^" matlab-comment-line-s "\\s-*"
"\\(\\([A-Z]+\\s-*=\\s-+\\|\\[[^]]+]\\s-*=\\s-+\\|\\)"
"\\([A-Z][0-9A-Z]+\\)\\(([^)\n]+)\\| \\)\\)")
- '(1 font-lock-reference-face prepend))
+ '(1 font-lock-constant-face prepend))
(list (concat "^" matlab-comment-line-s "\\s-*"
"See also\\s-+")
'("\\([A-Z][A-Z0-9]+\\)\\([,.]\\| and\\|$\\) *" nil nil
- (1 font-lock-reference-face prepend)))
+ (1 font-lock-constant-face prepend)))
(list (concat "^" matlab-comment-line-s "\\s-*"
"\\(\\$" "Revision" "[^\n$]+\\$\\)")
- '(1 font-lock-reference-face prepend))
+ '(1 font-lock-constant-face prepend))
;; Debugging Keywords
(list (matlab-font-lock-regexp-opt matlab-debug-list)
'(0 'bold))
diff --git a/tlc.el b/tlc.el
index 7abe566..c1c756c 100644
--- a/tlc.el
+++ b/tlc.el
@@ -218,7 +218,7 @@
;; %exit, %warning, %error, %trace keywords
'("%\\(exit\\|warning\\|error\\|trace\\) \\([^\n]+\\)$" 2 font-lock-string-face prepend)
;; %<var> expansions
- '("\\(%<[^%\n>]+>\\)" 1 font-lock-reference-face prepend)
+ '("\\(%<[^%\n>]+>\\)" 1 font-lock-constant-face prepend)
;; Built-in functions, e.g. EXISTS
(list (concat "\\<\\(" (regexp-opt tlc-keywords) "\\)\\>")
1 'font-lock-type-face)
_______________________________________________
Matlab-emacs-discuss mailing list
Matlab-emacs-discuss@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matlab-emacs-discuss
