[elpa] externals/olivetti bd06cf1 004/134: Added mode-map and menu

[Stefan Monnier]

branch: externals/olivetti
commit bd06cf1d90e2261eb7e337562890863b967d2952
Author: Paul Rankin <address@hidden>
Commit: Paul Rankin <address@hidden>

    Added mode-map and menu
---
 olivetti.el | 35 ++++++++++++++++++++++++-----------
 1 file changed, 24 insertions(+), 11 deletions(-)

diff --git a/olivetti.el b/olivetti.el
index 700622e..1d832ee 100644
--- a/olivetti.el
+++ b/olivetti.el
@@ -20,7 +20,7 @@
 
 ;;; Commentary:
 
-;; 
+;;
 
 ;;; Code:
 
@@ -56,6 +56,11 @@ This option does not affect file contents."
   :type '(choice (integer 66) (float 0.5))
   :group 'olivetti)
 
+(defcustom olivetti-hide-menu-bar nil
+  "Turn off `menu-bar-mode'."
+  :type 'boolean
+  :group 'olivetti)
+
 (defcustom olivetti-hide-tool-bar t
   "Turn off `tool-bar-mode'."
   :type 'boolean
@@ -93,16 +98,22 @@ Can cause display issues in console mode."
   (when olivetti-hide-fringes
     (set-window-fringes (selected-window) 0 0 t)))
 
-;; (easy-menu-define olivetti-mode-menu olivetti-mode-map
-;;   "Menu for Olivetti Mode."
-;;   '("Olivetti"
-;;     ["Use Clean Margins" ignore]
-;;     ["Hide Mode Line" ignore
-;;      :style toggle
-;;      :selected olivetti-hide-mode-line]))
-
-;; (defvar olivetti-mode-map nil
-;;   "Mode map for `olivetti-mode'.")
+(defvar olivetti-mode-map
+  (make-sparse-keymap)
+  "Mode map for `olivetti-mode'.")
+
+(easy-menu-define olivetti-mode-menu olivetti-mode-map
+  "Menu for Olivetti Mode."
+  '("Olivetti"
+    ["Hide Menu Bar" ignore
+     :style toggle
+     :selected olivetti-hide-menu-bar]
+    ["Hide Tool Bar" ignore
+     :style toggle
+     :selected olivetti-hide-tool-bar]
+    ["Hide Mode Line" ignore
+     :style toggle
+     :selected olivetti-hide-mode-line]))
 
 ;;;###autoload
 (defun turn-on-olivetti-mode ()
@@ -124,6 +135,8 @@ hidden."
   (if olivetti-mode
       (progn
         (setq-local scroll-conservatively 101)
+        (when olivetti-hide-menu-bar
+          (menu-bar-mode 0))
         (when olivetti-hide-tool-bar
           (tool-bar-mode 0))
         (when olivetti-hide-mode-line