branch: externals/hyperbole
commit c44528319767ae8e0dce1842b00b939720eb0093
Author: Bob Weiner <r...@gnu.org>
Commit: Bob Weiner <r...@gnu.org>
Stop setting 'mark-even-if-inactive' to nil, not needed
---
ChangeLog | 9 +++++++++
hsmail.el | 6 +++---
hui.el | 6 +++---
hyperbole.el | 13 +------------
4 files changed, 16 insertions(+), 18 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index cd9e4e3353..bb837f7e9b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2023-08-27 Bob Weiner <r...@gnu.org>
+
+* hyperbole.el (hyperbole--enable-mode, hyperbole--disable-mode): Stop setting
+ 'mark-even-if-inactive' to nil as this is no longer needed. As a result,
remove
+ 'hyperbole--mark-even-if-inactive'.
+
+* hui.el (hui-kill-ring-save): Fix interactive args to match comment, passing
+ (mark) and then (point) rather than (region-beginning) and (region-end).
+
2023-08-25 Bob Weiner <r...@gnu.org>
* hbut.el (ibut:operate): Skip past any inserted comment chars prior to
diff --git a/hsmail.el b/hsmail.el
index 4ffb0ebe19..8488b967ff 100644
--- a/hsmail.el
+++ b/hsmail.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 9-May-91 at 04:50:20
-;; Last-Mod: 16-Oct-22 at 00:30:39 by Mats Lidell
+;; Last-Mod: 27-Aug-23 at 12:39:11 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -208,8 +208,8 @@ Use (setq sc-nuke-mail-headers \\='all) to have them
removed."
(goto-char start)
(let ((mail-indentation-spaces (if arg (prefix-numeric-value
arg)
mail-indentation-spaces))
- ;; Avoid error in Transient Mark mode
- ;; on account of mark's being inactive.
+ ;; Avoid error in Transient Mark mode when the
+ ;; mark is inactive.
(mark-even-if-inactive t))
(cond ((and (boundp 'mail-citation-hook) mail-citation-hook)
;; Bind mail-citation-header to the inserted message's
header.
diff --git a/hui.el b/hui.el
index 5d43c3a037..b35a82a574 100644
--- a/hui.el
+++ b/hui.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 19-Sep-91 at 21:42:03
-;; Last-Mod: 25-Aug-23 at 10:36:13 by Bob Weiner
+;; Last-Mod: 27-Aug-23 at 13:04:22 by Bob Weiner
;;
;; SPDX-License-Identifier: GPL-3.0-or-later
;;
@@ -135,8 +135,8 @@ This command is similar to `copy-region-as-kill', except
that it gives
visual feedback indicating the extent of the region being copied."
;; Pass mark first, then point, because the order matters when
;; calling `kill-append'.
- (interactive (list (when mark-active (region-beginning))
- (when mark-active (region-end))
+ (interactive (list (when mark-active (mark))
+ (when mark-active (point))
(prefix-numeric-value current-prefix-arg)))
(let (thing)
(if (or (use-region-p)
diff --git a/hyperbole.el b/hyperbole.el
index fa2fd679cc..7b49387211 100644
--- a/hyperbole.el
+++ b/hyperbole.el
@@ -7,7 +7,7 @@
;; Author: Bob Weiner
;; Maintainer: Bob Weiner <r...@gnu.org>, Mats Lidell <ma...@gnu.org>
;; Created: 06-Oct-92 at 11:52:51
-;; Last-Mod: 6-Aug-23 at 20:10:00 by Bob Weiner
+;; Last-Mod: 27-Aug-23 at 13:04:09 by Bob Weiner
;; Released: 03-Dec-22
;; Version: 8.0.1pre
;; Keywords: comm, convenience, files, frames, hypermedia, languages,
mail, matching, mouse, multimedia, outlines, tools, wp
@@ -506,12 +506,6 @@ frame, those functions by default still return the prior
frame."
(unless (and hkey-init (where-is-internal #'hkey-help))
(hyperb:init)
(remove-hook 'after-init-hook #'hyperb:init))
-
- ;; Store the current value and set `mark-even-if-inactive' to nil so
- ;; can select delimited things if the region is not active when
- ;; hyperbole-mode is enabled.
- (setq hyperbole--mark-even-if-inactive mark-even-if-inactive
- mark-even-if-inactive nil)
;;
;; Abbreviate MSWindows /cygdrive mount point paths.
(when (file-exists-p "/cygdrive")
@@ -543,11 +537,6 @@ frame, those functions by default still return the prior
frame."
directory-abbrev-alist)
hpath:posix-mount-point-to-mswindows-alist nil)
;;
- ;; Reset the value of `mark-even-if-inactive' if the user has not
- ;; changed it while Hyperbole was active.
- (unless mark-even-if-inactive
- (setq mark-even-if-inactive hyperbole--mark-even-if-inactive))
- ;;
(remove-hook (if (boundp 'write-file-functions)
'write-file-functions
'write-file-hooks)
