[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] elpa cffe98a 31/35: Use default argument of completing-read in Co
From: |
Tassilo Horn |
Subject: |
[elpa] elpa cffe98a 31/35: Use default argument of completing-read in ConTeXt-environment |
Date: |
Sun, 31 Jan 2016 16:05:43 +0000 |
branch: elpa
commit cffe98a617cdf61a3d78f6cf3e35cbe10a9aec42
Author: Mosè Giordano <address@hidden>
Commit: Mosè Giordano <address@hidden>
Use default argument of completing-read in ConTeXt-environment
* context.el (ConTeXt-environment): Properly use default argument of
`completing-read'. Do not set `ConTeXt-default-environment' to
`environment' if the latter is equal to the current default
environment, like in `LaTeX-environment'.
---
context.el | 35 ++++++++++++++---------------------
1 files changed, 14 insertions(+), 21 deletions(-)
diff --git a/context.el b/context.el
index c7a0575..b962e0d 100644
--- a/context.el
+++ b/context.el
@@ -654,33 +654,26 @@ inserted after the sectioning command."
;; this should not happen
(error "Unknown interface: %s" ConTeXt-current-interface))))
-
(defun ConTeXt-environment (arg)
"Make ConTeXt environment (\\start...-\\stop... pair).
With optional ARG, modify current environment."
(interactive "*P")
- (let ((environment (
- completing-read (concat "Environment type: (default "
- (if (TeX-near-bobp)
- "text"
- ConTeXt-default-environment)
- ") ")
- ConTeXt-environment-list
- nil nil nil
- 'ConTeXt-environment-history)
- ))
- ;; Get default
- (cond ((and (zerop (length environment))
- (TeX-near-bobp))
- (setq environment "text"))
- ((zerop (length environment))
- (setq environment ConTeXt-default-environment))
- (t
- (setq ConTeXt-default-environment environment)))
+ (let* ((default (cond
+ ((TeX-near-bobp) "text")
+ (t ConTeXt-default-environment)))
+ (environment
+ (completing-read (concat "Environment type: (default " default ") ")
+ ConTeXt-environment-list nil nil nil
+ 'ConTeXt-environment-history default)))
+ ;; Use `environment' as default for the next time only if it is different
+ ;; from the current default.
+ (unless (equal environment default)
+ (setq ConTeXt-default-environment environment))
(let ((entry (assoc environment ConTeXt-environment-list)))
- (when (null entry)
- (ConTeXt-add-environments (list environment)))
+ (if (null entry)
+ (ConTeXt-add-environments (list environment)))
+
(if arg
(ConTeXt-modify-environment environment)
(ConTeXt-environment-menu environment)))))
- [elpa] elpa 255efa3 23/35: Write TeX-style-hook-dialect to parsed file, (continued)
- [elpa] elpa 255efa3 23/35: Write TeX-style-hook-dialect to parsed file, Tassilo Horn, 2016/01/31
- [elpa] elpa 58386b9 25/35: Improve font related queries, Tassilo Horn, 2016/01/31
- [elpa] elpa 601689e 20/35: Move \iff macro to Arrows section of LaTeX-math-default, Tassilo Horn, 2016/01/31
- [elpa] elpa be525cf 22/35: Add new dialects, Tassilo Horn, 2016/01/31
- [elpa] elpa f72d2a9 26/35: Improve font related queries, Tassilo Horn, 2016/01/31
- [elpa] elpa 09cc5d1 24/35: Improve font related queries, Tassilo Horn, 2016/01/31
- [elpa] elpa 34a0ecc 30/35: Add completion for environments in ConTeXt, Tassilo Horn, 2016/01/31
- [elpa] elpa e9ddab9 28/35: Code cleaning, Tassilo Horn, 2016/01/31
- [elpa] elpa d9f61d5 32/35: Capture message of LaTeX warnings, Tassilo Horn, 2016/01/31
- [elpa] elpa ba7755d 27/35: Improve style/enumitem, Tassilo Horn, 2016/01/31
- [elpa] elpa cffe98a 31/35: Use default argument of completing-read in ConTeXt-environment,
Tassilo Horn <=
- [elpa] elpa 5293a02 34/35: * Version 11.89.1 released., Tassilo Horn, 2016/01/31
- [elpa] elpa b1ec3ed 29/35: Change coding back to iso-8859-1, XEmacs doesn't support utf-8, Tassilo Horn, 2016/01/31
- [elpa] elpa 0a99c11 35/35: Upgrade docs for release., Tassilo Horn, 2016/01/31
- [elpa] elpa 1bb965f 33/35: Merge branch 'master' into elpa, Tassilo Horn, 2016/01/31