branch: externals/hyperbole
commit d64ade357d15eb2bd97abcb1caa4b28cdfe977d1
Author: bw <r...@gnu.org>
Commit: bw <r...@gnu.org>
hui-em-but.el - Rename to "hproperty.el"
---
ChangeLog | 20 ++++++++++----------
MANIFEST | 6 +++---
Makefile | 8 ++++----
hui-em-but.el => hproperty.el | 8 ++++----
hsettings.el | 8 ++++----
hsys-org.el | 4 ++--
hywiki.el | 4 ++--
7 files changed, 29 insertions(+), 29 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 9f50703303..156411fdd3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,13 @@
-<<<<<<< HEAD
+2024-06-29 Bob Weiner <r...@gnu.org>
+
+* hui-em-but.el: Rename to "hproperty.el".
+
+* hui-em-but.el (hproperty:char-property-start, hproperty:char-property-end,
+ hproperty:char-property-range, hproperty:overlay-range)
+ hproperty:char-property-contains-p):
+ Add char-property and overlay utility functions and use in "hsys-org.el"
+ and "hsys-org-tests.el"; adds compatibility with Org mode 9.7 and earlier.
+
2024-06-25 Bob Weiner <r...@gnu.org>
* hibtypes.el (hynote): Add for Org and Org Roam links by name.
@@ -11,15 +20,6 @@
evaluation fails.
hmouse-drv.el (hkey-execute, hkey-help): Change 'eval' to 'hypb:eval-debug'
to show a backtrace whenever an error occurs.
-=======
-2024-06-29 Bob Weiner <r...@gnu.org>
-
-* hui-em-but.el (hproperty:char-property-start, hproperty:char-property-end,
- hproperty:char-property-range, hproperty:overlay-range)
- hproperty:char-property-contains-p):
- Add char-property and overlay utility functions and use in "hsys-org.el"
- and "hsys-org-tests.el"; adds compatibility with Org mode 9.7 and earlier.
->>>>>>> rsw-prop-updates
2024-06-23 Bob Weiner <r...@gnu.org>
diff --git a/MANIFEST b/MANIFEST
index 3c1f8cbfee..99d3a9ed0c 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -36,10 +36,8 @@ hmouse-key.el - Setup Smart Key mouse bindings
hmouse-mod.el - Action Key acts as CONTROL modifier and Assist Key as
META modifier (Unused)
hmouse-sh.el - System-dependent Smart Mouse Key bindings
hmouse-tag.el - Smart Key support of programming language tags location
-hycontrol.el - Interactive sizing, moving, replicating and deleting of
windows and frames
-hyrolo-menu.el - Pulldown and popup menus of HyRolo commands
+hproperty.el - GNU Emacs button highlighting and flashing support
hui-dired-sidebar.el - Smart Key support for dired sidebar
-hui-em-but.el - GNU Emacs button highlighting and flashing support
hui-jmenu.el - Popup menus for jumping to and managing buffers,
frames, and windows
hui-menu.el - Menubar menu of GNU Hyperbole commands
hui-mini.el - Single line command menus for GNU Hyperbole
@@ -48,6 +46,8 @@ hui-select.el - Select delimited or larger and larger
syntax-driven regio
hui-treemacs.el - GNU Hyperbole Smart Key support for the Treemacs file
manager package
hui-window.el - Smart Mouse Key window and modeline depress/release
actions
hui.el - GNU Hyperbole button and hyperlink user interface
+hycontrol.el - Interactive sizing, moving, replicating and deleting of
windows and frames
+hyrolo-menu.el - Pulldown and popup menus of HyRolo commands
* --- APPLICATION PROGRAMMING INTERFACE ---
hact.el - GNU Hyperbole button action handling
diff --git a/Makefile b/Makefile
index bcb5e0b7c1..fc840442c6 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,7 @@
# Author: Bob Weiner
#
# Orig-Date: 15-Jun-94 at 03:42:38
-# Last-Mod: 25-Jun-24 at 02:32:30 by Bob Weiner
+# Last-Mod: 29-Jun-24 at 18:59:38 by Bob Weiner
#
# Copyright (C) 1994-2023 Free Software Foundation, Inc.
# See the file HY-COPY for license information.
@@ -195,12 +195,12 @@ EL_COMPILE = hact.el hactypes.el hargs.el hbdata.el
hbmap.el hbut.el \
hib-social.el hibtypes.el \
hinit.el hload-path.el hmail.el hmh.el hmoccur.el hmouse-info.el \
hmouse-drv.el hmouse-key.el hmouse-mod.el hmouse-sh.el
hmouse-tag.el \
- hpath.el hrmail.el hsettings.el hsmail.el hsys-flymake.el
hsys-org.el \
- hsys-org-roam.el hsys-www.el hsys-xref.el hsys-youtube.el htz.el \
+ hpath.el hproperty.el hrmail.el hsettings.el hsmail.el
hsys-flymake.el \
+ hsys-org.el hsys-org-roam.el hsys-www.el hsys-xref.el
hsys-youtube.el htz.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 hynote.el
hypb.el hyperbole.el \
hyrolo-demo.el hyrolo-logic.el hyrolo-menu.el hyrolo.el
hywconfig.el hywiki.el \
- hasht.el set.el hypb-ert.el hui-dired-sidebar.el
hypb-maintenance.el hui-em-but.el \
+ hasht.el set.el hypb-ert.el hui-dired-sidebar.el
hypb-maintenance.el \
hui-register.el
EL_SRC = $(EL_COMPILE)
diff --git a/hui-em-but.el b/hproperty.el
similarity index 98%
rename from hui-em-but.el
rename to hproperty.el
index f455d68b58..2a34918c23 100644
--- a/hui-em-but.el
+++ b/hproperty.el
@@ -1,9 +1,9 @@
-;;; hui-em-but.el --- GNU Emacs button highlighting and flashing support -*-
lexical-binding: t; -*-
+;;; hproperty.el --- GNU Emacs button highlighting and flashing support -*-
lexical-binding: t; -*-
;;
;; Author: Bob Weiner
;;
;; Orig-Date: 21-Aug-92
-;; Last-Mod: 26-May-24 at 17:24:25 by Bob Weiner
+;; Last-Mod: 29-Jun-24 at 18:57:42 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -447,6 +447,6 @@ hproperty:color-ptr."
"Button used to highlight an item in a listing buffer.")
(make-variable-buffer-local 'hproperty:item-button)
-(provide 'hui-em-but)
+(provide 'hproperty)
-;;; hui-em-but.el ends here
+;;; hproperty.el ends here
diff --git a/hsettings.el b/hsettings.el
index 7e1994fdaa..cac10afe16 100644
--- a/hsettings.el
+++ b/hsettings.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 15-Apr-91 at 00:48:49
-;; Last-Mod: 13-Apr-24 at 11:22:31 by Bob Weiner
+;; Last-Mod: 29-Jun-24 at 18:57:18 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -38,8 +38,8 @@
(defvar helm-allow-mouse)
(defvar htz:local) ; "htz.el"
-(declare-function hproperty:but-create "hui-em-but")
-(declare-function hproperty:but-flash "hui-em-but")
+(declare-function hproperty:but-create "hproperty")
+(declare-function hproperty:but-flash "hproperty")
(declare-function hyperbole-minibuffer-menu "hui-mini")
(declare-function hyperbole-menubar-menu "hui-menu")
@@ -298,7 +298,7 @@ then runs the search."
"Button flash No-op.")
(cond ((not noninteractive)
- (require 'hui-em-but)
+ (require 'hproperty)
;; 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)))
diff --git a/hsys-org.el b/hsys-org.el
index 4990de9813..259aa93760 100644
--- a/hsys-org.el
+++ b/hsys-org.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 2-Jul-16 at 14:54:14
-;; Last-Mod: 29-Jun-24 at 18:35:13 by Bob Weiner
+;; Last-Mod: 29-Jun-24 at 18:55:30 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -31,7 +31,7 @@
;;; ************************************************************************
(eval-when-compile (require 'hmouse-drv))
-(require 'hui-em-but) ;; requires 'hbut
+(require 'hproperty) ;; requires 'hbut
(require 'org)
(require 'org-element)
(require 'org-fold nil t)
diff --git a/hywiki.el b/hywiki.el
index 66c2da05f2..d0fdda29fd 100644
--- a/hywiki.el
+++ b/hywiki.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 21-Apr-24 at 22:41:13
-;; Last-Mod: 24-Jun-24 at 23:33:45 by Bob Weiner
+;; Last-Mod: 29-Jun-24 at 18:56:47 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -105,7 +105,7 @@
(require 'hasht)
(require 'hpath)
(require 'hypb)
-(require 'hui-em-but)
+(require 'hproperty)
(require 'outline) ;; For `outline-mode-syntax-table'
(eval-and-compile
