From 610859cc7ae3a31584a8c2a202c182c19391c7ee Mon Sep 17 00:00:00 2001 From: Mats Lidell Date: Tue, 14 Jun 2022 19:50:41 +0200 Subject: [PATCH 1/7] Closing parens should not be wrapped onto new lines --- hui-em-but.el | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/hui-em-but.el b/hui-em-but.el index d9669678..84e75c19 100644 --- a/hui-em-but.el +++ b/hui-em-but.el @@ -3,7 +3,7 @@ ;; Author: Bob Weiner ;; ;; Orig-Date: 21-Aug-92 -;; Last-Mod: 11-May-22 at 00:01:27 by Bob Weiner +;; Last-Mod: 14-Jun-22 at 19:22:24 by Mats Lidell ;; ;; Copyright (C) 1992-2021 Free Software Foundation, Inc. ;; See the "HY-COPY" file for license information. @@ -218,8 +218,7 @@ highlighted." "medium violet red" "indianred4" "firebrick1" "DarkGoldenrod" "NavyBlue" "darkorchid" "tomato3" "mediumseagreen" "deeppink" "forestgreen" "mistyrose4" "slategrey" "purple4" "dodgerblue3" - "mediumvioletred" "lightsalmon3" "orangered2" "turquoise4" "Gray55" - ) + "mediumvioletred" "lightsalmon3" "orangered2" "turquoise4" "Gray55") hproperty:color-list) "Good colors for contrast against wheat background and black foreground.") From 36ebdeec6c29e0ba85b12d55601826dbb065781f Mon Sep 17 00:00:00 2001 From: Mats Lidell Date: Tue, 14 Jun 2022 19:51:31 +0200 Subject: [PATCH 2/7] Not needed defalias for functions marked obsolete since 25.1 --- hyperbole.el | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/hyperbole.el b/hyperbole.el index a3553df5..4361e2bc 100644 --- a/hyperbole.el +++ b/hyperbole.el @@ -5,7 +5,7 @@ ;; Author: Bob Weiner ;; Maintainer: Bob Weiner , Mats Lidell ;; Created: 06-Oct-92 at 11:52:51 -;; Last-Mod: 22-May-22 at 12:48:36 by Bob Weiner +;; Last-Mod: 14-Jun-22 at 19:49:14 by Mats Lidell ;; Released: 01-May-22 ;; Version: 8.0.1pre ;; Keywords: comm, convenience, files, frames, hypermedia, languages, mail, matching, mouse, multimedia, outlines, tools, wp @@ -378,18 +378,6 @@ frame, those functions by default still return the prior frame." ;;; ************************************************************************ (require 'outline) -(unless (fboundp 'outline-hide-body) - (defalias 'outline-hide-body 'hide-body)) -(unless (fboundp 'outline-hide-entry) - (defalias 'outline-hide-entry 'hide-entry)) -(unless (fboundp 'outline-show-entry) - (defalias 'outline-show-entry 'show-entry)) -(unless (fboundp 'outline-show-all) - (defalias 'outline-show-all 'show-all)) -(unless (fboundp 'outline-hide-subtree) - (defalias 'outline-hide-subtree 'hide-subtree)) -(unless (fboundp 'outline-show-subtree) - (defalias 'outline-show-subtree 'show-subtree)) (unless (fboundp 'outline-flag-region) (defun outline-flag-region (from to flag) "Hide or show lines from FROM to TO, according to FLAG. From 6a018da91448ea720ce97661cd139bd6e7f0d17e Mon Sep 17 00:00:00 2001 From: Mats Lidell Date: Tue, 14 Jun 2022 19:54:24 +0200 Subject: [PATCH 3/7] Available since 2003 so no need to provide alternative --- hyperbole.el | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/hyperbole.el b/hyperbole.el index 4361e2bc..8628a714 100644 --- a/hyperbole.el +++ b/hyperbole.el @@ -5,7 +5,7 @@ ;; Author: Bob Weiner ;; Maintainer: Bob Weiner , Mats Lidell ;; Created: 06-Oct-92 at 11:52:51 -;; Last-Mod: 14-Jun-22 at 19:49:14 by Mats Lidell +;; Last-Mod: 14-Jun-22 at 19:54:07 by Mats Lidell ;; Released: 01-May-22 ;; Version: 8.0.1pre ;; Keywords: comm, convenience, files, frames, hypermedia, languages, mail, matching, mouse, multimedia, outlines, tools, wp @@ -378,13 +378,6 @@ frame, those functions by default still return the prior frame." ;;; ************************************************************************ (require 'outline) -(unless (fboundp 'outline-flag-region) - (defun outline-flag-region (from to flag) - "Hide or show lines from FROM to TO, according to FLAG. -If FLAG is nil then text is shown, while if FLAG is t the text is hidden." - (if flag - (subst-char-in-region from to ?\n ?\r t) - (subst-char-in-region from to ?\r ?\n t)))) (unless (fboundp 'outline-invisible-in-p) (defun outline-invisible-in-p (beg end) "Return t if there is an invisible character between BEG and END, else nil." From c5d18bb83c5e42af72973da620c169d7fc1ed25d Mon Sep 17 00:00:00 2001 From: Mats Lidell Date: Tue, 14 Jun 2022 20:07:02 +0200 Subject: [PATCH 4/7] Use cl-lib to remove package-lint warning Warning is related to running under 24.2 or older, which we do not support, so only cosmetics!? --- hibtypes.el | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/hibtypes.el b/hibtypes.el index a6f424ca..cee63a97 100644 --- a/hibtypes.el +++ b/hibtypes.el @@ -3,9 +3,9 @@ ;; Author: Bob Weiner ;; ;; Orig-Date: 19-Sep-91 at 20:45:31 -;; Last-Mod: 12-May-22 at 02:05:28 by Bob Weiner +;; Last-Mod: 14-Jun-22 at 20:06:40 by Mats Lidell ;; -;; Copyright (C) 1991-2021 Free Software Foundation, Inc. +;; Copyright (C) 1991-2022 Free Software Foundation, Inc. ;; See the "HY-COPY" file for license information. ;; ;; This file is part of GNU Hyperbole. @@ -35,7 +35,7 @@ ;;; ************************************************************************ (eval-when-compile (require 'hversion)) -(require 'cl-seq) ;; for cl-count +(require 'cl-lib) ;; for cl-count (require 'subr-x) ;; For string-trim (require 'hactypes) From f1c4cfedb3939a70d2c7af2b0669223c4dc2cbf8 Mon Sep 17 00:00:00 2001 From: Mats Lidell Date: Tue, 14 Jun 2022 21:16:08 +0200 Subject: [PATCH 5/7] Use defalias for compatibility function See "(elisp)Coding conventions" --- hload-path.el | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/hload-path.el b/hload-path.el index 960e636b..e4a13abe 100644 --- a/hload-path.el +++ b/hload-path.el @@ -3,9 +3,9 @@ ;; Author: Bob Weiner ;; ;; Orig-Date: 29-Jun-16 at 14:39:33 -;; Last-Mod: 1-Jun-22 at 23:20:50 by Bob Weiner +;; Last-Mod: 14-Jun-22 at 21:14:45 by Mats Lidell ;; -;; Copyright (C) 1992-2021 Free Software Foundation, Inc. +;; Copyright (C) 1992-2022 Free Software Foundation, Inc. ;; See the "HY-COPY" file for license information. ;; ;; This file is part of GNU Hyperbole. @@ -110,9 +110,13 @@ the symbol list. For `suspicious', only `set-buffer' can be used." `(with-no-warnings ,@body))) ;; New autoload generation function defined only in Emacs 28 -(unless (fboundp #'make-directory-autoloads) - (defun make-directory-autoloads (dir output-file) - "Update autoload definitions for Lisp files in the directories DIRS. +(defalias 'hload-path--make-directory-autoloads + (if (fboundp #'make-directory-autoloads) + #'make-directory-autoloads + #'hload-path--internal-make-directory-autoloads)) + +(defun hload-path--internal-make-directory-autoloads (dir output-file) + "Update autoload definitions for Lisp files in the directories DIRS. DIR can be either a single directory or a list of directories. (The latter usage is discouraged.) @@ -122,10 +126,10 @@ its autoloads into the specified file instead. The function does NOT recursively descend into subdirectories of the directory or directories specified." - ;; Don't use a 'let' on this next line or it will fail. - (setq generated-autoload-file output-file) - (hyperb:with-suppressed-warnings ((obsolete update-directory-autoloads)) - (update-directory-autoloads dir)))) + ;; Don't use a 'let' on this next line or it will fail. + (setq generated-autoload-file output-file) + (hyperb:with-suppressed-warnings ((obsolete update-directory-autoloads)) + (update-directory-autoloads dir))) ;; Menu items could call this function before Info is loaded. (autoload 'Info-goto-node "info" "Jump to specific Info node." t) @@ -154,10 +158,10 @@ This is used only when running from git source and not a package release." (al-file (expand-file-name "hyperbole-autoloads.el"))) ;; (make-local-variable 'generated-autoload-file) (with-current-buffer (find-file-noselect al-file) - (make-directory-autoloads "." al-file)) + (hload-path--make-directory-autoloads "." al-file)) (setq al-file (expand-file-name "kotl/kotl-autoloads.el")) (with-current-buffer (find-file-noselect al-file) - (make-directory-autoloads "." al-file))) + (hload-path--make-directory-autoloads "." al-file))) (unless (hyperb:autoloads-exist-p) (error (format "Hyperbole failed to generate autoload files; try running 'make src' in a shell in %s" hyperb:dir)))) From 5972b9f91eeaed844f2bb8ac2552c735e3f484c7 Mon Sep 17 00:00:00 2001 From: Mats Lidell Date: Tue, 14 Jun 2022 21:31:21 +0200 Subject: [PATCH 6/7] ChangeLog and copyright year update --- ChangeLog | 14 ++++++++++++++ hui-em-but.el | 4 ++-- hyperbole.el | 4 ++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6931abaf..ce2eb5ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2022-06-14 Mats Lidell + +* hload-path.el (hload-path--make-directory-autoloads) + (hload-path--internal-make-directory-autoloads): Use defalias for + compatibility function. + (hyperb:generate-autoloads): Use it. + +* hibtypes.el (cl-lib): Require cl-lib to remove package-lint warning. + +* hyperbole.el: Remove defalias for compatilility with obsolete functions + since Emacs 25.1 and outline-flag-region available since 2003. + +* hui-em-but.el (hproperty:good-colors): package-lint code formating. + 2022-06-13 Mats Lidell * test/demo-tests.el (fast-demo-key-series-shell-pushd-hyperb-dir) diff --git a/hui-em-but.el b/hui-em-but.el index 84e75c19..638eb2da 100644 --- a/hui-em-but.el +++ b/hui-em-but.el @@ -3,9 +3,9 @@ ;; Author: Bob Weiner ;; ;; Orig-Date: 21-Aug-92 -;; Last-Mod: 14-Jun-22 at 19:22:24 by Mats Lidell +;; Last-Mod: 14-Jun-22 at 21:22:39 by Mats Lidell ;; -;; Copyright (C) 1992-2021 Free Software Foundation, Inc. +;; Copyright (C) 1992-2022 Free Software Foundation, Inc. ;; See the "HY-COPY" file for license information. ;; ;; This file is part of GNU Hyperbole. diff --git a/hyperbole.el b/hyperbole.el index 8628a714..19bb1fc5 100644 --- a/hyperbole.el +++ b/hyperbole.el @@ -1,11 +1,11 @@ ;;; hyperbole.el --- GNU Hyperbole: The Everyday Hypertextual Information Manager -*- lexical-binding: t; -*- -;; Copyright (C) 1992-2021 Free Software Foundation, Inc. +;; Copyright (C) 1992-2022 Free Software Foundation, Inc. ;; Author: Bob Weiner ;; Maintainer: Bob Weiner , Mats Lidell ;; Created: 06-Oct-92 at 11:52:51 -;; Last-Mod: 14-Jun-22 at 19:54:07 by Mats Lidell +;; Last-Mod: 14-Jun-22 at 21:32:43 by Mats Lidell ;; Released: 01-May-22 ;; Version: 8.0.1pre ;; Keywords: comm, convenience, files, frames, hypermedia, languages, mail, matching, mouse, multimedia, outlines, tools, wp From 2fd729eec5657eff773455822801df9ffb2e2f70 Mon Sep 17 00:00:00 2001 From: Mats Lidell Date: Tue, 14 Jun 2022 23:27:40 +0200 Subject: [PATCH 7/7] Fix spelling --- ChangeLog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index ce2eb5ba..361efd87 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,10 +7,10 @@ * hibtypes.el (cl-lib): Require cl-lib to remove package-lint warning. -* hyperbole.el: Remove defalias for compatilility with obsolete functions +* hyperbole.el: Remove defalias for compatibility with obsolete functions since Emacs 25.1 and outline-flag-region available since 2003. -* hui-em-but.el (hproperty:good-colors): package-lint code formating. +* hui-em-but.el (hproperty:good-colors): package-lint code formatting. 2022-06-13 Mats Lidell