auctex-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[AUCTeX-diffs] [elpa] externals/auctex 45ad237 35/67: Remove TeX-maybe-r


From: Tassilo Horn
Subject: [AUCTeX-diffs] [elpa] externals/auctex 45ad237 35/67: Remove TeX-maybe-remove-help,
Date: Fri, 8 Feb 2019 11:40:35 -0500 (EST)

branch: externals/auctex
commit 45ad237806613cfa365a7d1f8bc799d0cc930b2b
Author: Ikumi Keita <address@hidden>
Commit: Ikumi Keita <address@hidden>

    Remove TeX-maybe-remove-help, TeX-menu-with-help
    
    * tex.el (TeX-maybe-remove-help, TeX-menu-with-help): Remove.
    (TeX-mode-specific-command-menu-entries, TeX-fold-menu)
    (TeX-common-menu-entries):
    * context.el:
    * latex.el:
    * plain-tex.el:
    * tex-buf.el:
    * tex-info.el:
    Remove `TeX-menu-with-help' and fix indent.
---
 context.el   | 105 +++++++++---------
 latex.el     | 141 ++++++++++++------------
 plain-tex.el |  67 ++++++------
 tex-buf.el   |  51 +++++----
 tex-info.el  | 103 +++++++++---------
 tex.el       | 348 +++++++++++++++++++++++++++--------------------------------
 6 files changed, 390 insertions(+), 425 deletions(-)

diff --git a/context.el b/context.el
index ee35eb6..5622d8a 100644
--- a/context.el
+++ b/context.el
@@ -1,6 +1,6 @@
 ;;; context.el --- Support for ConTeXt documents.
 
-;; Copyright (C) 2003-2006, 2008, 2010, 2012, 2014-2017
+;; Copyright (C) 2003-2006, 2008, 2010, 2012, 2014-2018
 ;;   Free Software Foundation, Inc.
 
 ;; Maintainer: Berend de Boer <address@hidden>
@@ -1482,58 +1482,57 @@ else.  There might be text before point."
 (easy-menu-define ConTeXt-mode-menu
   ConTeXt-mode-map
   "Menu used in ConTeXt mode."
-  (TeX-menu-with-help
-   `("ConTeXt"
-     (,ConTeXt-project-structure-menu-name)
-     (,ConTeXt-section-block-menu-name)
-     (,ConTeXt-numbered-section-menu-name)
-     (,ConTeXt-unnumbered-section-menu-name)
-     ["Add Table of Contents to Emacs Menu" (imenu-add-to-menubar "TOC") t]
-     "-"
-     ["Macro ..." TeX-insert-macro
-      :help "Insert a macro and possibly arguments"]
-     ["Complete" TeX-complete-symbol
-      :help "Complete the current macro or environment name"]
-     ["Show ConTeXt Macro Definition" ConTeXt-etexshow]
-     "-"
-     (,ConTeXt-environment-menu-name)
-     (,ConTeXt-environment-modify-menu-name)
-     ["Item" ConTeXt-insert-item
-      :help "Insert a new \item into current environment"]
-     (,ConTeXt-define-menu-name)
-     (,ConTeXt-setup-menu-name)
-     (,ConTeXt-other-macro-menu-name)
-     "-"
-     ("Insert Font"
-      ["Emphasize"  (TeX-font nil ?\C-e) :keys "C-c C-f C-e"]
-      ["Bold"       (TeX-font nil ?\C-b) :keys "C-c C-f C-b"]
-      ["Typewriter" (TeX-font nil ?\C-t) :keys "C-c C-f C-t"]
-      ["Small Caps" (TeX-font nil ?\C-c) :keys "C-c C-f C-c"]
-      ["Sans Serif" (TeX-font nil ?\C-f) :keys "C-c C-f C-f"]
-      ["Italic"     (TeX-font nil ?\C-i) :keys "C-c C-f C-i"]
-      ["Slanted"    (TeX-font nil ?\C-s) :keys "C-c C-f C-s"]
-      ["Roman"      (TeX-font nil ?\C-r) :keys "C-c C-f C-r"]
-      ["Calligraphic" (TeX-font nil ?\C-a) :keys "C-c C-f C-a"])
-     ("Replace Font"
-      ["Emphasize"  (TeX-font t ?\C-e) :keys "C-u C-c C-f C-e"]
-      ["Bold"       (TeX-font t ?\C-b) :keys "C-u C-c C-f C-b"]
-      ["Typewriter" (TeX-font t ?\C-t) :keys "C-u C-c C-f C-t"]
-      ["Small Caps" (TeX-font t ?\C-c) :keys "C-u C-c C-f C-c"]
-      ["Sans Serif" (TeX-font t ?\C-f) :keys "C-u C-c C-f C-f"]
-      ["Italic"     (TeX-font t ?\C-i) :keys "C-u C-c C-f C-i"]
-      ["Slanted"    (TeX-font t ?\C-s) :keys "C-u C-c C-f C-s"]
-      ["Roman"      (TeX-font t ?\C-r) :keys "C-u C-c C-f C-r"]
-      ["Calligraphic" (TeX-font t ?\C-a) :keys "C-u C-c C-f C-a"])
-     ["Delete Font" (TeX-font t ?\C-d) :keys "C-c C-f C-d"]
-     "-"
-     ["Comment or Uncomment Region"
-      comment-or-uncomment-region
-      :help "Make the selected region outcommented or active again"]
-     ["Comment or Uncomment Paragraph"
-      TeX-comment-or-uncomment-paragraph
-      :help "Make the current paragraph outcommented or active again"]
-     ,TeX-fold-menu
-     "-" . ,TeX-common-menu-entries)))
+  `("ConTeXt"
+    (,ConTeXt-project-structure-menu-name)
+    (,ConTeXt-section-block-menu-name)
+    (,ConTeXt-numbered-section-menu-name)
+    (,ConTeXt-unnumbered-section-menu-name)
+    ["Add Table of Contents to Emacs Menu" (imenu-add-to-menubar "TOC") t]
+    "-"
+    ["Macro ..." TeX-insert-macro
+     :help "Insert a macro and possibly arguments"]
+    ["Complete" TeX-complete-symbol
+     :help "Complete the current macro or environment name"]
+    ["Show ConTeXt Macro Definition" ConTeXt-etexshow]
+    "-"
+    (,ConTeXt-environment-menu-name)
+    (,ConTeXt-environment-modify-menu-name)
+    ["Item" ConTeXt-insert-item
+     :help "Insert a new \item into current environment"]
+    (,ConTeXt-define-menu-name)
+    (,ConTeXt-setup-menu-name)
+    (,ConTeXt-other-macro-menu-name)
+    "-"
+    ("Insert Font"
+     ["Emphasize"  (TeX-font nil ?\C-e) :keys "C-c C-f C-e"]
+     ["Bold"       (TeX-font nil ?\C-b) :keys "C-c C-f C-b"]
+     ["Typewriter" (TeX-font nil ?\C-t) :keys "C-c C-f C-t"]
+     ["Small Caps" (TeX-font nil ?\C-c) :keys "C-c C-f C-c"]
+     ["Sans Serif" (TeX-font nil ?\C-f) :keys "C-c C-f C-f"]
+     ["Italic"     (TeX-font nil ?\C-i) :keys "C-c C-f C-i"]
+     ["Slanted"    (TeX-font nil ?\C-s) :keys "C-c C-f C-s"]
+     ["Roman"      (TeX-font nil ?\C-r) :keys "C-c C-f C-r"]
+     ["Calligraphic" (TeX-font nil ?\C-a) :keys "C-c C-f C-a"])
+    ("Replace Font"
+     ["Emphasize"  (TeX-font t ?\C-e) :keys "C-u C-c C-f C-e"]
+     ["Bold"       (TeX-font t ?\C-b) :keys "C-u C-c C-f C-b"]
+     ["Typewriter" (TeX-font t ?\C-t) :keys "C-u C-c C-f C-t"]
+     ["Small Caps" (TeX-font t ?\C-c) :keys "C-u C-c C-f C-c"]
+     ["Sans Serif" (TeX-font t ?\C-f) :keys "C-u C-c C-f C-f"]
+     ["Italic"     (TeX-font t ?\C-i) :keys "C-u C-c C-f C-i"]
+     ["Slanted"    (TeX-font t ?\C-s) :keys "C-u C-c C-f C-s"]
+     ["Roman"      (TeX-font t ?\C-r) :keys "C-u C-c C-f C-r"]
+     ["Calligraphic" (TeX-font t ?\C-a) :keys "C-u C-c C-f C-a"])
+    ["Delete Font" (TeX-font t ?\C-d) :keys "C-c C-f C-d"]
+    "-"
+    ["Comment or Uncomment Region"
+     comment-or-uncomment-region
+     :help "Make the selected region outcommented or active again"]
+    ["Comment or Uncomment Paragraph"
+     TeX-comment-or-uncomment-paragraph
+     :help "Make the current paragraph outcommented or active again"]
+    ,TeX-fold-menu
+    "-" . ,TeX-common-menu-entries))
 
 (defun ConTeXt-menu-update (&optional menu)
   "Update entries on AUCTeX menu."
diff --git a/latex.el b/latex.el
index 96fcf04..b1d2901 100644
--- a/latex.el
+++ b/latex.el
@@ -5628,79 +5628,78 @@ regenerated by the respective menu filter."
 (easy-menu-define LaTeX-mode-menu
   LaTeX-mode-map
   "Menu used in LaTeX mode."
-  (TeX-menu-with-help
-   `("LaTeX"
-     ("Section  (C-c C-s)" :filter LaTeX-section-menu-filter)
-     ["Macro..." TeX-insert-macro
-      :help "Insert a macro and possibly arguments"]
-     ["Complete Macro" TeX-complete-symbol
-      :help "Complete the current macro or environment name"]
-     ,(list LaTeX-environment-menu-name
-           :filter (lambda (ignored) (LaTeX-environment-menu-filter
-                                      LaTeX-environment-menu-name)))
-     ,(list LaTeX-environment-modify-menu-name
-           :filter (lambda (ignored) (LaTeX-environment-menu-filter
-                                      LaTeX-environment-modify-menu-name)))
-     ["Close Environment" LaTeX-close-environment
-      :help "Insert the \end part of the current environment"]
-     ["Item" LaTeX-insert-item
-      :help "Insert a new \item into current environment"]
+  `("LaTeX"
+    ("Section  (C-c C-s)" :filter LaTeX-section-menu-filter)
+    ["Macro..." TeX-insert-macro
+     :help "Insert a macro and possibly arguments"]
+    ["Complete Macro" TeX-complete-symbol
+     :help "Complete the current macro or environment name"]
+    ,(list LaTeX-environment-menu-name
+          :filter (lambda (ignored) (LaTeX-environment-menu-filter
+                                     LaTeX-environment-menu-name)))
+    ,(list LaTeX-environment-modify-menu-name
+          :filter (lambda (ignored) (LaTeX-environment-menu-filter
+                                     LaTeX-environment-modify-menu-name)))
+    ["Close Environment" LaTeX-close-environment
+     :help "Insert the \end part of the current environment"]
+    ["Item" LaTeX-insert-item
+     :help "Insert a new \item into current environment"]
+    "-"
+    ("Insert Font"
+     ["Emphasize"  (TeX-font nil ?\C-e) :keys "C-c C-f C-e"]
+     ["Bold"       (TeX-font nil ?\C-b) :keys "C-c C-f C-b"]
+     ["Typewriter" (TeX-font nil ?\C-t) :keys "C-c C-f C-t"]
+     ["Small Caps" (TeX-font nil ?\C-c) :keys "C-c C-f C-c"]
+     ["Sans Serif" (TeX-font nil ?\C-f) :keys "C-c C-f C-f"]
+     ["Italic"     (TeX-font nil ?\C-i) :keys "C-c C-f C-i"]
+     ["Slanted"    (TeX-font nil ?\C-s) :keys "C-c C-f C-s"]
+     ["Roman"      (TeX-font nil ?\C-r) :keys "C-c C-f C-r"]
+     ["Calligraphic" (TeX-font nil ?\C-a) :keys "C-c C-f C-a"])
+    ("Replace Font"
+     ["Emphasize"  (TeX-font t ?\C-e) :keys "C-u C-c C-f C-e"]
+     ["Bold"       (TeX-font t ?\C-b) :keys "C-u C-c C-f C-b"]
+     ["Typewriter" (TeX-font t ?\C-t) :keys "C-u C-c C-f C-t"]
+     ["Small Caps" (TeX-font t ?\C-c) :keys "C-u C-c C-f C-c"]
+     ["Sans Serif" (TeX-font t ?\C-f) :keys "C-u C-c C-f C-f"]
+     ["Italic"     (TeX-font t ?\C-i) :keys "C-u C-c C-f C-i"]
+     ["Slanted"    (TeX-font t ?\C-s) :keys "C-u C-c C-f C-s"]
+     ["Roman"      (TeX-font t ?\C-r) :keys "C-u C-c C-f C-r"]
+     ["Calligraphic" (TeX-font t ?\C-a) :keys "C-u C-c C-f C-a"])
+    ["Delete Font" (TeX-font t ?\C-d) :keys "C-c C-f C-d"]
+    "-"
+    ["Comment or Uncomment Region"
+     comment-or-uncomment-region
+     :help "Make the selected region outcommented or active again"]
+    ["Comment or Uncomment Paragraph"
+     TeX-comment-or-uncomment-paragraph
+     :help "Make the current paragraph outcommented or active again"]
+    ("Formatting and Marking"
+     ["Format Environment" LaTeX-fill-environment
+      :help "Fill and indent the current environment"]
+     ["Format Paragraph" LaTeX-fill-paragraph
+      :help "Fill and ident the current paragraph"]
+     ["Format Region" LaTeX-fill-region
+      :help "Fill and indent the currently selected region"]
+     ["Format Section" LaTeX-fill-section
+      :help "Fill and indent the current section"]
      "-"
-     ("Insert Font"
-      ["Emphasize"  (TeX-font nil ?\C-e) :keys "C-c C-f C-e"]
-      ["Bold"       (TeX-font nil ?\C-b) :keys "C-c C-f C-b"]
-      ["Typewriter" (TeX-font nil ?\C-t) :keys "C-c C-f C-t"]
-      ["Small Caps" (TeX-font nil ?\C-c) :keys "C-c C-f C-c"]
-      ["Sans Serif" (TeX-font nil ?\C-f) :keys "C-c C-f C-f"]
-      ["Italic"     (TeX-font nil ?\C-i) :keys "C-c C-f C-i"]
-      ["Slanted"    (TeX-font nil ?\C-s) :keys "C-c C-f C-s"]
-      ["Roman"      (TeX-font nil ?\C-r) :keys "C-c C-f C-r"]
-      ["Calligraphic" (TeX-font nil ?\C-a) :keys "C-c C-f C-a"])
-     ("Replace Font"
-      ["Emphasize"  (TeX-font t ?\C-e) :keys "C-u C-c C-f C-e"]
-      ["Bold"       (TeX-font t ?\C-b) :keys "C-u C-c C-f C-b"]
-      ["Typewriter" (TeX-font t ?\C-t) :keys "C-u C-c C-f C-t"]
-      ["Small Caps" (TeX-font t ?\C-c) :keys "C-u C-c C-f C-c"]
-      ["Sans Serif" (TeX-font t ?\C-f) :keys "C-u C-c C-f C-f"]
-      ["Italic"     (TeX-font t ?\C-i) :keys "C-u C-c C-f C-i"]
-      ["Slanted"    (TeX-font t ?\C-s) :keys "C-u C-c C-f C-s"]
-      ["Roman"      (TeX-font t ?\C-r) :keys "C-u C-c C-f C-r"]
-      ["Calligraphic" (TeX-font t ?\C-a) :keys "C-u C-c C-f C-a"])
-     ["Delete Font" (TeX-font t ?\C-d) :keys "C-c C-f C-d"]
+     ["Mark Environment" LaTeX-mark-environment
+      :help "Mark the current environment"]
+     ["Mark Section" LaTeX-mark-section
+      :help "Mark the current section"]
      "-"
-     ["Comment or Uncomment Region"
-      comment-or-uncomment-region
-      :help "Make the selected region outcommented or active again"]
-     ["Comment or Uncomment Paragraph"
-      TeX-comment-or-uncomment-paragraph
-      :help "Make the current paragraph outcommented or active again"]
-     ("Formatting and Marking"
-      ["Format Environment" LaTeX-fill-environment
-       :help "Fill and indent the current environment"]
-      ["Format Paragraph" LaTeX-fill-paragraph
-       :help "Fill and ident the current paragraph"]
-      ["Format Region" LaTeX-fill-region
-       :help "Fill and indent the currently selected region"]
-      ["Format Section" LaTeX-fill-section
-       :help "Fill and indent the current section"]
-      "-"
-      ["Mark Environment" LaTeX-mark-environment
-       :help "Mark the current environment"]
-      ["Mark Section" LaTeX-mark-section
-       :help "Mark the current section"]
-      "-"
-      ["Beginning of Environment" LaTeX-find-matching-begin
-       :help "Move point to the beginning of the current environment"]
-      ["End of Environment" LaTeX-find-matching-end
-       :help "Move point to the end of the current environment"])
-     ,TeX-fold-menu
-     ["Math Mode" LaTeX-math-mode
-      :style toggle :selected LaTeX-math-mode
-      :help "Toggle math mode"]
-     "-"
-      [ "Convert 209 to 2e" LaTeX-209-to-2e
-        :visible (member "latex2" (TeX-style-list)) ]
-      . ,TeX-common-menu-entries)))
+     ["Beginning of Environment" LaTeX-find-matching-begin
+      :help "Move point to the beginning of the current environment"]
+     ["End of Environment" LaTeX-find-matching-end
+      :help "Move point to the end of the current environment"])
+    ,TeX-fold-menu
+    ["Math Mode" LaTeX-math-mode
+     :style toggle :selected LaTeX-math-mode
+     :help "Toggle math mode"]
+    "-"
+    [ "Convert 209 to 2e" LaTeX-209-to-2e
+      :visible (member "latex2" (TeX-style-list)) ]
+    . ,TeX-common-menu-entries))
 
 (defcustom LaTeX-font-list
   '((?\C-a ""              ""  "\mathcal{"    "}")
diff --git a/plain-tex.el b/plain-tex.el
index b881516..4be0e3d 100644
--- a/plain-tex.el
+++ b/plain-tex.el
@@ -55,40 +55,39 @@ Install tool bar if `plain-TeX-enable-toolbar' is non-nil."
   "Keymap used in plain TeX mode.")
 
 (defvar plain-TeX-menu-entries
-  (TeX-menu-with-help
-   `(["Macro..." TeX-insert-macro
-      :help "Insert a macro and possibly arguments"]
-     ["Complete" TeX-complete-symbol
-      :help "Complete the current macro"]
-     "-"
-     ("Insert Font"
-      ["Emphasize"  (TeX-font nil ?\C-e) :keys "C-c C-f C-e"]
-      ["Bold"       (TeX-font nil ?\C-b) :keys "C-c C-f C-b"]
-      ["Typewriter" (TeX-font nil ?\C-t) :keys "C-c C-f C-t"]
-      ["Small Caps" (TeX-font nil ?\C-c) :keys "C-c C-f C-c"]
-      ["Sans Serif" (TeX-font nil ?\C-f) :keys "C-c C-f C-f"]
-      ["Italic"     (TeX-font nil ?\C-i) :keys "C-c C-f C-i"]
-      ["Slanted"    (TeX-font nil ?\C-s) :keys "C-c C-f C-s"]
-      ["Roman"      (TeX-font nil ?\C-r) :keys "C-c C-f C-r"]
-      ["Calligraphic" (TeX-font nil ?\C-a) :keys "C-c C-f C-a"])
-     ("Replace Font"
-      ["Emphasize"  (TeX-font t ?\C-e) :keys "C-u C-c C-f C-e"]
-      ["Bold"       (TeX-font t ?\C-b) :keys "C-u C-c C-f C-b"]
-      ["Typewriter" (TeX-font t ?\C-t) :keys "C-u C-c C-f C-t"]
-      ["Small Caps" (TeX-font t ?\C-c) :keys "C-u C-c C-f C-c"]
-      ["Sans Serif" (TeX-font t ?\C-f) :keys "C-u C-c C-f C-f"]
-      ["Italic"     (TeX-font t ?\C-i) :keys "C-u C-c C-f C-i"]
-      ["Slanted"    (TeX-font t ?\C-s) :keys "C-u C-c C-f C-s"]
-      ["Roman"      (TeX-font t ?\C-r) :keys "C-u C-c C-f C-r"]
-      ["Calligraphic" (TeX-font t ?\C-a) :keys "C-u C-c C-f C-a"])
-     ["Delete Font" (TeX-font t ?\C-d) :keys "C-c C-f C-d"]
-     "-"
-     ["Comment or Uncomment Region" comment-or-uncomment-region
-      :help "Comment or uncomment the currently selected region"]
-     ["Comment or Uncomment Paragraph" TeX-comment-or-uncomment-paragraph
-      :help "Comment or uncomment the paragraph containing point"]
-     ,TeX-fold-menu
-     "-" . ,TeX-common-menu-entries)))
+  `(["Macro..." TeX-insert-macro
+     :help "Insert a macro and possibly arguments"]
+    ["Complete" TeX-complete-symbol
+     :help "Complete the current macro"]
+    "-"
+    ("Insert Font"
+     ["Emphasize"  (TeX-font nil ?\C-e) :keys "C-c C-f C-e"]
+     ["Bold"       (TeX-font nil ?\C-b) :keys "C-c C-f C-b"]
+     ["Typewriter" (TeX-font nil ?\C-t) :keys "C-c C-f C-t"]
+     ["Small Caps" (TeX-font nil ?\C-c) :keys "C-c C-f C-c"]
+     ["Sans Serif" (TeX-font nil ?\C-f) :keys "C-c C-f C-f"]
+     ["Italic"     (TeX-font nil ?\C-i) :keys "C-c C-f C-i"]
+     ["Slanted"    (TeX-font nil ?\C-s) :keys "C-c C-f C-s"]
+     ["Roman"      (TeX-font nil ?\C-r) :keys "C-c C-f C-r"]
+     ["Calligraphic" (TeX-font nil ?\C-a) :keys "C-c C-f C-a"])
+    ("Replace Font"
+     ["Emphasize"  (TeX-font t ?\C-e) :keys "C-u C-c C-f C-e"]
+     ["Bold"       (TeX-font t ?\C-b) :keys "C-u C-c C-f C-b"]
+     ["Typewriter" (TeX-font t ?\C-t) :keys "C-u C-c C-f C-t"]
+     ["Small Caps" (TeX-font t ?\C-c) :keys "C-u C-c C-f C-c"]
+     ["Sans Serif" (TeX-font t ?\C-f) :keys "C-u C-c C-f C-f"]
+     ["Italic"     (TeX-font t ?\C-i) :keys "C-u C-c C-f C-i"]
+     ["Slanted"    (TeX-font t ?\C-s) :keys "C-u C-c C-f C-s"]
+     ["Roman"      (TeX-font t ?\C-r) :keys "C-u C-c C-f C-r"]
+     ["Calligraphic" (TeX-font t ?\C-a) :keys "C-u C-c C-f C-a"])
+    ["Delete Font" (TeX-font t ?\C-d) :keys "C-c C-f C-d"]
+    "-"
+    ["Comment or Uncomment Region" comment-or-uncomment-region
+     :help "Comment or uncomment the currently selected region"]
+    ["Comment or Uncomment Paragraph" TeX-comment-or-uncomment-paragraph
+     :help "Comment or uncomment the paragraph containing point"]
+    ,TeX-fold-menu
+    "-" . ,TeX-common-menu-entries))
 
 (easy-menu-define plain-TeX-mode-command-menu
     plain-TeX-mode-map
diff --git a/tex-buf.el b/tex-buf.el
index 12447d7..e89df51 100644
--- a/tex-buf.el
+++ b/tex-buf.el
@@ -3694,32 +3694,31 @@ forward, if negative)."
 (easy-menu-define TeX-error-overview-menu
   TeX-error-overview-mode-map
   "Menu used in TeX error overview mode."
-  (TeX-menu-with-help
-   '("TeX errors"
-     ["Next error" TeX-error-overview-next-error
-      :help "Jump to the next error"]
-     ["Previous error" TeX-error-overview-previous-error
-      :help "Jump to the previous error"]
-     ["Go to source" TeX-error-overview-goto-source
-      :help "Show the error in the source"]
-     ["Jump to source" TeX-error-overview-jump-to-source
-      :help "Move point to the error in the source"]
-     ["Go to log" TeX-error-overview-goto-log
-      :help "Show the error in the log buffer"]
-     "-"
-     ["Debug Bad Boxes" TeX-error-overview-toggle-debug-bad-boxes
-      :style toggle :selected TeX-debug-bad-boxes
-      :help "Show overfull and underfull boxes"]
-     ["Debug Warnings" TeX-error-overview-toggle-debug-warnings
-      :style toggle :selected TeX-debug-warnings
-      :help "Show warnings"]
-     ["Ignore Unimportant Warnings"
-      TeX-error-overview-toggle-suppress-ignored-warnings
-      :style toggle :selected TeX-suppress-ignored-warnings
-      :help "Hide specified warnings"]
-     "-"
-     ["Quit" TeX-error-overview-quit
-      :help "Quit"])))
+  '("TeX errors"
+    ["Next error" TeX-error-overview-next-error
+     :help "Jump to the next error"]
+    ["Previous error" TeX-error-overview-previous-error
+     :help "Jump to the previous error"]
+    ["Go to source" TeX-error-overview-goto-source
+     :help "Show the error in the source"]
+    ["Jump to source" TeX-error-overview-jump-to-source
+     :help "Move point to the error in the source"]
+    ["Go to log" TeX-error-overview-goto-log
+     :help "Show the error in the log buffer"]
+    "-"
+    ["Debug Bad Boxes" TeX-error-overview-toggle-debug-bad-boxes
+     :style toggle :selected TeX-debug-bad-boxes
+     :help "Show overfull and underfull boxes"]
+    ["Debug Warnings" TeX-error-overview-toggle-debug-warnings
+     :style toggle :selected TeX-debug-warnings
+     :help "Show warnings"]
+    ["Ignore Unimportant Warnings"
+     TeX-error-overview-toggle-suppress-ignored-warnings
+     :style toggle :selected TeX-suppress-ignored-warnings
+     :help "Hide specified warnings"]
+    "-"
+    ["Quit" TeX-error-overview-quit
+     :help "Quit"]))
 
 (defvar TeX-error-overview-list-entries nil
   "List of errors to be used in the error overview.")
