emacs-elpa-diffs
[Top][All Lists]
Advanced

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

[elpa] externals/hyperbole cfc61a3 22/50: Eliminate a number of order-ba


From: Stefan Monnier
Subject: [elpa] externals/hyperbole cfc61a3 22/50: Eliminate a number of order-based byte-compilation warnings
Date: Wed, 17 Mar 2021 18:44:17 -0400 (EDT)

branch: externals/hyperbole
commit cfc61a3a5898202cc03592d478f8a6edcdec1886
Author: Bob Weiner <rsw@gnu.org>
Commit: Bob Weiner <rsw@gnu.org>

    Eliminate a number of order-based byte-compilation warnings
---
 hact.el     | 24 ++++++++++++------------
 hib-org.el  |  2 ++
 hsys-org.el |  1 +
 hyrolo.el   |  4 ++--
 4 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/hact.el b/hact.el
index bc10596..85200be 100644
--- a/hact.el
+++ b/hact.el
@@ -38,6 +38,18 @@ e.g. to inhibit actions.")
 (defvar symtable:category-plist nil
   "Holds a property list of Hyperbole type category symbols ('actypes or 
'ibtypes) and their associated symtables.")
 
+(defsubst symtable:hash-table (symtable)
+  "Return the hash-table containing symbol names and values from SYMTABLE."
+  (plist-get symtable 'hash-table))
+
+(defsubst symtable:name (symtable)
+  "Return the name of SYMTABLE as a string."
+  (plist-get symtable 'name))
+
+(defsubst symtable:select (type-category)
+  "Inline the return of the symtable for TYPE-CATEGORY, one of 'actypes or 
'ibtypes."
+  (plist-get symtable:category-plist type-category))
+
 (defun  symtable:operate (operation symbol-or-name symtable)
   "Call hash-table function OPERATION with Hyperbole SYMBOL-OR-NAME as key 
upon SYMTABLE.
 Trigger an error if SYMBOL-OR-NAME cannot be mapped to an existing Elisp
@@ -77,10 +89,6 @@ symbol or if SYMTABLE is invalid."
        (gethash def-name  hash-table))
       (_ (error "(symtable:operate): Invalid operation request: %s" 
operation)))))
 
-(defsubst symtable:select (type-category)
-  "Inline the return of the symtable for TYPE-CATEGORY, one of 'actypes or 
'ibtypes."
-  (plist-get symtable:category-plist type-category))
-
 (defun    symtable:create (name size)
   "Create and return a new Hyperbole type symbol table with NAME and SIZE.
 Also add it under the symbol for its NAME in `symtable:category-plist'."
@@ -89,14 +97,6 @@ Also add it under the symbol for its NAME in 
`symtable:category-plist'."
     (setq symtable:category-plist (plist-put symtable:category-plist (intern 
name) symtable))
     symtable))
 
-(defsubst symtable:hash-table (symtable)
-  "Return the hash-table containing symbol names and values from SYMTABLE."
-  (plist-get symtable 'hash-table))
-
-(defsubst symtable:name (symtable)
-  "Return the name of SYMTABLE as a string."
-  (plist-get symtable 'name))
-
 (defvar   symtable:actypes (symtable:create "actypes" 97)
   "Symbol table (hash table) of Hyperbole action type symbols.
 For each actype, there are two entries whose keys are strings: one
diff --git a/hib-org.el b/hib-org.el
index b2bd79b..7823694 100644
--- a/hib-org.el
+++ b/hib-org.el
@@ -26,6 +26,8 @@
 ;;; Other required Elisp libraries
 ;;; ************************************************************************
 
+(eval-when-compile (require 'hmouse-drv))
+
 (require 'hsys-org)
 
 ;;; ************************************************************************
diff --git a/hsys-org.el b/hsys-org.el
index 73ee9c0..5521e26 100644
--- a/hsys-org.el
+++ b/hsys-org.el
@@ -20,6 +20,7 @@
 
 (require 'hbut)
 (require 'org)
+(require 'org-element)
 
 (defcustom inhibit-hsys-org nil
   "*Non-nil means disable Action Key support in Org major and minor modes."
diff --git a/hyrolo.el b/hyrolo.el
index b765c75..1a48061 100644
--- a/hyrolo.el
+++ b/hyrolo.el
@@ -452,7 +452,7 @@ search for the current match regular expression rather than 
string."
       (hyrolo-isearch-regexp)
     (hyrolo-verify)
     (setq unread-command-events
-         (append unread-command-events (map #'list #'identity (regexp-quote 
hyrolo-match-regexp))))
+         (append unread-command-events (string-to-list (regexp-quote 
hyrolo-match-regexp))))
     (let ((case-fold-search t))
       (isearch-forward))))
 
@@ -1237,7 +1237,7 @@ Then add characters to further narrow the search."
   (hyrolo-verify)
   (if (stringp regexp)
       (setq unread-command-events
-           (append unread-command-events (map #'list #'identity regexp))))
+           (append unread-command-events (string-to-list regexp))))
   (let ((case-fold-search t))
     (isearch-forward-regexp)))
 



reply via email to

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