[elpa] elpa cffe98a 31/35: Use default argument of completing-read in ConTeXt-environment

[Tassilo Horn]

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)))))