From 1459ad2c670e7633f426d7a5a7f05fab23195b32 Mon Sep 17 00:00:00 2001
From: Gemini Lasswell <gazally@runbox.com>
Date: Sun, 15 Jul 2018 15:45:43 -0700
Subject: [PATCH] Add a menu for backtrace-mode

* lisp/emacs-lisp/backtrace.el (backtrace-mode-map): Add a menu.
* lisp/emacs-lisp/debug.el (debugger-mode-map): Change menu text for
'backtrace-help-follow-symbol' to better describe what it does.
---
 lisp/emacs-lisp/backtrace.el | 22 ++++++++++++++++++++++
 lisp/emacs-lisp/debug.el     |  4 ++--
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/lisp/emacs-lisp/backtrace.el b/lisp/emacs-lisp/backtrace.el
index da5a777177d..b6ca2890764 100644
--- a/lisp/emacs-lisp/backtrace.el
+++ b/lisp/emacs-lisp/backtrace.el
@@ -194,6 +194,28 @@ This is commonly used to recompute `backtrace-frames'.")
     (define-key map "." 'backtrace-expand-ellipses)
     (define-key map [follow-link] 'mouse-face)
     (define-key map [mouse-2] 'mouse-select-window)
+    (easy-menu-define nil map ""
+      '("Backtrace"
+        ["Next Frame" backtrace-forward-frame
+         :help "Move cursor forwards to the start of a backtrace frame"]
+        ["Previous Frame" backtrace-backward-frame
+         :help "Move cursor backwards to the start of a backtrace frame"]
+        "--"
+        ["Show Variables" backtrace-toggle-locals
+         :style toggle
+         :active (backtrace-get-index)
+         :selected (plist-get (backtrace-get-view) :show-locals)
+         :help "Show or hide the local variables for the frame at point"]
+        ["Expand \"...\"s" backtrace-expand-ellipses
+         :help "Expand all the abbreviated forms in the current frame"]
+        ["Show on Multiple Lines" backtrace-pretty-print
+         :help "Use line breaks and indentation to make a form more readable"]
+        ["Collapse to Single Line" backtrace-collapse]
+        "--"
+        ["Help for Symbol" backtrace-help-follow-symbol
+         :help "Show help for symbol at point"]
+        ["Describe Backtrace Mode" describe-mode
+         :help "Display documentation for backtrace-mode"]))
     map)
   "Local keymap for `backtrace-mode' buffers.")
 
diff --git a/lisp/emacs-lisp/debug.el b/lisp/emacs-lisp/debug.el
index c6057b0bdb8..7fc2b41c70c 100644
--- a/lisp/emacs-lisp/debug.el
+++ b/lisp/emacs-lisp/debug.el
@@ -567,8 +567,8 @@ The environment used is the one when entering the activation frame at point."
         "--"
         ["Next Line" next-line
          :help "Move cursor down"]
-        ["Help Follow" backtrace-help-follow-symbol
-         :help "Follow cross-reference"]
+        ["Help for Symbol" backtrace-help-follow-symbol
+         :help "Show help for symbol at point"]
         ["Describe Debugger Mode" describe-mode
          :help "Display documentation for debugger-mode"]
         "--"
-- 
2.39.2