branch: externals/hyperbole
commit 6028a64de69749e2c2dd1bed01f3c819e1b6fc86
Author: Mats Lidell <mats.lid...@lidells.se>
Commit: GitHub <nore...@github.com>
Pieces of patch set from Stefan (#116)
---
ChangeLog | 8 ++++++++
hact.el | 17 +++++++++--------
hactypes.el | 14 +++++++-------
hargs.el | 2 +-
hbdata.el | 6 +++---
hbut.el | 36 ++++++++++++++++++------------------
hib-kbd.el | 4 ++--
hib-social.el | 4 ++--
hibtypes.el | 4 ++--
hinit.el | 4 ++--
hload-path.el | 4 ++--
hmouse-drv.el | 4 ++--
hmouse-info.el | 4 ++--
hmouse-tag.el | 4 ++--
hsettings.el | 12 ++++++------
hsys-org.el | 4 ++--
hui-em-but.el | 2 +-
hui-menu.el | 6 +++---
hui-mini.el | 10 +++++-----
hui-mouse.el | 10 +++++-----
hui.el | 10 +++++-----
hversion.el | 6 +++---
hywconfig.el | 7 ++++---
kotl/kimport.el | 4 ++--
kotl/kotl-mode.el | 4 ++--
kotl/kproperty.el | 2 +-
kotl/kvspec.el | 4 ++--
set.el | 4 ++--
28 files changed, 105 insertions(+), 95 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9285081..1bf390e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2021-09-12 Mats Lidell <ma...@gnu.org>
+
+* Part three of patch from Stefam Monnier. Thank you Stefan.
+ Incluces updates:
+ - Use lexical scoping
+ - Update copyright notice
+ - Use #'-syntax for functions
+
2021-09-11 Mats Lidell <ma...@gnu.org>
* hsettings.el (hyperbole-web-search-browser-function): Use
diff --git a/hact.el b/hact.el
index 5eb1d3b..fa704a2 100644
--- a/hact.el
+++ b/hact.el
@@ -1,10 +1,10 @@
-;;; hact.el --- GNU Hyperbole button action handling
+;;; hact.el --- GNU Hyperbole button action handling -*- lexical-binding: t;
-*-
;;
;; Author: Bob Weiner
;;
;; Orig-Date: 18-Sep-91 at 02:57:09
;;
-;; Copyright (C) 1991-2016 Free Software Foundation, Inc.
+;; Copyright (C) 1991-2021 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
;;
;; This file is part of GNU Hyperbole.
@@ -36,7 +36,8 @@ 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.")
+ "Property list mapping Hyperbole type category symbols to symtables.
+The type categories are either 'actypes or 'ibtypes.")
(defsubst symtable:hash-table (symtable)
"Return the hash-table containing symbol names and values from SYMTABLE."
@@ -125,7 +126,7 @@ Return the Elisp symbol for SYMBOL-OR-NAME.
Caller must ensure SYMBOL-OR-NAME is a symbol or string."
(symtable:operate #'puthash symbol-or-name symtable))
-(defalias 'symtable:delete 'symtable:remove)
+(defalias 'symtable:delete #'symtable:remove)
(defun symtable:get (symbol-or-name symtable)
"Return the Elisp symbol given by Hyperbole SYMBOL-OR-NAME if it is in
existing SYMTABLE, else nil.
@@ -166,7 +167,7 @@ Use `eq' for comparison."
"Set SYMBOL's symset to nil."
(setf (symbol-plist symbol) nil))
-(defalias 'symset:delete 'symset:remove)
+(defalias 'symset:delete #'symset:remove)
(defun symset:get (symbol property)
"Return SYMBOL's PROPERTY set."
@@ -247,7 +248,7 @@ Return the Hyperbole symbol for the TYPE if it existed,
else nil."
(defun htype:names (type-category &optional sym)
"Return a list of the current definition names for TYPE-CATEGORY in priority
order.
Definition names do not contain the category prefix.
-TYPE-CATEGORY should be 'actypes, 'ibtypes or nil for all.
+TYPE-CATEGORY should be `actypes', `ibtypes' or nil for all.
When optional SYM is given, returns the name for that symbol only, if any."
(let ((types (symset:get type-category 'symbols))
(sym-name (when sym (symbol-name sym))))
@@ -419,7 +420,7 @@ performing ACTION."
(hhist:add hist-elt))))))
;; Return the full Elisp symbol for ACTYPE, which may be a string or symbol.
-(defalias 'actype:elisp-symbol 'symtable:actype-p)
+(defalias 'actype:elisp-symbol #'symtable:actype-p)
(defun actype:def-symbol (actype)
"Return the abbreviated symbol for ACTYPE used in its `defact'.
@@ -490,7 +491,6 @@ Return symbol created when successful, else nil."
(symtable:add ',type symtable:actypes)
(htype:create ,type actypes ,doc ,params ,default-action nil)))
-(defalias 'actype:create 'defact)
(put 'defact 'lisp-indent-function 'defun)
;; Support edebug-defun for interactive debugging of actypes
@@ -503,6 +503,7 @@ Return symbol created when successful, else nil."
(([&rest arg]
[&optional ["&optional" arg &rest arg]]
&optional ["&rest" arg])))
+(defalias 'actype:create #'defact)
(defun actype:delete (type)
"Delete an action TYPE (a symbol). Return TYPE's symbol if it existed."
diff --git a/hactypes.el b/hactypes.el
index 78c4cdb..b769af5 100644
--- a/hactypes.el
+++ b/hactypes.el
@@ -1,10 +1,10 @@
-;;; hactypes.el --- Default action types for GNU Hyperbole
+;;; hactypes.el --- Default action types for GNU Hyperbole -*-
lexical-binding: t; -*-
;;
;; Author: Bob Weiner
;;
;; Orig-Date: 23-Sep-91 at 20:34:36
;;
-;; Copyright (C) 1991-2016 Free Software Foundation, Inc.
+;; Copyright (C) 1991-2021 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
;;
;; This file is part of GNU Hyperbole.
@@ -58,7 +58,7 @@ inserted, delete the completions window."
(defact display-boolean (bool-expr)
"Display a message showing the result value of a BOOL-EXPR.
Return any non-nil value or t."
- (let ((result (eval bool-expr)))
+ (let ((result (eval bool-expr t)))
(message "Boolean result (%s) = %s" (if result "True" "False")
(prin1-to-string result))
(or result t)))
@@ -71,7 +71,7 @@ Return any non-nil value or t."
(defact eval-elisp (lisp-expr)
"Evaluate a Lisp expression LISP-EXPR for its side-effects and return any
non-nil value."
(interactive "xLisp to eval: ")
- (eval lisp-expr))
+ (eval lisp-expr t))
(defact exec-kbd-macro (kbd-macro &optional repeat-count)
"Execute KBD-MACRO REPEAT-COUNT times.
@@ -443,7 +443,7 @@ compatibility with the `hlink' function."
(while (string-equal "" (setq but-lbl
(hargs:read-match
"Global button to link to: "
- (mapcar 'list (gbut:label-list))
+ (mapcar #'list (gbut:label-list))
nil t nil 'gbut)))
(beep))
(hbut:label-to-key but-lbl))))))
@@ -487,8 +487,8 @@ and its buffer must have a file attached."
;; an invalid link, but it is difficult to tell which operation
;; is in progress, so ignore this for now. -- RSW, 01-25-2020
- ;; When not on an ibut and moddifying the link, use existing arguments
- (if (and (boundp 'defaults) defaults (listp defaults))
+ ;; When not on an ibut and modifying the link, use existing arguments
+ (if (and (bound-and-true-p defaults) (listp defaults))
defaults
(list nil nil nil)))))
(let (but
diff --git a/hargs.el b/hargs.el
index 2a85f12..0e08d14 100644
--- a/hargs.el
+++ b/hargs.el
@@ -4,7 +4,7 @@
;;
;; Orig-Date: 31-Oct-91 at 23:17:35
;;
-;; Copyright (C) 1991-2019 Free Software Foundation, Inc.
+;; Copyright (C) 1991-2021 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
;;
;; This file is part of GNU Hyperbole.
diff --git a/hbdata.el b/hbdata.el
index a3887a6..01e81af 100644
--- a/hbdata.el
+++ b/hbdata.el
@@ -1,10 +1,10 @@
-;;; hbdata.el --- GNU Hyperbole button attribute accessor functions
+;;; hbdata.el --- GNU Hyperbole button attribute accessor functions -*-
lexical-binding: t; -*-
;;
;; Author: Bob Weiner
;;
;; Orig-Date: 2-Apr-91
;;
-;; Copyright (C) 1991-2016 Free Software Foundation, Inc.
+;; Copyright (C) 1991-2021 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
;;
;; This file is part of GNU Hyperbole.
@@ -202,7 +202,7 @@ Nil BUT-SYM means use 'hbut:current'. If successful,
return a cons of
(args (hattr:get b 'args)))
;; Replace matches for variable values with their
variable names in any pathname args.
(hattr:set b 'args
- (mapcar 'hpath:substitute-var
+ (mapcar #'hpath:substitute-var
(if mail-dir
;; Make pathname args
absolute for outgoing mail and news messages.
(hpath:absolute-arguments
args mail-dir)
diff --git a/hbut.el b/hbut.el
index 563e896..f81d142 100644
--- a/hbut.el
+++ b/hbut.el
@@ -1,10 +1,10 @@
-;;; hbut.el --- GNU Hyperbole button constructs
+;;; hbut.el --- GNU Hyperbole button constructs -*- lexical-binding: t; -*-
;;
;; Author: Bob Weiner
;;
;; Orig-Date: 18-Sep-91 at 02:57:09
;;
-;; Copyright (C) 1991-2016 Free Software Foundation, Inc.
+;; Copyright (C) 1991-2021 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
;;
;; This file is part of GNU Hyperbole.
@@ -54,7 +54,7 @@ Nil disables saving.")
"Return alist of ebuts in FILE or the current buffer.
Each element is a list of just an explicit button label. For use
as a completion table."
- (mapcar 'list (ebut:list file)))
+ (mapcar #'list (ebut:list file)))
(defun ebut:at-p (&optional start-delim end-delim)
"Return explicit Hyperbole button at point or nil.
@@ -173,10 +173,10 @@ Return nil if no matching button is found."
(and (stringp key) (stringp label)
(equal key (downcase (ebut:label-to-key label)))))
-(defalias 'ebut:key-src 'hbut:key-src)
-(defalias 'ebut:key-src-set-buffer 'hbut:key-src-set-buffer)
-(defalias 'ebut:key-src-fmt 'hbut:key-src-fmt)
-(defalias 'ebut:key-to-label 'hbut:key-to-label)
+(defalias 'ebut:key-src #'hbut:key-src)
+(defalias 'ebut:key-src-set-buffer #'hbut:key-src-set-buffer)
+(defalias 'ebut:key-src-fmt #'hbut:key-src-fmt)
+(defalias 'ebut:key-to-label #'hbut:key-to-label)
(defun ebut:label-p (&optional as-label start-delim end-delim pos-flag
two-lines-flag)
"Return key for the Hyperbole explicit button label that point is within,
else nil.
@@ -236,9 +236,9 @@ label search to two lines."
(list lbl-key but-start but-end)))
(t (if as-label (ebut:key-to-label lbl-key) lbl-key))))))))
-(defalias 'ebut:label-regexp 'hbut:label-regexp)
+(defalias 'ebut:label-regexp #'hbut:label-regexp)
-(defalias 'ebut:label-to-key 'hbut:label-to-key)
+(defalias 'ebut:label-to-key #'hbut:label-to-key)
(defun ebut:list (&optional file loc-p)
"Return list of button labels from in FILE or the current buffer.
@@ -260,7 +260,7 @@ positions at which the button delimiter begins and ends."
(ebut:key-to-label (ebut:label-to-key lbl)))))))
(if loc-p buts (when buts (apply #'set:create buts))))))
-(defalias 'map-ebut 'ebut:map)
+(defalias 'map-ebut #'ebut:map)
(defun ebut:map (but-func &optional regexp-match include-delims)
"Apply BUT-FUNC to the explicit buttons in the visible part of the current
buffer.
@@ -600,7 +600,7 @@ Insert INSTANCE-FLAG after END, before ending delimiter."
(defun gbut:act (label)
"Activate Hyperbole global button with LABEL."
(interactive (list (hargs:read-match "Activate global button labeled: "
- (mapcar 'list (gbut:label-list))
+ (mapcar #'list (gbut:label-list))
nil t nil 'gbut)))
(cond ((null label)
(error "(gbut:act): You have not created any global buttons"))
@@ -642,7 +642,7 @@ Return nil if no matching button is found."
(defun gbut:label-list ()
"Return list of global button labels."
- (mapcar 'hbut:key-to-label (gbut:key-list)))
+ (mapcar #'hbut:key-to-label (gbut:key-list)))
(defun gbut:ebut-program (label actype &rest args)
"Programmatically create a global explicit Hyperbole button at point from
LABEL, ACTYPE (action type), and optional actype ARGS.
@@ -661,7 +661,7 @@ For interactive creation, use `hui:gbut-create' instead."
(goto-char (point-max))
(when (not (bolp))
(insert "\n"))
- (eval `(ebut:program label actype ,@args))))))
+ (eval `(ebut:program ',label ',actype ,@args))))))
(defun gbut:to (lbl-key)
"Find the global button with LBL-KEY (a label or label key) within the
visible portion of the global button file.
@@ -817,7 +817,7 @@ Suitable for use as part of `write-file-functions'."
"Set OBJ-SYMBOL's attribute ATTR-SYMBOL to ATTR-VALUE and return ATR-VALUE."
(put obj-symbol attr-symbol attr-value))
-(defalias 'hattr:summarize 'hattr:report)
+(defalias 'hattr:summarize #'hattr:report)
(defvar hattr:filename
(if hyperb:microsoft-os-p "_hypb" ".hypb")
@@ -1335,7 +1335,7 @@ source file for the buttons in the menu, if any.")
(defun hbut:label-list ()
"Return list of current buffer's Hyperbole button labels."
- (mapcar 'hbut:key-to-label (hbut:key-list)))
+ (mapcar #'hbut:key-to-label (hbut:key-list)))
;;; ------------------------------------------------------------------------
@@ -1385,7 +1385,7 @@ source file for the buttons in the menu, if any.")
"Return alist of labeled ibuts in FILE or the current buffer.
Each element is a list of just an implicit button label. For use
as a completion table."
- (mapcar 'list (ibut:list file)))
+ (mapcar #'list (ibut:list file)))
(defun ibut:at-p (&optional key-only)
"Return symbol for implicit button at point, else nil.
@@ -1962,8 +1962,8 @@ use `defib'."
(&define name [&or stringp lambda-list]
[&optional stringp])) ; Match the doc string, if present.
-(defalias 'ibtype:create-action-link-type 'defal)
-(defalias 'ibtype:create-regexp-link-type 'defil)
+(defalias 'ibtype:create-action-link-type #'defal)
+(defalias 'ibtype:create-regexp-link-type #'defil)
(defun ibtype:def-symbol (ibtype)
"Return the abbreviated symbol for IBTYPE used in its `defib'.
diff --git a/hib-kbd.el b/hib-kbd.el
index 035ff49..ed9ceeb 100644
--- a/hib-kbd.el
+++ b/hib-kbd.el
@@ -1,10 +1,10 @@
-;;; hib-kbd.el --- Implicit button type for key sequences delimited with {}.
+;;; hib-kbd.el --- Implicit button type for key sequences delimited with {}.
-*- lexical-binding: t; -*-
;;
;; Author: Bob Weiner
;;
;; Orig-Date: 22-Nov-91 at 01:37:57
;;
-;; Copyright (C) 1991-2020 Free Software Foundation, Inc.
+;; Copyright (C) 1991-2021 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
;;
;; This file is part of GNU Hyperbole.
diff --git a/hib-social.el b/hib-social.el
index 03cfd02..3635541 100644
--- a/hib-social.el
+++ b/hib-social.el
@@ -1,10 +1,10 @@
-;;; hib-social.el --- Implicit button type for social media/git hashtag and
username references
+;;; hib-social.el --- Implicit button type for social media/git hashtag and
username references -*- lexical-binding: t; -*-
;;
;; Author: Bob Weiner
;;
;; Orig-Date: 20-Jul-16 at 22:41:34
;;
-;; Copyright (C) 2016-2020 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2021 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
;;
;; This file is part of GNU Hyperbole.
diff --git a/hibtypes.el b/hibtypes.el
index f750b76..c8de177 100644
--- a/hibtypes.el
+++ b/hibtypes.el
@@ -1,10 +1,10 @@
-;;; hibtypes.el --- GNU Hyperbole default implicit button types
+;;; hibtypes.el --- GNU Hyperbole default implicit button types -*-
lexical-binding: t; -*-
;;
;; Author: Bob Weiner
;;
;; Orig-Date: 19-Sep-91 at 20:45:31
;;
-;; Copyright (C) 1991-2019 Free Software Foundation, Inc.
+;; Copyright (C) 1991-2021 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
;;
;; This file is part of GNU Hyperbole.
diff --git a/hinit.el b/hinit.el
index 9172a8e..980171a 100644
--- a/hinit.el
+++ b/hinit.el
@@ -1,10 +1,10 @@
-;;; hinit.el --- Standard initializations for GNU Hyperbole
+;;; hinit.el --- Standard initializations for GNU Hyperbole -*-
lexical-binding: t; -*-
;;
;; Author: Bob Weiner
;;
;; Orig-Date: 1-Oct-91 at 02:32:51
;;
-;; Copyright (C) 1991-2019 Free Software Foundation, Inc.
+;; Copyright (C) 1991-2021 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
;;
;; This file is part of GNU Hyperbole.
diff --git a/hload-path.el b/hload-path.el
index 53c69cc..1d946fb 100644
--- a/hload-path.el
+++ b/hload-path.el
@@ -1,10 +1,10 @@
-;;; hload-path.el --- GNU Hyperbole load-path setup
+;;; hload-path.el --- GNU Hyperbole load-path setup -*- lexical-binding: t;
-*-
;;
;; Author: Bob Weiner
;;
;; Orig-Date: 29-Jun-16 at 14:39:33
;;
-;; Copyright (C) 1992-2019 Free Software Foundation, Inc.
+;; Copyright (C) 1992-2021 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
;;
;; This file is part of GNU Hyperbole.
diff --git a/hmouse-drv.el b/hmouse-drv.el
index 0ca6b14..03d6812 100644
--- a/hmouse-drv.el
+++ b/hmouse-drv.el
@@ -1,10 +1,10 @@
-;;; hmouse-drv.el --- Smart Key/Mouse driver functions.
+;;; hmouse-drv.el --- Smart Key/Mouse driver functions. -*- lexical-binding:
t; -*-
;;
;; Author: Bob Weiner
;;
;; Orig-Date: 04-Feb-90
;;
-;; Copyright (C) 1989-2019 Free Software Foundation, Inc.
+;; Copyright (C) 1989-2021 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
;;
;; This file is part of GNU Hyperbole.
diff --git a/hmouse-info.el b/hmouse-info.el
index a6ee585..77f9e32 100644
--- a/hmouse-info.el
+++ b/hmouse-info.el
@@ -1,10 +1,10 @@
-;;; hmouse-info.el --- Walks through Info networks using one key.
+;;; hmouse-info.el --- Walks through Info networks using one key. -*-
lexical-binding: t; -*-
;;
;; Author: Bob Weiner
;;
;; Orig-Date: 04-Apr-89
;;
-;; Copyright (C) 1989-2019 Free Software Foundation, Inc.
+;; Copyright (C) 1989-2021 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
;;
;; This file is part of GNU Hyperbole.
diff --git a/hmouse-tag.el b/hmouse-tag.el
index 6694c9d..2486991 100644
--- a/hmouse-tag.el
+++ b/hmouse-tag.el
@@ -1,10 +1,10 @@
-;;; hmouse-tag.el --- Smart Key support of programming language constructs
+;;; hmouse-tag.el --- Smart Key support of programming language constructs
-*- lexical-binding: t; -*-
;;
;; Author: Bob Weiner
;;
;; Orig-Date: 24-Aug-91
;;
-;; Copyright (C) 1991-2019 Free Software Foundation, Inc.
+;; Copyright (C) 1991-2021 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
;;
;; This file is part of GNU Hyperbole.
diff --git a/hsettings.el b/hsettings.el
index 94d6f46..f3a42ba 100644
--- a/hsettings.el
+++ b/hsettings.el
@@ -1,4 +1,4 @@
-;;; hsettings.el --- GNU Hyperbole settings which may require customization
+;;; hsettings.el --- GNU Hyperbole settings which may require customization
-*- lexical-binding: t; -*-
;;
;; Author: Bob Weiner
;;
@@ -263,16 +263,16 @@ obtained search string."
(require 'hui-em-but)
;; Highlight explicit buttons whenever a file is read in.
(add-hook 'find-file-hook #'hproperty:but-create t)
- (defalias 'hui:but-flash 'hproperty:but-flash)))
+ (defalias 'hui:but-flash #'hproperty:but-flash)))
;;; ************************************************************************
;;; ONLINE LIBRARY CONFIGURATION
;;; ************************************************************************
-;;; Support for online library document id references is loaded here but
-;;; requires some additional configuration before use. See the DESCRIPTION
-;;; section in "hib-doc-id.el" for complete installation and use information.
-;;;
+;; Support for online library document id references is loaded here but
+;; requires some additional configuration before use. See the DESCRIPTION
+;; section in "hib-doc-id.el" for complete installation and use information.
+;;
(add-hook 'hibtypes-end-load-hook (lambda () (require 'hib-doc-id)))
;;; ************************************************************************
diff --git a/hsys-org.el b/hsys-org.el
index 634d1ed..ead0519 100644
--- a/hsys-org.el
+++ b/hsys-org.el
@@ -1,10 +1,10 @@
-;;; hsys-org.el --- GNU Hyperbole support functions for Org mode
+;;; hsys-org.el --- GNU Hyperbole support functions for Org mode -*-
lexical-binding: t; -*-
;;
;; Author: Bob Weiner
;;
;; Orig-Date: 2-Jul-16 at 14:54:14
;;
-;; Copyright (C) 2016-2020 Free Software Foundation, Inc.
+;; Copyright (C) 2016-2021 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
;;
;; This file is part of GNU Hyperbole.
diff --git a/hui-em-but.el b/hui-em-but.el
index e1016ba..e68508e 100644
--- a/hui-em-but.el
+++ b/hui-em-but.el
@@ -4,7 +4,7 @@
;;
;; Orig-Date: 21-Aug-92
;;
-;; Copyright (C) 1992-2020 Free Software Foundation, Inc.
+;; Copyright (C) 1992-2021 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
;;
;; This file is part of GNU Hyperbole.
diff --git a/hui-menu.el b/hui-menu.el
index f784244..154d5ae 100644
--- a/hui-menu.el
+++ b/hui-menu.el
@@ -4,7 +4,7 @@
;;
;; Orig-Date: 28-Oct-94 at 10:59:44
;;
-;; Copyright (C) 1994-2019 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2021 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
;;
;; This file is part of GNU Hyperbole.
@@ -89,7 +89,7 @@
"Activate:")
(mapcar (lambda (label) (vector label `(ebut:act
,label) t))
(if hui-menu-order-explicit-buttons
- (sort labels 'string-lessp)
+ (sort labels #'string-lessp)
labels))
(if cutoff '(". . ."))
'("----" "----"))))))
@@ -212,7 +212,7 @@ Return t if cutoff, else nil."
`(setq hpath:display-where ',sym)
:style 'radio
:selected `(eq hpath:display-where ',sym)))
- (mapcar 'car hpath:display-where-alist))))
+ (mapcar #'car hpath:display-where-alist))))
'("----")
(hui-menu-browser "Display-URLs-in" browse-url-browser-function)
'("----")
diff --git a/hui-mini.el b/hui-mini.el
index 8d1ef15..6e3d2d7 100644
--- a/hui-mini.el
+++ b/hui-mini.el
@@ -4,7 +4,7 @@
;;
;; Orig-Date: 15-Oct-91 at 20:13:17
;;
-;; Copyright (C) 1991-2019 Free Software Foundation, Inc.
+;; Copyright (C) 1991-2021 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
;;
;; This file is part of GNU Hyperbole.
@@ -221,7 +221,7 @@ With optional HELP-STRING-FLAG, instead returns the one
line help string for the
(hypb:error "(hui:menu-doc): The 'hyperbole' command must be bound to a
key"))
(setq unread-command-events
(nconc unread-command-events
- (mapcar 'identity (substring key-sequence (length
hmenu-key-seq)))))
+ (mapcar #'identity (substring key-sequence (length
hmenu-key-seq)))))
(prog1 (hui:menu-act 'hyperbole nil t help-string-flag)
;; Ignore any keys past the first menu item activation.
(discard-input)))))
@@ -318,7 +318,7 @@ documentation, not the full text."
(top-char (string-to-char hui:menu-top))
(item-keys (hui:menu-item-keys menu-alist))
;; 0 matches an empty string return, no selection
- (keys (apply 'list 0 1 select-char exit-char quit-char abort-char
+ (keys (apply #'list 0 1 select-char exit-char quit-char abort-char
top-char item-keys))
(key 0)
(hargs:reading-p 'hmenu)
@@ -374,7 +374,7 @@ documentation, not the full text."
(lambda (wind)
(nth 3 (window-edges wind)))
winds))
- (bot (apply 'max bot-list)))
+ (bot (apply #'max bot-list)))
(nth (- (length winds) (length (memq bot bot-list))) winds))))
(defun hui:menu-item (key doc-flag help-string-flag &optional menu menu-alist)
@@ -425,7 +425,7 @@ constructs. If not given, the top level Hyperbole menu is
used."
(setq menu-line (concat menu-prompt menu-items))
;; Narrow menu by changing 2 spaces to 1 if too wide for current frame.
(if (>= (length menu-line) (1- (frame-width)))
- (concat menu-prompt (mapconcat 'car (cdr menu-alist) " "))
+ (concat menu-prompt (mapconcat #'car (cdr menu-alist) " "))
menu-line)))
(defun hui:menu-web-search ()
diff --git a/hui-mouse.el b/hui-mouse.el
index c844abd..697da43 100644
--- a/hui-mouse.el
+++ b/hui-mouse.el
@@ -1,10 +1,10 @@
-;;; hui-mouse.el --- Use key or mouse key for many functions, e.g. GNU
Hyperbole menus
+;;; hui-mouse.el --- Use key or mouse key for many functions, e.g. GNU
Hyperbole menus -*- lexical-binding: t; -*-
;;
;; Author: Bob Weiner
;;
;; Orig-Date: 04-Feb-89
;;
-;; Copyright (C) 1991-2018 Free Software Foundation, Inc.
+;; Copyright (C) 1991-2021 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
;;
;; This file is part of GNU Hyperbole.
@@ -472,7 +472,7 @@ Its default value is #'smart-scroll-down. To disable it,
set it to
((smart-todotxt) . (smart-todotxt-assist)))
)
"Alist of predicates and form-conses for the Action and Assist Keyboard Keys.
-Each element is: (predicate-form . (action-key-form . assist-key-form)).
+Each element is: (PREDICATE-FORM . (ACTION-KEY-FORM . ASSIST-KEY-FORM)).
When the Action or Assist Key is pressed, the first or second form,
respectively, associated with the first non-nil predicate is evaluated.
@@ -1305,7 +1305,7 @@ buffer and has moved the cursor to the selected buffer."
(interactive)
(hyrolo-edit-entry))
-(defalias 'smart-hyrolo-assist 'smart-hyrolo)
+(defalias 'smart-hyrolo-assist #'smart-hyrolo)
;;; ************************************************************************
;;; smart-image-dired functions
@@ -1648,7 +1648,7 @@ When the Assist Key is pressed:
First, on an Org mode heading, this cycles through views of the whole buffer
outline.
- Second, on on an Org mode link or agenda item, this displays standard
Hyperbole help.
+ Second, on an Org mode link or agenda item, this displays standard Hyperbole
help.
To disable ALL Hyperbole support within Org major and minor modes, set the
custom option `hsys-org-enable-smart-keys' to nil. Then in Org modes, this
diff --git a/hui.el b/hui.el
index ccac786..2c37d15 100644
--- a/hui.el
+++ b/hui.el
@@ -1,10 +1,10 @@
-;;; hui.el --- GNU Hyperbole button and hyperlink user interface
+;;; hui.el --- GNU Hyperbole button and hyperlink user interface -*-
lexical-binding: t; -*-
;;
;; Author: Bob Weiner
;;
;; Orig-Date: 19-Sep-91 at 21:42:03
;;
-;; Copyright (C) 1991-2016 Free Software Foundation, Inc.
+;; Copyright (C) 1991-2021 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
;;
;; This file is part of GNU Hyperbole.
@@ -634,7 +634,7 @@ See 'hbut:report'."
(hui:help-ebut-highlight)
(message "%d button%s." total (if (/= total 1) "s" ""))))))
-(defalias 'hui:hbut-summarize 'hui:hbut-report)
+(defalias 'hui:hbut-summarize #'hui:hbut-report)
(defun hui:ibut-act (&optional but)
"Activate optional labeled implicit button symbol BUT in current buffer.
@@ -859,7 +859,7 @@ DEFAULT-ACTYPE may be a valid symbol or symbol name."
(if (or (null default-actype) (stringp default-actype))
(actype:elisp-symbol
(hargs:read-match (or prompt "Button's action type: ")
- (mapcar 'list (htype:names 'actypes))
+ (mapcar #'list (htype:names 'actypes))
nil t default-actype 'actype))
(hypb:error "(actype): Invalid default action type received")))
@@ -1117,7 +1117,7 @@ Optional NO-SORT means display in decreasing priority
order (natural order)."
(mapcar (lambda (nm) (concat tprefix nm))
names)))
(if no-sort type-names
- (sort type-names 'string<)))
+ (sort type-names #'string<)))
(cons (concat tprefix term) nil))
doc-list (delq nil (mapcar
(lambda (name)
diff --git a/hversion.el b/hversion.el
index c84e2a0..1d9003c 100644
--- a/hversion.el
+++ b/hversion.el
@@ -1,11 +1,11 @@
-;;; hversion.el --- GNU Hyperbole version and system information setup
+;;; hversion.el --- GNU Hyperbole version and system information setup -*-
lexical-binding: t; -*-
;;
;; Author: Bob Weiner
;; Maintainer: Bob Weiner, Mats Lidell
;;
;; Orig-Date: 1-Jan-94
;;
-;; Copyright (C) 1994-2020 Free Software Foundation, Inc.
+;; Copyright (C) 1994-2021 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
;;
;; This file is part of GNU Hyperbole.
@@ -209,7 +209,7 @@ If nil after system initialization, no window system or
mouse support is availab
(error "(id-info-item): Info index item must be a string: `%s'"
index-item))))
(if (not (fboundp 'id-tool-quit))
-(defalias 'id-tool-quit 'eval))
+(defalias 'id-tool-quit #'eval))
(if (not (fboundp 'id-tool-invoke))
(defun id-tool-invoke (sexp)
diff --git a/hywconfig.el b/hywconfig.el
index 9095181..44d6946 100644
--- a/hywconfig.el
+++ b/hywconfig.el
@@ -1,10 +1,10 @@
-;;; hywconfig.el --- Save ring of window configurations
+;;; hywconfig.el --- Save ring of window configurations -*- lexical-binding:
t; -*-
;;
;; Author: Bob Weiner
;;
;; Orig-Date: 15-Mar-89
;;
-;; Copyright (C) 1989-2019 Free Software Foundation, Inc.
+;; Copyright (C) 1989-2021 Free Software Foundation, Inc.
;; See the "../HY-COPY" file for license information.
;;
;; This file is part of GNU Hyperbole.
@@ -58,7 +58,8 @@
(define-obsolete-variable-alias 'wconfig-ring-max 'hywconfig-ring-max "06.00")
(defcustom hywconfig-ring-max 10
"*Maximum length of Hyperbole window configuration ring before oldest
elements are deleted."
- :type '(integer :match (lambda (_widget value) (and (integerp value) (>
value 0))))
+ :type `(integer
+ :match ,(lambda (_widget value) (and (integerp value) (> value 0))))
:group 'hyperbole-screen)
diff --git a/kotl/kimport.el b/kotl/kimport.el
index 997db7c..13e3d78 100644
--- a/kotl/kimport.el
+++ b/kotl/kimport.el
@@ -1,10 +1,10 @@
-;;; kimport.el --- Convert and insert other outline file formats into koutlines
+;;; kimport.el --- Convert and insert other outline file formats into
koutlines -*- lexical-binding: t; -*-
;;
;; Author: Bob Weiner
;;
;; Orig-Date: 15-Nov-93 at 11:57:05
;;
-;; Copyright (C) 1993-2017 Free Software Foundation, Inc.
+;; Copyright (C) 1993-2021 Free Software Foundation, Inc.
;; See the "../HY-COPY" file for license information.
;;
;; This file is part of GNU Hyperbole.
diff --git a/kotl/kotl-mode.el b/kotl/kotl-mode.el
index f43d869..8bdd988 100644
--- a/kotl/kotl-mode.el
+++ b/kotl/kotl-mode.el
@@ -1,10 +1,10 @@
-;;; kotl-mode.el --- Major mode for editing koutlines and associated commands
+;;; kotl-mode.el --- Major mode for editing koutlines and associated commands
-*- lexical-binding: t; -*-
;;
;; Author: Bob Weiner
;;
;; Orig-Date: 6/30/93
;;
-;; Copyright (C) 1993-2019 Free Software Foundation, Inc.
+;; Copyright (C) 1993-2021 Free Software Foundation, Inc.
;; See the "../HY-COPY" file for license information.
;;
;; This file is part of GNU Hyperbole.
diff --git a/kotl/kproperty.el b/kotl/kproperty.el
index 865f9cc..1f83804 100644
--- a/kotl/kproperty.el
+++ b/kotl/kproperty.el
@@ -1,4 +1,4 @@
-;;; kproperty.el --- Kcell in-buffer property handling for the Koutliner
+;;; kproperty.el --- Kcell in-buffer property handling for the Koutliner -*-
lexical-binding: t; -*-
;;
;; Author: Bob Weiner
;;
diff --git a/kotl/kvspec.el b/kotl/kvspec.el
index 51e723c..b1c44f0 100644
--- a/kotl/kvspec.el
+++ b/kotl/kvspec.el
@@ -1,10 +1,10 @@
-;;; kvspec.el --- Koutline view specification
+;;; kvspec.el --- Koutline view specification -*- lexical-binding: t; -*-
;;
;; Author: Bob Weiner
;;
;; Orig-Date: 21-Oct-95 at 15:17:07
;;
-;; Copyright (C) 1995-2019 Free Software Foundation, Inc.
+;; Copyright (C) 1995-2021 Free Software Foundation, Inc.
;; See the "../HY-COPY" file for license information.
;;
;; This file is part of GNU Hyperbole.
diff --git a/set.el b/set.el
index 2045ecb..5090262 100644
--- a/set.el
+++ b/set.el
@@ -1,10 +1,10 @@
-;;; set.el --- General mathematical operators for unordered sets
+;;; set.el --- General mathematical operators for unordered sets -*-
lexical-binding: t; -*-
;;
;; Author: Bob Weiner
;;
;; Orig-Date: 26-Sep-91 at 19:24:19
;;
-;; Copyright (C) 1991-2016 Free Software Foundation, Inc.
+;; Copyright (C) 1991-2021 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
;;
;; This file is part of GNU Hyperbole.
