[AUCTeX-diffs] GNU AUCTeX branch, master, updated. 065c9325f99fd1c32c9aa5b67ee8c0a56e8219b9

[Tassilo Horn]

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  065c9325f99fd1c32c9aa5b67ee8c0a56e8219b9 (commit)
      from  3cba1615e9d746e9e6cb26086d176c4460921b50 (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 065c9325f99fd1c32c9aa5b67ee8c0a56e8219b9
Author: Tassilo Horn <address@hidden>
Date:   Sun Dec 1 20:09:39 2013 +0100

    Disable electric-pair-mode conditionally.
    
    * latex.el (LaTeX-common-initialization): Move disabling of
    `electric-pair-mode' from `VirTeX-common-initialization'.  Disable
    it only if `LaTeX-electric-left-right-brace' is non-nil.
    
    * tex.el (VirTeX-common-initialization): See above.

diff --git a/ChangeLog b/ChangeLog
index 80f89d7..786dcad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2013-12-01  Tassilo Horn  <address@hidden>
+
+       * latex.el (LaTeX-common-initialization): Move disabling of
+       `electric-pair-mode' from `VirTeX-common-initialization'.  Disable
+       it only if `LaTeX-electric-left-right-brace' is non-nil.
+
+       * tex.el (VirTeX-common-initialization): See above.
+
 2013-11-29  Tassilo Horn  <address@hidden>
 
        * tex.el (VirTeX-common-initialization): Disable
diff --git a/latex.el b/latex.el
index e56e7b0..5f6d194 100644
--- a/latex.el
+++ b/latex.el
@@ -5615,7 +5615,7 @@ i.e. you do _not_ have to cater for this yourself by 
adding \\\\' or $."
   (setq paragraph-separate
        (concat
         "[ \t]*%*[ \t]*\\("
-        "\\$\\$" ; Plain TeX display math
+        "\\$\\$"                       ; Plain TeX display math
         "\\|$\\)"))
 
   (setq TeX-verbatim-p-function 'LaTeX-verbatim-p)
@@ -5964,19 +5964,19 @@ i.e. you do _not_ have to cater for this yourself by 
adding \\\\' or $."
      '("documentclass" TeX-arg-document)))
 
   (TeX-add-style-hook "latex2e"
-   ;; Use new fonts for `\documentclass' documents.
-   (lambda ()
-     (setq TeX-font-list LaTeX-font-list)
-     (setq TeX-font-replace-function 'TeX-font-replace-macro)
-     (run-hooks 'LaTeX2e-hook)))
+                     ;; Use new fonts for `\documentclass' documents.
+                     (lambda ()
+                       (setq TeX-font-list LaTeX-font-list)
+                       (setq TeX-font-replace-function 'TeX-font-replace-macro)
+                       (run-hooks 'LaTeX2e-hook)))
 
   (TeX-add-style-hook "latex2"
-   ;; Use old fonts for `\documentstyle' documents.
-   (lambda ()
-     (setq TeX-font-list (default-value 'TeX-font-list))
-     (setq TeX-font-replace-function
-          (default-value 'TeX-font-replace-function))
-     (run-hooks 'LaTeX2-hook)))
+                     ;; Use old fonts for `\documentstyle' documents.
+                     (lambda ()
+                       (setq TeX-font-list (default-value 'TeX-font-list))
+                       (setq TeX-font-replace-function
+                             (default-value 'TeX-font-replace-function))
+                       (run-hooks 'LaTeX2-hook)))
 
   ;; There must be something better-suited, but I don't understand the
   ;; parsing properly.  -- dak
@@ -5984,22 +5984,22 @@ i.e. you do _not_ have to cater for this yourself by 
adding \\\\' or $."
   (TeX-add-style-hook "pdftricks" 'TeX-PDF-mode-on)
   (TeX-add-style-hook "pst-pdf" 'TeX-PDF-mode-on)
   (TeX-add-style-hook "dvips" 'TeX-PDF-mode-off)
-;; This is now done in style/pstricks.el because it prevents other
-;; pstricks style files from being loaded.
-;;   (TeX-add-style-hook "pstricks" 'TeX-PDF-mode-off)
+  ;; This is now done in style/pstricks.el because it prevents other
+  ;; pstricks style files from being loaded.
+  ;;   (TeX-add-style-hook "pstricks" 'TeX-PDF-mode-off)
   (TeX-add-style-hook "psfrag" 'TeX-PDF-mode-off)
   (TeX-add-style-hook "dvipdf" 'TeX-PDF-mode-off)
   (TeX-add-style-hook "dvipdfm" 'TeX-PDF-mode-off)
-;;  (TeX-add-style-hook "DVIoutput" 'TeX-PDF-mode-off)
-;;
-;;  Well, DVIoutput indicates that we want to run PDFTeX and expect to
-;;  get DVI output.  Ugh.
+  ;;  (TeX-add-style-hook "DVIoutput" 'TeX-PDF-mode-off)
+  ;;
+  ;;  Well, DVIoutput indicates that we want to run PDFTeX and expect to
+  ;;  get DVI output.  Ugh.
   (TeX-add-style-hook "ifpdf" (lambda ()
                                (TeX-PDF-mode-on)
                                (TeX-PDF-mode-off)))
-;; ifpdf indicates that we cater for either.  So calling both
-;; functions will make sure that the default will get used unless the
-;; user overrode it.
+  ;; ifpdf indicates that we cater for either.  So calling both
+  ;; functions will make sure that the default will get used unless the
+  ;; user overrode it.
 
   (set (make-local-variable 'imenu-create-index-function)
        'LaTeX-imenu-create-index-function)
@@ -6013,7 +6013,14 @@ i.e. you do _not_ have to cater for this yourself by 
adding \\\\' or $."
   (easy-menu-add LaTeX-mode-menu LaTeX-mode-map)
   (easy-menu-add LaTeX-mode-command-menu LaTeX-mode-map)
 
-  (define-key LaTeX-mode-map "\C-xne" 'LaTeX-narrow-to-environment))
+  (define-key LaTeX-mode-map "\C-xne" 'LaTeX-narrow-to-environment)
+
+  ;; AUCTeX's brace pairing feature (`LaTeX-electric-left-right-brace') doesn't
+  ;; play nice with `electric-pair-mode' which is a global minor mode as of
+  ;; emacs 24.4.
+  (when (and LaTeX-electric-left-right-brace
+            (boundp 'electric-pair-mode))
+    (set (make-local-variable 'electric-pair-mode) nil)))
 
 (defun LaTeX-imenu-create-index-function ()
   "Imenu support function for LaTeX."
diff --git a/tex.el b/tex.el
index ea882f6..07c452e 100644
--- a/tex.el
+++ b/tex.el
@@ -3169,13 +3169,7 @@ The algorithm is as follows:
              (when (or (not (file-exists-p (buffer-file-name)))
                        (eq TeX-master 'shared))
                (TeX-master-file nil nil t))
-             (TeX-update-style t)) nil t)
-  ;; AUCTeX brace pairing feature doesn't play nice with `electric-pair-mode'
-  ;; which is a global minor mode as of emacs 24.4.
-  (when (and (boundp 'electric-pair-mode)
-            (boundp 'electric-pair-inhibit-predicate))
-    (set (make-local-variable 'electric-pair-inhibit-predicate)
-        (lambda (char) t))))
+             (TeX-update-style t)) nil t))
 
 
 ;;; Hilighting

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

Summary of changes:
 ChangeLog |    8 ++++++++
 latex.el  |   53 ++++++++++++++++++++++++++++++-----------------------
 tex.el    |    8 +-------
 3 files changed, 39 insertions(+), 30 deletions(-)


hooks/post-receive
-- 
GNU AUCTeX