[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r114517: * progmodes/octave.el (inferior-octave-erro
From: |
Leo Liu |
Subject: |
[Emacs-diffs] trunk r114517: * progmodes/octave.el (inferior-octave-error-regexp-alist) |
Date: |
Fri, 04 Oct 2013 09:50:10 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 114517
revision-id: address@hidden
parent: address@hidden
committer: Leo Liu <address@hidden>
branch nick: trunk
timestamp: Fri 2013-10-04 17:45:25 +0800
message:
* progmodes/octave.el (inferior-octave-error-regexp-alist)
(inferior-octave-compilation-font-lock-keywords): New variables.
(compilation-error-regexp-alist)
(compilation-mode-font-lock-keywords): Defvar to pacify compiler.
(inferior-octave-mode): Use compilation-shell-minor-mode.
modified:
lisp/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1432
lisp/progmodes/octave.el
octavemod.el-20091113204419-o5vbwnq5f7feedwu-1028
=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog 2013-10-04 02:12:16 +0000
+++ b/lisp/ChangeLog 2013-10-04 09:45:25 +0000
@@ -1,3 +1,11 @@
+2013-10-04 Leo Liu <address@hidden>
+
+ * progmodes/octave.el (inferior-octave-error-regexp-alist)
+ (inferior-octave-compilation-font-lock-keywords): New variables.
+ (compilation-error-regexp-alist)
+ (compilation-mode-font-lock-keywords): Defvar to pacify compiler.
+ (inferior-octave-mode): Use compilation-shell-minor-mode.
+
2013-10-04 Jorgen Schaefer <address@hidden>
* minibuffer.el (completion--replace): Be careful that `end' might be
=== modified file 'lisp/progmodes/octave.el'
--- a/lisp/progmodes/octave.el 2013-09-30 01:13:19 +0000
+++ b/lisp/progmodes/octave.el 2013-10-04 09:45:25 +0000
@@ -631,6 +631,24 @@
:type 'hook
:group 'octave)
+(defcustom inferior-octave-error-regexp-alist
+ '(("error:\\s-*\\(.*?\\) at line \\([0-9]+\\), column \\([0-9]+\\)"
+ 1 2 3 2 1)
+ ("warning:\\s-*\\([^:\n]+\\):.*at line \\([0-9]+\\), column \\([0-9]+\\)"
+ 1 2 3 1 1))
+ "Value for `compilation-error-regexp-alist' in inferior octave."
+ :type '(repeat (choice (symbol :tag "Predefined symbol")
+ (sexp :tag "Error specification")))
+ :group 'octave)
+
+(defvar inferior-octave-compilation-font-lock-keywords
+ '(("\\_<PASS\\_>" . compilation-info-face)
+ ("\\_<FAIL\\_>" . compilation-error-face)
+ ("\\_<\\(warning\\):" 1 compilation-warning-face)
+ ("\\_<\\(error\\):" 1 compilation-error-face)
+ ("^\\s-*!!!!!.*\\|^.*failed$" . compilation-error-face))
+ "Value for `compilation-mode-font-lock-keywords' in inferior octave.")
+
(defvar inferior-octave-process nil)
(defvar inferior-octave-mode-map
@@ -673,6 +691,8 @@
in the Inferior Octave buffer.")
(defvar info-lookup-mode)
+(defvar compilation-error-regexp-alist)
+(defvar compilation-mode-font-lock-keywords)
(define-derived-mode inferior-octave-mode comint-mode "Inferior Octave"
"Major mode for interacting with an inferior Octave process."
@@ -698,10 +718,14 @@
(setq-local comint-prompt-read-only inferior-octave-prompt-read-only)
(add-hook 'comint-input-filter-functions
'inferior-octave-directory-tracker nil t)
+ (comint-read-input-ring t)
;; http://thread.gmane.org/gmane.comp.gnu.octave.general/48572
(add-hook 'window-configuration-change-hook
'inferior-octave-track-window-width-change nil t)
- (comint-read-input-ring t))
+ (setq-local compilation-error-regexp-alist
inferior-octave-error-regexp-alist)
+ (setq-local compilation-mode-font-lock-keywords
+ inferior-octave-compilation-font-lock-keywords)
+ (compilation-shell-minor-mode 1))
;;;###autoload
(defun inferior-octave (&optional arg)
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r114517: * progmodes/octave.el (inferior-octave-error-regexp-alist),
Leo Liu <=