[AUCTeX-diffs] GNU AUCTeX branch, master, updated. cffe98a617cdf61a3d78f6cf3e35cbe10a9aec42

[Mosè Giordano]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU AUCTeX".

The branch, master has been updated
       via  cffe98a617cdf61a3d78f6cf3e35cbe10a9aec42 (commit)
       via  34a0ecc837becb7ac176a37a3e37606c168de8f6 (commit)
      from  b1ec3ed153374ce80254267977d083cf6cfb0138 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit cffe98a617cdf61a3d78f6cf3e35cbe10a9aec42
Author: Mosè Giordano <address@hidden>
Date:   Sat Jan 30 19:22:08 2016 +0100

    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'.

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

commit 34a0ecc837becb7ac176a37a3e37606c168de8f6
Author: Mosè Giordano <address@hidden>
Date:   Sat Jan 30 19:18:57 2016 +0100

    Add completion for environments in ConTeXt
    
    * context.el (ConTeXt-language-variable-list): Document variable.  Add
      `ConTeXt-environment-list' so that now completion for environments
      names in `ConTeXt-environment' function works.  Suggested by Andrea De
      Michele.

diff --git a/context.el b/context.el
index 882ed83..c7a0575 100644
--- a/context.el
+++ b/context.el
@@ -1659,7 +1659,9 @@ Use `ConTeXt-Mark-version' to choose the command."
     ConTeXt-section-list
     ConTeXt-text
     ConTeXt-item-list
-    ConTeXt-extra-paragraph-commands))
+    ConTeXt-extra-paragraph-commands
+    ConTeXt-environment-list)
+  "List of variables to be set from languages specific ones.")
 
 (defconst ConTeXt-dialect :context
   "Default dialect for use with function `TeX-add-style-hook' for

-----------------------------------------------------------------------

Summary of changes:
 context.el |   39 +++++++++++++++++----------------------
 1 files changed, 17 insertions(+), 22 deletions(-)


hooks/post-receive
-- 
GNU AUCTeX