[AUCTeX-diffs] GNU AUCTeX branch, master, updated. 5b0b2154fc5b2fb2e52fb89e3f43a3a89087b14c

[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  5b0b2154fc5b2fb2e52fb89e3f43a3a89087b14c (commit)
      from  be9f14a1726b74848186b921ed6dc4f89f7cd4ac (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 5b0b2154fc5b2fb2e52fb89e3f43a3a89087b14c
Author: Tassilo Horn <address@hidden>
Date:   Mon Aug 10 07:30:48 2015 +0200

    Setup preview menu/keymap only once.
    
    * preview.el.in (LaTeX-preview-setup): Setup menu and keymap only
    once.

diff --git a/ChangeLog b/ChangeLog
index 9809c70..04b7dd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2015-08-10  Tassilo Horn  <address@hidden>
+
+       * preview.el.in (LaTeX-preview-setup): Setup menu and keymap only
+       once.
+
 2015-08-09  Arash Esbati  <address@hidden>
 
        * style/enumitem.el ("enumitem"): Cater for the starred version of
diff --git a/preview.el.in b/preview.el.in
index b26cf0a..2eee66e 100644
--- a/preview.el.in
+++ b/preview.el.in
@@ -2490,44 +2490,47 @@ pp")
   "Hook function for embedding the preview package into AUCTeX.
 This is called by `LaTeX-mode-hook' and changes AUCTeX variables
 to add the preview functionality."
-  (remove-hook 'LaTeX-mode-hook #'LaTeX-preview-setup)
-  (add-hook 'LaTeX-mode-hook #'preview-mode-setup)
-  (define-key LaTeX-mode-map "\C-c\C-p" preview-map)
-  (easy-menu-define preview-menu LaTeX-mode-map
-    "This is the menu for preview-latex."
-    '("Preview"
-      "Generate previews"
-      ["(or toggle) at point" preview-at-point]
-      ["for environment" preview-environment]
-      ["for section" preview-section]
-      ["for region" preview-region (preview-mark-active)]
-      ["for buffer" preview-buffer]
-      ["for document" preview-document]
-      "---"
-      "Remove previews"
-      ["at point" preview-clearout-at-point]
-      ["from section" preview-clearout-section]
-      ["from region" preview-clearout (preview-mark-active)]
-      ["from buffer" preview-clearout-buffer]
-      ["from document" preview-clearout-document]
-      "---"
-      "Turn preamble cache"
-      ["on" preview-cache-preamble]
-      ["off" preview-cache-preamble-off]
-      "---"
-      ("Customize"
-       ["Browse options"
-       (customize-group 'preview)]
-       ["Extend this menu"
-       (easy-menu-add-item
-        nil '("Preview")
-        (customize-menu-create 'preview))])
-      ["Read documentation" preview-goto-info-page]
-      ["Report Bug" preview-report-bug]))
-  (if (eq major-mode 'latex-mode)
-      (preview-mode-setup))
-  (if (boundp 'desktop-buffer-misc)
-      (preview-buffer-restore desktop-buffer-misc)))
+  ;; This has to be done only once.
+  (unless (and (boundp 'LaTeX-mode-hook)
+              (memq #'preview-mode-setup LaTeX-mode-hook))
+    (remove-hook 'LaTeX-mode-hook #'LaTeX-preview-setup)
+    (add-hook 'LaTeX-mode-hook #'preview-mode-setup)
+    (define-key LaTeX-mode-map "\C-c\C-p" preview-map)
+    (easy-menu-define preview-menu LaTeX-mode-map
+      "This is the menu for preview-latex."
+      '("Preview"
+       "Generate previews"
+       ["(or toggle) at point" preview-at-point]
+       ["for environment" preview-environment]
+       ["for section" preview-section]
+       ["for region" preview-region (preview-mark-active)]
+       ["for buffer" preview-buffer]
+       ["for document" preview-document]
+       "---"
+       "Remove previews"
+       ["at point" preview-clearout-at-point]
+       ["from section" preview-clearout-section]
+       ["from region" preview-clearout (preview-mark-active)]
+       ["from buffer" preview-clearout-buffer]
+       ["from document" preview-clearout-document]
+       "---"
+       "Turn preamble cache"
+       ["on" preview-cache-preamble]
+       ["off" preview-cache-preamble-off]
+       "---"
+       ("Customize"
+        ["Browse options"
+         (customize-group 'preview)]
+        ["Extend this menu"
+         (easy-menu-add-item
+          nil '("Preview")
+          (customize-menu-create 'preview))])
+       ["Read documentation" preview-goto-info-page]
+       ["Report Bug" preview-report-bug]))
+    (if (eq major-mode 'latex-mode)
+       (preview-mode-setup))
+    (if (boundp 'desktop-buffer-misc)
+       (preview-buffer-restore desktop-buffer-misc))))
 
 (defun preview-clean-subdir (dir)
   "Cleans out a temporary DIR with preview image files."

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

Summary of changes:
 ChangeLog     |    5 +++
 preview.el.in |   79 +++++++++++++++++++++++++++++---------------------------
 2 files changed, 46 insertions(+), 38 deletions(-)


hooks/post-receive
-- 
GNU AUCTeX