branch: elpa
commit 79a8643c0bd924eb50389caa034e94750825b439
Author: Arash Esbati <[email protected]>
Commit: Mosè Giordano <[email protected]>
Respect both "xcolor" and "color" for command queries
* style/textpos.el ("textpos"): Remove "color" from
`TeX-run-style-hooks'.
("textpos"): Respect both "xcolor" and "color" for query to
"textblockcolour" and "textblockrulecolour" commands.
Signed-off-by: Mosè Giordano <[email protected]>
---
style/textpos.el | 10 ++++++----
1 file changed, 6 insertions(+), 4 deletions(-)
diff --git a/style/textpos.el b/style/textpos.el
index c2f3e19..9c27ddd 100644
--- a/style/textpos.el
+++ b/style/textpos.el
@@ -1,6 +1,6 @@
;;; textpos.el --- AUCTeX style for `textpos.sty' version v1.7j
-;; Copyright (C) 2015 Free Software Foundation, Inc.
+;; Copyright (C) 2015, 2016 Free Software Foundation, Inc.
;; Author: Arash Esbati <esbati'at'gmx.de>
;; Maintainer: [email protected]
@@ -65,7 +65,7 @@ them."
"textpos"
(lambda ()
- (TeX-run-style-hooks "everyshi" "color")
+ (TeX-run-style-hooks "everyshi")
(LaTeX-add-environments
;; \begin{textblock}{<hsize>}[<ho>,<vo>](<hpos>,<vpos>) ... \end{textblock}
@@ -84,14 +84,16 @@ them."
(TeX-arg-eval
(lambda ()
(let ((color (completing-read "Color name: "
- (LaTeX-color-definecolor-list))))
+ (or (LaTeX-xcolor-definecolor-list)
+ (LaTeX-color-definecolor-list)))))
(format "%s" color)))))
'("textblockrulecolour"
(TeX-arg-eval
(lambda ()
(let ((color (completing-read "Color name: "
- (LaTeX-color-definecolor-list))))
+ (or (LaTeX-xcolor-definecolor-list)
+ (LaTeX-color-definecolor-list)))))
(format "%s" color)))))
'("TPshowboxestrue")