diff --git a/tex-info.el b/tex-info.el
index 52d01be..3fc868f 100644
--- a/tex-info.el
+++ b/tex-info.el
@@ -535,58 +535,57 @@ is assumed by default."
 (easy-menu-define Texinfo-mode-menu
   Texinfo-mode-map
   "Menu used in Texinfo mode."
-  (TeX-menu-with-help
-   `("Texinfo"
-     ["Node ..." address@hidden
-      :help "Insert a node"]
-     ["Macro ..." TeX-insert-macro
-      :help "Insert a macro and possibly arguments"]
-     ["Complete Macro" TeX-complete-symbol
-      :help "Complete the current macro"]
-     ["Environment ..." Texinfo-insert-environment
-      :help "Insert an environment"]
-     ["Item" address@hidden
-      :help "Insert an @item"]
-     "-"
-     ("Insert Font"
-      ["Emphasize"  (TeX-font nil ?\C-e) :keys "C-c C-f C-e"]
-      ["Bold"       (TeX-font nil ?\C-b) :keys "C-c C-f C-b"]
-      ["Typewriter" (TeX-font nil ?\C-t) :keys "C-c C-f C-t"]
-      ["Small Caps" (TeX-font nil ?\C-c) :keys "C-c C-f C-c"]
-      ["Italic"     (TeX-font nil ?\C-i) :keys "C-c C-f C-i"]
-      ["Sample"    (TeX-font nil ?\C-s) :keys "C-c C-f C-s"]
-      ["Roman"      (TeX-font nil ?\C-r) :keys "C-c C-f C-r"])
-     ("Replace Font"
-      ["Emphasize"  (TeX-font t ?\C-e) :keys "C-u C-c C-f C-e"]
-      ["Bold"       (TeX-font t ?\C-b) :keys "C-u C-c C-f C-b"]
-      ["Typewriter" (TeX-font t ?\C-t) :keys "C-u C-c C-f C-t"]
-      ["Small Caps" (TeX-font t ?\C-c) :keys "C-u C-c C-f C-c"]
-      ["Italic"     (TeX-font t ?\C-i) :keys "C-u C-c C-f C-i"]
-      ["Sample"    (TeX-font t ?\C-s) :keys "C-u C-c C-f C-s"]
-      ["Roman"      (TeX-font t ?\C-r) :keys "C-u C-c C-f C-r"])
-     ["Delete Font" (TeX-font t ?\C-d) :keys "C-c C-f C-d"]
-     "-"
-     ["Create Master Menu" texinfo-master-menu
-      :help "Make a master menu for the whole Texinfo file"]
-     ["Create Menu" texinfo-make-menu
-      :help "Make or update the menu for the current section"]
-     ["Update Node" texinfo-update-node
-      :help "Update the current node"]
-     ["Update Every Node" texinfo-every-node-update
-      :help "Update every node in the current file"]
-     ["Update All Menus" texinfo-all-menus-update
-      :help "Update every menu in the current file"]
-     "-"
-     ("Commenting"
-      ["Comment or Uncomment Region"
-       comment-or-uncomment-region
-       :help "Comment or uncomment the currently selected region"]
-      ["Comment or Uncomment Paragraph"
-       TeX-comment-or-uncomment-paragraph
-       :help "Comment or uncomment the current paragraph"])
-     ,TeX-fold-menu
-     "-"
-     . ,TeX-common-menu-entries)))
+  `("Texinfo"
+    ["Node ..." address@hidden
+     :help "Insert a node"]
+    ["Macro ..." TeX-insert-macro
+     :help "Insert a macro and possibly arguments"]
+    ["Complete Macro" TeX-complete-symbol
+     :help "Complete the current macro"]
+    ["Environment ..." Texinfo-insert-environment
+     :help "Insert an environment"]
+    ["Item" address@hidden
+     :help "Insert an @item"]
+    "-"
+    ("Insert Font"
+     ["Emphasize"  (TeX-font nil ?\C-e) :keys "C-c C-f C-e"]
+     ["Bold"       (TeX-font nil ?\C-b) :keys "C-c C-f C-b"]
+     ["Typewriter" (TeX-font nil ?\C-t) :keys "C-c C-f C-t"]
+     ["Small Caps" (TeX-font nil ?\C-c) :keys "C-c C-f C-c"]
+     ["Italic"     (TeX-font nil ?\C-i) :keys "C-c C-f C-i"]
+     ["Sample"    (TeX-font nil ?\C-s) :keys "C-c C-f C-s"]
+     ["Roman"      (TeX-font nil ?\C-r) :keys "C-c C-f C-r"])
+    ("Replace Font"
+     ["Emphasize"  (TeX-font t ?\C-e) :keys "C-u C-c C-f C-e"]
+     ["Bold"       (TeX-font t ?\C-b) :keys "C-u C-c C-f C-b"]
+     ["Typewriter" (TeX-font t ?\C-t) :keys "C-u C-c C-f C-t"]
+     ["Small Caps" (TeX-font t ?\C-c) :keys "C-u C-c C-f C-c"]
+     ["Italic"     (TeX-font t ?\C-i) :keys "C-u C-c C-f C-i"]
+     ["Sample"    (TeX-font t ?\C-s) :keys "C-u C-c C-f C-s"]
+     ["Roman"      (TeX-font t ?\C-r) :keys "C-u C-c C-f C-r"])
+    ["Delete Font" (TeX-font t ?\C-d) :keys "C-c C-f C-d"]
+    "-"
+    ["Create Master Menu" texinfo-master-menu
+     :help "Make a master menu for the whole Texinfo file"]
+    ["Create Menu" texinfo-make-menu
+     :help "Make or update the menu for the current section"]
+    ["Update Node" texinfo-update-node
+     :help "Update the current node"]
+    ["Update Every Node" texinfo-every-node-update
+     :help "Update every node in the current file"]
+    ["Update All Menus" texinfo-all-menus-update
+     :help "Update every menu in the current file"]
+    "-"
+    ("Commenting"
+     ["Comment or Uncomment Region"
+      comment-or-uncomment-region
+      :help "Comment or uncomment the currently selected region"]
+     ["Comment or Uncomment Paragraph"
+      TeX-comment-or-uncomment-paragraph
+      :help "Comment or uncomment the current paragraph"])
+    ,TeX-fold-menu
+    "-"
+    . ,TeX-common-menu-entries))
 
 (defvar Texinfo-font-list
   '((?\C-b "@b{" "}")
diff --git a/tex.el b/tex.el
index bb34660..980c308 100644
--- a/tex.el
+++ b/tex.el
@@ -649,32 +649,6 @@ emacs 24.1 and is then later run by emacs 24.5."
 
 (require 'easymenu)
 
-(eval-and-compile
-  (if (featurep 'xemacs)
-      (defun TeX-maybe-remove-help (menu)
-      "Removes :help entries from menus, since XEmacs does not like them


reply via email to

[Prev in Thread] Current Thread [Next in Thread]