branch: externals/phps-mode
commit 76d927663829ad30b466ae3cd08a7d4ed0a40e82
Author: Christian Johansson <christ...@cvj.se>
Commit: Christian Johansson <christ...@cvj.se>
Added support for emacs-26 error handling
---
phps-mode-lex-analyzer.el | 5 ++++-
phps-mode-serial.el | 6 ++++++
phps-mode.el | 4 ++--
3 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/phps-mode-lex-analyzer.el b/phps-mode-lex-analyzer.el
index 6248b4a..30ca9cf 100644
--- a/phps-mode-lex-analyzer.el
+++ b/phps-mode-lex-analyzer.el
@@ -2420,7 +2420,10 @@ SQUARE-BRACKET-LEVEL and ROUND-BRACKET-LEVEL."
(semantic-lex-buffer))))
(error (progn
(kill-buffer)
- (signal 'error (cdr conditions)))))
+ (signal 'error (cdr conditions))))
+ (t (progn
+ (kill-buffer)
+ (signal 'error (cdr conditions)))))
;; Copy variables outside of buffer
(setq state phps-mode-lexer--state)
diff --git a/phps-mode-serial.el b/phps-mode-serial.el
index b4f59a2..9f0dff8 100644
--- a/phps-mode-serial.el
+++ b/phps-mode-serial.el
@@ -92,6 +92,7 @@
(progn
(let ((start-return (funcall start)))
(list 'success start-return start-time)))
+ (error (list 'error (cdr conditions) start-time))
(t (list 'error (cdr conditions) start-time))))
(lambda (start-return)
(let ((status (car start-return))
@@ -117,6 +118,7 @@
(progn
(let ((return (funcall end value)))
(setq end-return (list 'success return
start-time))))
+ (error (setq end-return (list 'error (cdr
conditions) start-time)))
(t (setq end-return (list 'error (cdr
conditions) start-time))))
;; Profile execution in debug mode
@@ -159,6 +161,7 @@
(condition-case conditions
(let ((return (funcall start)))
(setq start-return (list 'success return start-time)))
+ (error (setq start-return (list 'error (cdr conditions)
start-time)))
(t (setq start-return (list 'error (cdr conditions)
start-time))))
;; Profile execution in debug mode
@@ -181,6 +184,7 @@
(condition-case conditions
(let ((return (funcall end value)))
(setq end-return (list 'success return
start-time)))
+ (error (setq end-return (list 'error (cdr
conditions) start-time)))
(t (setq end-return (list 'error (cdr conditions)
start-time))))
;; Profile execution
@@ -220,6 +224,7 @@
(progn
(let ((return (funcall start)))
(setq start-return (list 'success return start-time))))
+ (error (setq start-return (list 'error (cdr conditions) start-time)))
(t (setq start-return (list 'error (cdr conditions) start-time))))
;; Profile execution in debug mode
@@ -243,6 +248,7 @@
(condition-case conditions
(let ((return (funcall end value)))
(setq end-return (list 'success return start-time)))
+ (error (setq end-return (list 'error (cdr conditions)
start-time)))
(t (setq end-return (list 'error (cdr conditions)
start-time))))
;; Profile execution in debug mode
diff --git a/phps-mode.el b/phps-mode.el
index 6350c69..1fe68cc 100644
--- a/phps-mode.el
+++ b/phps-mode.el
@@ -5,8 +5,8 @@
;; Author: Christian Johansson <christ...@cvj.se>
;; Maintainer: Christian Johansson <christ...@cvj.se>
;; Created: 3 Mar 2018
-;; Modified: 8 May 2020
-;; Version: 0.3.46
+;; Modified: 11 May 2020
+;; Version: 0.3.47
;; Keywords: tools, convenience
;; URL: https://github.com/cjohansson/emacs-phps-mode
