[elpa] externals/hyperbole 84726a2b15 2/3: Merge master with Mats lexical hui-minit from hyperbole

[ELPA Syncer]

branch: externals/hyperbole
commit 84726a2b15135dca381737e45518e8d91c724c6f
Merge: f3bd0668b9 c8b94355d0
Author: Robert Weiner <rsw@gnu.org>
Commit: Robert Weiner <rsw@gnu.org>

    Merge master with Mats lexical hui-minit from hyperbole
---
 ChangeLog   |  6 ++++++
 Makefile    |  8 +++-----
 hui-mini.el | 28 +++++++++++++---------------
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 590c0df141..7b215af1b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -12,6 +12,12 @@
     included in 'rest-of-path' in which case only the preceding part of the dir
     should be returned.
 
+2021-12-31  Mats Lidell  <matsl@gnu.org>
+
+* Makefile (EL_SRC): Remove EL_SRC, compile all el-files.
+
+* hui-mini.el: Use lexical binding.
+
 2021-12-31  Bob Weiner  <rsw@gnu.org>
 
 * hui.el (hui:gbut-modify): Fix 'src-dir' to be dir of 'gbut:file' not 
default-directory.
diff --git a/Makefile b/Makefile
index 141258df79..c3d955fd67 100644
--- a/Makefile
+++ b/Makefile
@@ -151,8 +151,6 @@ EMACS_BATCH=$(EMACS) $(BATCHFLAGS) $(PRELOADS)
 # explicitly to those files which need it.
 VPATH = kotl man
 
-EL_SRC = hui-em-but.el
-
 EL_COMPILE = hact.el hactypes.el hargs.el hbdata.el hbmap.el hbut.el \
             hgnus.el hhist.el hib-debbugs.el hib-doc-id.el hib-kbd.el \
             hib-social.el hibtypes.el \
@@ -162,7 +160,7 @@ EL_COMPILE = hact.el hactypes.el hargs.el hbdata.el 
hbmap.el hbut.el \
             hycontrol.el hui-jmenu.el hui-menu.el hui-mini.el hui-mouse.el 
hui-select.el \
             hui-treemacs.el hui-window.el hui.el hvar.el hversion.el hvm.el 
hypb.el hyperbole.el \
             hyrolo-demo.el hyrolo-logic.el hyrolo-menu.el hyrolo.el 
hywconfig.el set.el hypb-ert.el \
-            hui-dired-sidebar.el hypb-maintenance.el
+            hui-dired-sidebar.el hypb-maintenance.el hui-em-but.el
 
 EL_KOTL = kotl/kexport.el kotl/kfile.el kotl/kfill.el kotl/kimport.el 
kotl/klabel.el \
          kotl/klink.el kotl/kmenu.el kotl/kotl-mode.el kotl/kotl-orgtbl.el \
@@ -185,13 +183,13 @@ ELC_KOTL = kotl/kexport.elc kotl/kfile.elc kotl/kfill.elc 
kotl/kimport.elc kotl/
 
 HY-TALK  = HY-TALK/.hypb HY-TALK/HYPB HY-TALK/HY-TALK.org
 
-HYPERBOLE_FILES = dir info html $(EL_SRC) $(EL_COMPILE) $(EL_KOTL) \
+HYPERBOLE_FILES = dir info html $(EL_COMPILE) $(EL_KOTL) \
        $(ELC_COMPILE) $(HY-TALK) ChangeLog COPYING Makefile HY-ABOUT 
HY-ANNOUNCE HY-NEWS \
        HY-WHY.kotl INSTALL DEMO DEMO-ROLO.otl MANIFEST README README.md _hypb 
.hypb smart-clib-sym \
        topwin.py hyperbole-banner.png $(man_dir)/hkey-help.txt \
        $(man_dir)/hyperbole.texi $(man_dir)/hyperbole.css 
$(man_dir)/version.texi
 
-EL_TAGS = $(EL_SRC) $(EL_COMPILE) $(EL_KOTL)
+EL_TAGS = $(EL_COMPILE) $(EL_KOTL)
 
 .SUFFIXES:            # Delete the default suffixes
 .SUFFIXES: .el .elc   # Define the list of file suffixes to match to rules
diff --git a/hui-mini.el b/hui-mini.el
index 301374ab72..1295d9bb5d 100644
--- a/hui-mini.el
+++ b/hui-mini.el
@@ -1,4 +1,4 @@
-;;; hui-mini.el --- Single line command menus for GNU Hyperbole
+;;; hui-mini.el --- Single line command menus for GNU Hyperbole   -*- 
lexical-binding: t; -*-
 ;;
 ;; Author:       Bob Weiner
 ;;
@@ -124,15 +124,14 @@ non-nil means show documentation for any item that is 
selected by the
 user.  HELP-STRING-FLAG non-nil means show only the first line of the
 documentation, not the full text."
   (setq hui:menu-keys "")
-  (let ((set-menu '(or (and menu (symbolp menu)
-                           (setq menu-alist
-                                 (cdr (assq menu (or menu-list hui:menus)))))
-                      (hypb:error "(hui:menu-act): Invalid menu symbol arg: 
`%s'"
-                                  menu)))
-       (show-menu t)
+  (let ((show-menu t)
        (rtn)
        menu-alist act-form)
-    (while (and show-menu (eval set-menu))
+    (while (and show-menu (or (and menu (symbolp menu)
+                                  (setq menu-alist
+                                        (cdr (assq menu (or menu-list 
hui:menus)))))
+                             (hypb:error "(hui:menu-act): Invalid menu symbol 
arg: `%s'"
+                                         menu)))
       (cond ((and (consp (setq act-form (hui:menu-select menu-alist doc-flag 
help-string-flag)))
                  (cdr act-form)
                  (symbolp (cdr act-form)))
@@ -174,14 +173,13 @@ Optional second argument MENU-LIST is a Hyperbole menu 
list structure from
 which to extract MENU.  It defaults to `hui:menus'.  See its definition for
 the menu list structure."
   (setq hui:menu-keys "")
-  (let ((set-menu '(or (and menu (symbolp menu)
-                           (setq menu-alist
-                                 (cdr (assq menu (or menu-list hui:menus)))))
-                      (hypb:error "(hui:menu-get-keys): Invalid menu symbol 
arg: `%s'"
-                             menu)))
-       (show-menu t)
+  (let ((show-menu t)
        menu-alist act-form)
-    (while (and show-menu (eval set-menu))
+    (while (and show-menu (or (and menu (symbolp menu)
+                                  (setq menu-alist
+                                        (cdr (assq menu (or menu-list 
hui:menus)))))
+                             (hypb:error "(hui:menu-get-keys): Invalid menu 
symbol arg: `%s'"
+                                         menu)))
       (cond ((and (consp (setq act-form (hui:menu-select menu-alist)))
                  (cdr act-form)
                  (symbolp (cdr act-form)))