[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[elpa] externals/hyperbole dd7ccb70eb 2/3: Merge branch 'master' of hype
|
From: |
ELPA Syncer |
|
Subject: |
[elpa] externals/hyperbole dd7ccb70eb 2/3: Merge branch 'master' of hyperbole |
|
Date: |
Sun, 29 Jan 2023 03:57:59 -0500 (EST) |
branch: externals/hyperbole
commit dd7ccb70eba8f55f7fa091cdab5ab18a6949a846
Merge: 0e53e046c6 74ad94b114
Author: Bob Weiner <rsw@gnu.org>
Commit: Bob Weiner <rsw@gnu.org>
Merge branch 'master' of hyperbole
---
ChangeLog | 24 ++++++++++++++++++++++++
hbdata.el | 6 +++---
hib-kbd.el | 4 ++--
hmouse-drv.el | 6 ++++--
hmouse-info.el | 4 ++--
hmouse-tag.el | 3 ++-
hsettings.el | 1 +
hsmail.el | 4 ++--
hui-mouse.el | 17 ++++++-----------
hui.el | 4 ++--
hypb.el | 35 +++++++++++++++++++++++++++++------
hyrolo.el | 10 +++++++---
hywconfig.el | 8 ++++----
13 files changed, 88 insertions(+), 38 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 03f689ebbd..20005090ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,27 @@
+2023-01-22 Mats Lidell <matsl@gnu.org>
+
+* hypb.el: Add variable and function declarations for package
+ interaction-log to silence byte compilation warnings.
+ (hypb:activate-interaction-log-mode): Use cl-pushnew.
+
+2023-01-20 Mats Lidell <matsl@gnu.org>
+
+* Remove docstring warnings.
+
+2023-01-15 Mats Lidell <matsl@gnu.org>
+
+* hsmail.el: Remove #-mark for symbol check.
+
+* hui-mouse.el: Merge public declaration sections.
+
+* hypb.el:
+* hyrolo.el: Declare functions, remove #-mark for symbol checks.
+
+* hsettings.el (hproperty:but-flash): Declare function.
+
+* hmouse-drv.el (mouse-drag-mode-line): Use mouse-drag-frame-move from
+ Emacs 28.
+
2023-01-08 Bob Weiner <rsw@gnu.org>
* hmouse-tag.el (xref--item-at-point): Fix this function (still broken
diff --git a/hbdata.el b/hbdata.el
index aa750aaaae..87ed9e4344 100644
--- a/hbdata.el
+++ b/hbdata.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 2-Apr-91
-;; Last-Mod: 5-Nov-22 at 14:24:56 by Bob Weiner
+;; Last-Mod: 20-Jan-23 at 23:17:59 by Mats Lidell
;;
;; Copyright (C) 1991-2021 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
@@ -100,8 +100,8 @@
(car hbdata))
(defun hbdata:loc-p (hbdata)
- "[Hyp V1] Return 'L iff HBDATA referent is within a local file system.
-Return 'R if remote and nil if irrelevant for button action type."
+ "[Hyp V1] Return \\='L iff HBDATA referent is within a local file system.
+Return \\='R if remote and nil if irrelevant for button action type."
(nth 1 hbdata))
(defun hbdata:modifier (hbdata)
diff --git a/hib-kbd.el b/hib-kbd.el
index d11a5f1354..f622cf311c 100644
--- a/hib-kbd.el
+++ b/hib-kbd.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 22-Nov-91 at 01:37:57
-;; Last-Mod: 27-Oct-22 at 18:46:16 by Bob Weiner
+;; Last-Mod: 20-Jan-23 at 22:19:34 by Mats Lidell
;;
;; Copyright (C) 1991-2022 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
@@ -463,7 +463,7 @@ For an approximate inverse of this, see `key-description'."
(defun kbd-key:extended-command-p (key-series)
"Return non-nil if the KEY-SERIES is a normalized extended command
invocation.
-That is, 'M-x command'."
+That is, `M-x command'."
(when (stringp key-series)
(string-match kbd-key:extended-command-prefix key-series)))
diff --git a/hmouse-drv.el b/hmouse-drv.el
index 212456de8d..df12ce8d4b 100644
--- a/hmouse-drv.el
+++ b/hmouse-drv.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 04-Feb-90
-;; Last-Mod: 21-Nov-22 at 18:34:46 by Bob Weiner
+;; Last-Mod: 15-Jan-23 at 17:08:53 by Mats Lidell
;;
;; Copyright (C) 1989-2021 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
@@ -864,7 +864,9 @@ frame instead."
((and (frame-parameter frame 'drag-with-mode-line)
(window-at-side-p window 'bottom))
;; Drag frame when the window is on the bottom of its frame.
- (mouse-drag-frame start-event 'move)))))
+ (if (fboundp 'mouse-drag-frame-move) ;; From Emacs 28
+ (mouse-drag-frame-move start-event)
+ (mouse-drag-frame start-event 'move))))))
(defun hkey-debug (pred pred-value hkey-action)
(message "(HyDebug) %sContext: %s; %s: %s; Buf: %s; Mode: %s; MinibufDepth:
%s"
diff --git a/hmouse-info.el b/hmouse-info.el
index 5e10db04ae..1253710486 100644
--- a/hmouse-info.el
+++ b/hmouse-info.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 04-Apr-89
-;; Last-Mod: 12-Oct-22 at 22:52:44 by Mats Lidell
+;; Last-Mod: 20-Jan-23 at 22:19:33 by Mats Lidell
;;
;; Copyright (C) 1989-2022 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
@@ -113,7 +113,7 @@ If assist-key is pressed within:
(3) the File entry of a Node Header (first line),
the `DIR' root-level node is found;
(4) at the end of the current node, the Previous node is found (this will
- return from subtrees if the function 'Info-global-prev is bound);
+ return from subtrees if the function `Info-global-prev' is bound);
(5) anywhere else (e.g. at the end of a line), the current node entry is
scrolled down one windowful.
diff --git a/hmouse-tag.el b/hmouse-tag.el
index 3df2de10d4..7d31e429f7 100644
--- a/hmouse-tag.el
+++ b/hmouse-tag.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 24-Aug-91
-;; Last-Mod: 8-Jan-23 at 13:02:53 by Bob Weiner
+;; Last-Mod: 15-Jan-23 at 16:56:07 by Mats Lidell
;;
;; Copyright (C) 1991-2022 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
@@ -159,6 +159,7 @@ Keyword matched is grouping 1. Referent is grouping 2.")
(defvar br-lang-prefix)
(defvar buffer-tag-table)
(defvar jedi-mode)
+(defvar jedi:find-file-function) ;; FIXME: RSW customization?
(defvar java-class-def-name-grpn)
(defvar java-class-def-regexp)
diff --git a/hsettings.el b/hsettings.el
index ba4e028c40..4b353882bf 100644
--- a/hsettings.el
+++ b/hsettings.el
@@ -32,6 +32,7 @@
;;; Public declarations
;;; ************************************************************************
(declare-function hproperty:but-create "hui-em-but")
+(declare-function hproperty:but-flash "hui-em-but")
(defvar helm-allow-mouse)
diff --git a/hsmail.el b/hsmail.el
index 090aa71fcd..8e684cf918 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: 7-Oct-22 at 23:52:10 by Mats Lidell
+;; Last-Mod: 16-Oct-22 at 00:30:39 by Mats Lidell
;;
;; Copyright (C) 1991-2022 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
@@ -69,7 +69,7 @@ message. If not given, `smail:comment' is evaluated by
default."
(defun smail:widen ()
"Widens outgoing mail buffer to include Hyperbole button data."
- (if (fboundp #'mail+narrow) (mail+narrow) (widen)))
+ (if (fboundp 'mail+narrow) (mail+narrow) (widen)))
;; Redefine this function from "message.el" to include Hyperbole button
;; data when yanking in a message and to highlight buttons if possible.
diff --git a/hui-mouse.el b/hui-mouse.el
index 86e3232edf..1b6e48bf57 100644
--- a/hui-mouse.el
+++ b/hui-mouse.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 04-Feb-89
-;; Last-Mod: 3-Dec-22 at 00:21:51 by Bob Weiner
+;; Last-Mod: 15-Jan-23 at 20:35:52 by Mats Lidell
;;
;; Copyright (C) 1991-2022 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
@@ -49,11 +49,6 @@
(eval-when-compile (require 'tar-mode))
-;;; ************************************************************************
-;;; Public declarations
-;;; ************************************************************************
-(defvar magit-root-section)
-
;;; ************************************************************************
;;; Public variables
;;; ************************************************************************
@@ -128,6 +123,8 @@ Its default value is `smart-scroll-down'. To disable it,
set it to
(declare-function magit-section-cycle-global "etx:magit-selection")
(declare-function magit-section-hide "etx:magit-selection")
(declare-function magit-section-show "etx:magit-selection")
+(defvar magit-root-section)
+(defvar magit-display-buffer-function)
(declare-function -flatten "ext:dash")
@@ -139,7 +136,6 @@ Its default value is `smart-scroll-down'. To disable it,
set it to
(declare-function helm-action-window "ext:helm-lib")
(declare-function helm-buffer-get "ext:helm-lib")
-;; (declare-function helm-get-current-action "ext:helm-?")
(declare-function helm-get-selection "ext:helm")
(declare-function helm-mark-current-line "ext:helm")
(declare-function helm-next-line "ext:helm")
@@ -166,11 +162,10 @@ Its default value is `smart-scroll-down'. To disable it,
set it to
(declare-function gnus-topic-read-group "gnus-topic")
(declare-function company-show-doc-buffer "ext:company")
-;; (declare-function company-quick-help-manual-begin "ext:company?")
+(declare-function company-quickhelp-manual-begin "ext:company-quickhelp")
(declare-function company-show-location "ext:company")
(declare-function company-select-mouse "ext:company")
-
;;; ************************************************************************
;;; Hyperbole context-sensitive keys dispatch table
;;; ************************************************************************
@@ -557,7 +552,7 @@ smart keyboard keys.")
(while (and (< start len) (setq part (string-match "/[^/]*" path start)))
(setq part (concat ref
(substring path start (setq start (match-end 0))))
- ref (symlink-referent part)))
+ ref (symlink-referent part))) ;; FIXME - Where is this function
defined
ref)))
;;; ************************************************************************
@@ -1549,7 +1544,7 @@ If key is pressed:
(interactive)
(if (last-line-p)
(scroll-other-window)
- (unix-apropos-get-man)))
+ (unix-apropos-get-man))) ;; FIXME - Deprecated?
(defun smart-apropos-assist ()
"Move through UNIX man apropos listings by using assist-key or mouse
assist-key.
diff --git a/hui.el b/hui.el
index 6419a21eaa..311902b5c9 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: 8-Jan-23 at 10:22:39 by Mats Lidell
+;; Last-Mod: 20-Jan-23 at 23:16:41 by Mats Lidell
;;
;; Copyright (C) 1991-2021 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
@@ -781,7 +781,7 @@ BUT defaults to the button whose label point is within."
(defun hui:hbut-label (default-label func-name &optional prompt)
"Read button label from user using DEFAULT-LABEL and caller's FUNC-NAME.
-Optional PROMPT string replaces the standard prompt of 'Button label: '."
+Optional PROMPT string replaces the standard prompt of `Button label: '."
(hargs:read (if (stringp prompt) prompt "Button label: ")
(lambda (lbl)
(and (not (string-equal lbl "")) (<= (length lbl)
(hbut:max-len))))
diff --git a/hypb.el b/hypb.el
index ec476648f9..912d87cd8b 100644
--- a/hypb.el
+++ b/hypb.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 6-Oct-91 at 03:42:38
-;; Last-Mod: 28-Nov-22 at 00:18:49 by Bob Weiner
+;; Last-Mod: 22-Jan-23 at 16:57:36 by Mats Lidell
;;
;; Copyright (C) 1991-2022 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
@@ -17,7 +17,7 @@
;;; Other required Elisp libraries
;;; ************************************************************************
-(eval-and-compile (mapc #'require '(compile hversion hact locate)))
+(eval-and-compile (mapc #'require '(compile hversion hact locate cl-lib)))
;;; ************************************************************************
;;; Public variables
@@ -47,6 +47,30 @@ It must end with a space."
(defvar pm-version)
(defvar vm-version)
+(declare-function helm-info "ext:helm")
+(declare-function helm-apropos "ext:helm")
+(declare-function devdocs-lookup "ext:devdocs")
+
+;; interaction-log
+(defvar ilog-buffer-name)
+(defvar ilog-display-state)
+(defvar ilog-idle-time)
+(defvar ilog-insertion-timer)
+(defvar ilog-print-lambdas)
+(defvar ilog-self-insert-command-regexps)
+(defvar ilog-truncation-timer)
+(defvar interaction-log-mode)
+(defvar interaction-log-mode-hook)
+
+(declare-function ilog-note-buffer-change "ext:interaction-log")
+(declare-function ilog-post-command "ext:interaction-log")
+(declare-function ilog-record-this-command "ext:interaction-log")
+(declare-function ilog-show-in-other-frame "ext:interaction-log")
+(declare-function ilog-timer-function "ext:interaction-log")
+(declare-function ilog-toggle-view "ext:interaction-log")
+(declare-function ilog-truncate-log-buffer "ext:interaction-log")
+(declare-function interaction-log-mode "ext:interaction-log")
+
;;; ************************************************************************
;;; Public functions
;;; ************************************************************************
@@ -74,7 +98,7 @@ This displays a clean log of Emacs keys used and commands
executed."
(setq ilog-print-lambdas 'not-compiled)
;; Omit display of some lower-level Hyperbole commands for cleaner logs
- (mapc (lambda (cmd-str) (pushnew (format "^%s$" cmd-str)
ilog-self-insert-command-regexps))
+ (mapc (lambda (cmd-str) (cl-pushnew (format "^%s$" cmd-str)
ilog-self-insert-command-regexps))
'("hyperbole" "hui:menu-enter"))
;; Redefine the mode to display commands on post-command-hook rather
@@ -95,8 +119,7 @@ This displays a clean log of Emacs keys used and commands
executed."
(setq ilog-truncation-timer (run-at-time 30 30
#'ilog-truncate-log-buffer))
(setq ilog-insertion-timer (run-with-timer ilog-idle-time
ilog-idle-time
#'ilog-timer-function))
- (message "Interaction Log: started logging in %s" ilog-buffer-name)
- (easy-menu-add ilog-minor-mode-menu))
+ (message "Interaction Log: started logging in %s" ilog-buffer-name))
(remove-hook 'after-change-functions #'ilog-note-buffer-change)
(remove-hook 'post-command-hook #'ilog-record-this-command)
(remove-hook 'post-command-hook #'ilog-post-command)
@@ -823,7 +846,7 @@ descriptors."
The package info is a property list of package-name,
package-download-source and package-version for PKG-STRING, else
return nil. This is for the straight.el package manager."
- (when (fboundp #'straight-bug-report-package-info)
+ (when (fboundp 'straight-bug-report-package-info)
(car (delq nil (mapcar (lambda (pkg-plist)
(when (equal (plist-get pkg-plist :package)
pkg-string) pkg-plist))
(straight-bug-report-package-info))))))
diff --git a/hyrolo.el b/hyrolo.el
index fa26d7dfa5..5121607e22 100644
--- a/hyrolo.el
+++ b/hyrolo.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 7-Jun-89 at 22:08:29
-;; Last-Mod: 3-Dec-22 at 17:06:18 by Bob Weiner
+;; Last-Mod: 15-Jan-23 at 16:55:37 by Mats Lidell
;;
;; Copyright (C) 1991-2022 Free Software Foundation, Inc.
;; See the "HY-COPY" file for license information.
@@ -45,6 +45,10 @@
(defvar org-roam-directory)
(defvar org-roam-db-autosync-mode)
(defvar markdown-regex-header)
+(declare-function org-roam-db-autosync-mode "ext:org-roam")
+(declare-function helm-org-rifle-show-full-contents "ext:helm-org-rifle")
+(declare-function helm-org-rifle-org-directory "ext:helm-org-rifle")
+(declare-function helm-org-rifle-files "ext:helm-org-rifle")
;;; ************************************************************************
;;; Public variables
@@ -304,7 +308,7 @@ entry which begins with the parent string."
(save-excursion
(re-search-forward
hyrolo-entry-name-regexp nil t)
(point))))
- (when (and (eq major-mode #'markdown-mode)
+ (when (and (eq major-mode 'markdown-mode)
(string-match "\\`.*#+" entry-spc))
(setq entry-spc (substring entry-spc (length (match-string 0
entry-spc)))))
(cond ((string-lessp entry name)
@@ -1291,7 +1295,7 @@ OPTIONAL prefix arg, MAX-MATCHES, limits the number of
matches
returned to the number given."
(interactive "sFind Org Roam directory string (or logical sexpression): \nP")
(unless (package-installed-p 'org-roam)
- (package-install #'org-roam))
+ (package-install 'org-roam))
(require 'org-roam)
(unless (file-readable-p org-roam-directory)
(make-directory org-roam-directory))
diff --git a/hywconfig.el b/hywconfig.el
index f7f5d7d535..cfda781e90 100644
--- a/hywconfig.el
+++ b/hywconfig.el
@@ -3,7 +3,7 @@
;; Author: Bob Weiner
;;
;; Orig-Date: 15-Mar-89
-;; Last-Mod: 6-Nov-22 at 13:04:26 by Bob Weiner
+;; Last-Mod: 20-Jan-23 at 22:20:55 by Mats Lidell
;;
;; Copyright (C) 1989-2022 Free Software Foundation, Inc.
;; See the "../HY-COPY" file for license information.
@@ -136,9 +136,9 @@ Then deletes this new configuration from the ring."
;;;###autoload
(defun hywconfig-delete-pop-continue ()
- "Replace the current frame's window configuration with the most recently
saved.
-Delete this new configuration from the ring. If the hywconfig ring is not
empty,
-then stay in the hywconfig menu."
+ "Replace current frame's window configuration with the most recently saved.
+Delete this new configuration from the ring. If the hywconfig
+ring is not empty, then stay in the hywconfig menu."
(interactive)
(hywconfig-delete-pop)
(unless (hywconfig-ring-empty-p)