Merge commit '8d8c459d7757cf5774f11be9147d7a54f5f9bbd7'

[gnu-emacs-elpa] / packages / ada-mode / ada-wisi-opentoken.el

diff --git a/packages/ada-mode/ada-wisi-opentoken.el b/packages/ada-mode/ada-wisi-opentoken.el
old mode 100755 (executable)
new mode 100644 (file)
index 651dbce..cd86981
--- a/packages/ada-mode/ada-wisi-opentoken.el
+++ b/packages/ada-mode/ada-wisi-opentoken.el
@@ -1,7 +1,7 @@
-;;; ada-wisi-opentoken.el --- An indentation function for ada-wisi that indents OpenToken
+;;; ada-wisi-opentoken.el --- An indentation function for ada-wisi that indents OpenToken  -*- lexical-binding:t -*-
 ;; grammar statements nicely.
 
-;; Copyright (C) 2013, 2014  Free Software Foundation, Inc.
+;; Copyright (C) 2013-2015  Free Software Foundation, Inc.
 
 ;; This file is part of GNU Emacs.
 
@@ -43,14 +43,14 @@
   ;; included in package specs that exist solely to define OpenToken
   ;; grammar fragments.
   (save-excursion
-    (let ((token-text (nth 1 (wisi-backward-token))))
+    (let ((token-text (wisi-token-text (wisi-backward-token))))
       (cond
        ((equal token-text "<=")
        (back-to-indentation)
        (+ (current-column) ada-indent-broken))
 
        ((member token-text '("+" "&"))
-       (while (not (equal "<=" (nth 1 (wisi-backward-token)))))
+       (while (not (equal "<=" (wisi-token-text (wisi-backward-token)))))
        (back-to-indentation)
        (+ (current-column) ada-indent-broken))
        ))))