[elpa] elpa 8eca45c 3/3: Merge branch 'master' into elpa

[Tassilo Horn]

branch: elpa
commit 8eca45c8026369cffcd6a730ee52a1b5acf3a5f0
Merge: 51c45b0 a7c6757
Author: Tassilo Horn <address@hidden>
Commit: Tassilo Horn <address@hidden>

    Merge branch 'master' into elpa
---
 doc/auctex.texi |   29 +++++++++++++++++++++++++++++
 tex-wizard.el   |    8 ++++----
 2 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/doc/auctex.texi b/doc/auctex.texi
index afb0c9e..80014d9 100644
--- a/doc/auctex.texi
+++ b/doc/auctex.texi
@@ -164,6 +164,7 @@ Controlling Screen Display
 * Folding::                     Folding Macros and Environments
 * Outline::                     Outlining the Document
 * Narrowing::                   Restricting display and editing to a portion 
of the buffer
+* Prettifying::                 Displaying Greek and math macros as Unicode 
characters
 
 Font Locking
 
@@ -1810,11 +1811,15 @@ Moreover, you can focus in a specific portion of the 
code by narrowing
 the buffer to the desired region.  @AUCTeX{} provides also functions to
 narrow the buffer to the current group and to @LaTeX{} environments.
 
+Lastly, @AUCTeX{} with Emacs 25 or later can display certain math macros
+using Unicode characters.  That's called prettification.
+
 @menu
 * Font Locking::                Font Locking
 * Folding::                     Folding Macros and Environments
 * Outline::                     Outlining the Document
 * Narrowing::                   Restricting display and editing to a portion 
of the buffer
+* Prettifying::                 Displaying Greek and math macros as Unicode 
characters
 @end menu
 
 @node Font Locking
@@ -2578,6 +2583,30 @@ disabled.  Attempting to use them asks for confirmation 
and gives you
 the option of enabling them; if you enable the commands, confirmation
 will no longer be required for them.
 
address@hidden Prettifying
address@hidden Prettifying
+
+Emacs 25 is able to prettify symbols in programming language buffers,
address@hidden for Programs,,,emacs,GNU Emacs Manual}.  The canonical
+example is to display @code{(lambda () ...)} as @code{(λ () ...)} in
+Lisp buffers.
+
address@hidden can use this feature in order to display certain math macros
+and greek letters using their Unicode representation, too.  For example,
+the @TeX{} code @code{\alpha \times \beta} will be displayed as @code{α
+× β}.  When point is on one of the characters, it'll be unprettified
+automatically, meaning you see the verbatim text again.
+
+To enable prettification in @AUCTeX, simply add
address@hidden to @code{TeX-mode-hook}.  If you enabled
+prettification globally with @code{global-prettify-symbols-mode}, then
+it's automatically enabled in @AUCTeX, too.
+
+You can also add custom symbol unicode-character pairs for
+prettification by adding to @code{tex--prettify-symbols-alist}.  Note
+that this variable is part of Emacs' stock @code{tex-mode.el} and used
+by that and @AUCTeX{}.
+
 @node Processing
 @chapter Starting Processors, Viewers and Other Programs
 
diff --git a/tex-wizard.el b/tex-wizard.el
index f5badae..b51c03a 100644
--- a/tex-wizard.el
+++ b/tex-wizard.el
@@ -1,6 +1,6 @@
 ;;; tex-wizard.el --- Check the TeX configuration
 
-;; Copyright (C) 2003  Free Software Foundation, Inc.
+;; Copyright (C) 2003, 2006, 2016 Free Software Foundation, Inc.
 
 ;; Author: David Kastrup <address@hidden>
 ;; Keywords: tex, wp, convenience
@@ -90,7 +90,7 @@ and bibliographics references.\n")
               (boundp 'LaTeX-mode-hook)
               (memq 'turn-on-reftex LaTeX-mode-hook))
       (if (and (boundp 'reftex-plug-into-AUCTeX)
-                  reftex-plug-into-AUCTeX)
+              reftex-plug-into-AUCTeX)
          (insert-before-markers
           "RefTeX appears to be configured for use with AUCTeX.\n")
        (require 'reftex)
@@ -99,8 +99,8 @@ It appears that RefTeX is not configured to cooperate with
 AUCTeX.  Please configure it using the menus, save for future
 sessions, then press the finish button.")
        (customize-variable-other-window 'reftex-plug-into-AUCTeX)
-       (set (make-local-variable 'custom-buffer-done-function)
-            (lambda (buff) (kill-buffer buff) (exit-recursive-edit)))
+       (set (make-local-variable 'custom-buffer-done-kill) t)
+       (add-hook 'kill-buffer-hook #'exit-recursive-edit nil t)
        (recursive-edit)
        (select-window wizwin)
        (switch-to-buffer wizbuf))))