[elpa] externals/hyperbole 71ffd34422 2/3: Merge branch 'master' of hyperbole

[ELPA Syncer]

branch: externals/hyperbole
commit 71ffd3442275f4de2c1b31c4d0bb7d817bf21edf
Merge: 1687b112b7 56cd3d8791
Author: Bob Weiner <rsw@gnu.org>
Commit: Bob Weiner <rsw@gnu.org>

    Merge branch 'master' of hyperbole
---
 ChangeLog |  7 ++++++-
 hargs.el  | 37 +++----------------------------------
 2 files changed, 9 insertions(+), 35 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 454786e769..1d0f2f928d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2022-02-05  Mats Lidell  <matsl@gnu.org>
+
+* hargs.el (hargs:find-tag-default): Remove own implementation for
+    find-tag-default and find-tag--default and rely on implementation in
+    Emacs.
+
 2022-02-05  Bob Weiner  <rsw@gnu.org>
 
 * hypb.el (hypb:straight-package-plist): Add and use in tests.
@@ -48,7 +54,6 @@
 
 * hsmail.el (mail-yank-original): Fix indentation of this overloaded function.
             (message--yank-original-internal): Add overloading of this 
function.
-
 2022-02-04  Mats Lidell  <matsl@gnu.org>
 
 * test/hargs-tests.el (hargs-get-verify-extension-characters)
diff --git a/hargs.el b/hargs.el
index 595cb84a10..feb7e67e1b 100644
--- a/hargs.el
+++ b/hargs.el
@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    31-Oct-91 at 23:17:35
-;; Last-Mod:      5-Feb-22 at 13:06:32 by Bob Weiner
+;; Last-Mod:      5-Feb-22 at 21:48:56 by Bob Weiner
 ;;
 ;; Copyright (C) 1991-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -26,6 +26,7 @@
 ;;; Other required Elisp libraries
 ;;; ************************************************************************
 
+(require 'etags)                        ; For `find-tag--default'
 (require 'hpath)
 (require 'hypb)
 (require 'set)
@@ -47,39 +48,7 @@
 ;;; Private functions
 ;;; ************************************************************************
 
-;;; From etags.el, so don't have to load the whole thing.
-(unless (fboundp 'find-tag-default)
-  (defun find-tag-default ()
-    (or (and (boundp 'find-tag-default-hook)
-            (not (memq find-tag-default-hook '(nil find-tag-default)))
-            (condition-case data
-                (funcall find-tag-default-hook)
-              (error
-               (message "value of find-tag-default-hook signalled error: %s"
-                        data)
-               (sit-for 1)
-               nil)))
-       (save-excursion
-         (unless (memq (char-syntax (preceding-char)) '(?w ?_))
-           (while (not (looking-at "\\sw\\|\\s_\\|\\'"))
-             (forward-char 1)))
-         (while (looking-at "\\sw\\|\\s_")
-           (forward-char 1))
-         (when (re-search-backward "\\sw\\|\\s_" nil t)
-           (forward-char 1)
-           (regexp-quote (buffer-substring (point)
-                                           (progn (forward-sexp -1)
-                                                  (while (looking-at "\\s'")
-                                                    (forward-char 1))
-                                                  (point)))))))))
-
-(unless (fboundp 'find-tag--default)
-  (defun find-tag--default ()
-    (funcall (or (when (fboundp find-tag-default-function) 
find-tag-default-function)
-                (get major-mode 'find-tag-default-function)
-                'find-tag-default))))
-(defalias 'hargs:find-tag-default 'find-tag--default)
-
+(defalias 'hargs:find-tag-default #'find-tag--default)
 
 (defun hargs:action-get (action modifying)
   "Interactively get list of arguments for ACTION's parameters.