main e5b4e11e 044/257: Merge branch 'master' into elpa

[Tassilo Horn]

branch: main
commit e5b4e11eb84dfd8ae2cfb4d91dbac826569ce10f
Merge: 2c9e820b 100759f6
Author: Tassilo Horn <tsdh@gnu.org>
Commit: Tassilo Horn <tsdh@gnu.org>

    Merge branch 'master' into elpa
---
 ChangeLog        | 14 ++++++++++++++
 style/italian.el |  2 +-
 tex.el           | 17 +++++++++--------
 3 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 5e42eeed..55ca5cca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2015-05-08  Tassilo Horn  <tsdh@gnu.org>
+
+       * tex.el (TeX-mode-syntax-table): Use paired delimiter syntax for
+       character |.
+
+2015-05-07  Mos� Giordano  <mose@gnu.org>
+
+       * tex.el: Update copyright years.
+       (TeX-view-program-list): Fix type.  (Bug#20513)
+
+2015-05-05  Mos� Giordano  <mose@gnu.org>
+
+       * style/italian.el: Evaluate `TeX-quote-after-quote'.
+
 2015-05-01  Tassilo Horn  <tsdh@gnu.org>
 
        * Version 11.88.5 released.
diff --git a/style/italian.el b/style/italian.el
index a7fa3d9c..6cb72fe8 100644
--- a/style/italian.el
+++ b/style/italian.el
@@ -50,7 +50,7 @@
                            LaTeX-italian-close-quote
                          "\">")))
        (setq TeX-quote-language
-            `("italian" ,open-quote ,close-quote TeX-quote-after-quote))))
+            `("italian" ,open-quote ,close-quote ,TeX-quote-after-quote))))
    ;; Fontification of quotation marks.
    (when (fboundp 'font-latex-add-quotes)
      (font-latex-add-quotes '("\"<" "\">" french)))
diff --git a/tex.el b/tex.el
index fb0c9e60..0816ae28 100644
--- a/tex.el
+++ b/tex.el
@@ -1,6 +1,6 @@
 ;;; tex.el --- Support for TeX documents.
 
-;; Copyright (C) 1985-1987, 1991, 1993-2014 Free Software Foundation, Inc.
+;; Copyright (C) 1985-1987, 1991, 1993-2015 Free Software Foundation, Inc.
 
 ;; Maintainer: auctex-devel@gnu.org
 ;; Keywords: tex
@@ -1234,7 +1234,7 @@ restarting Emacs."
      (string :tag "Name")
      (choice
       (group :tag "Command" (string :tag "Command"))
-      (group :tag "Command parts"
+      (group :inline t :tag "Command parts"
             (repeat
              :tag "Command parts"
              (choice
@@ -4463,15 +4463,15 @@ element to ALIST-VAR."
 
 (progn ; Define TeX-mode-syntax-table.
   (modify-syntax-entry (string-to-char TeX-esc)
-                          "\\" TeX-mode-syntax-table)
+                      "\\" TeX-mode-syntax-table)
   (modify-syntax-entry ?\f ">"  TeX-mode-syntax-table)
   (modify-syntax-entry ?\n ">"  TeX-mode-syntax-table)
   (modify-syntax-entry (string-to-char TeX-grop)
-                          (concat "(" TeX-grcl)
-                               TeX-mode-syntax-table)
+                      (concat "(" TeX-grcl)
+                      TeX-mode-syntax-table)
   (modify-syntax-entry (string-to-char TeX-grcl)
-                          (concat ")" TeX-grop)
-                               TeX-mode-syntax-table)
+                      (concat ")" TeX-grop)
+                      TeX-mode-syntax-table)
   (modify-syntax-entry ?%  "<"  TeX-mode-syntax-table)
   (modify-syntax-entry ?\" "."  TeX-mode-syntax-table)
   (modify-syntax-entry ?&  "."  TeX-mode-syntax-table)
@@ -4481,7 +4481,8 @@ element to ALIST-VAR."
   (modify-syntax-entry ?$  "$"  TeX-mode-syntax-table)
   (modify-syntax-entry ?'  "w"  TeX-mode-syntax-table)
   (modify-syntax-entry ?�  "."  TeX-mode-syntax-table)
-  (modify-syntax-entry ?�  "."  TeX-mode-syntax-table))
+  (modify-syntax-entry ?�  "."  TeX-mode-syntax-table)
+  (modify-syntax-entry ?|  "$"  TeX-mode-syntax-table))
 
 ;;; Menu Support