Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,17 @@
2022-06-14 Mats Lidell <matsl@gnu.org>

* 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 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 formatting.

2022-06-13 Mats Lidell <matsl@gnu.org>

* test/demo-tests.el (fast-demo-key-series-shell-pushd-hyperb-dir)
Expand Down
6 changes: 3 additions & 3 deletions hibtypes.el
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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)

Expand Down
26 changes: 15 additions & 11 deletions hload-path.el
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down Expand Up @@ -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.)

Expand All @@ -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)
Expand Down Expand Up @@ -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))))

Expand Down
7 changes: 3 additions & 4 deletions hui-em-but.el
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
;; 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 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.
Expand Down Expand Up @@ -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.")

Expand Down
23 changes: 2 additions & 21 deletions hyperbole.el
Original file line number Diff line number Diff line change
@@ -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 <rsw@gnu.org>, Mats Lidell <matsl@gnu.org>
;; 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 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
Expand Down Expand Up @@ -378,25 +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.
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."
Expand Down