Review comments, rebase on to master

rswgnu · Feb 5, 2023 · c642cf6 · c642cf6
1 parent d3ab46f
commit c642cf6
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 23 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,14 @@
+2023-02-06  Mats Lidell  <matsl@gnu.org>
+
+* Makefile (EL_COMPILE, ELC_COMPILE): Add hgnus-mail.
+
+* hmail.el (hmail:init-function): Add Gnus-mail-init as an init option.
+    (hmail:compose-mail-func): Add email interface function.
+
+* hibtypes.el (mail-address): Use hmail:compose-mail-func.
+
+* hgnus-mail.el: Mail definitions for Gnus as a mail reader.
+
 2023-02-05  Bob Weiner  <rsw@gnu.org>
 
 * hyrolo.el (hyrolo-initialize-file-list): Fix to not overwrite any user customized
@@ -39,17 +50,6 @@
 
 2023-01-22  Mats Lidell  <matsl@gnu.org>
 
-* Makefile (EL_COMPILE, ELC_COMPILE): Add hgnus-mail.
-
-* hmail.el (hmail:init-function): Add Gnus-mail-init as an init option.
-    (hmail:compose-mail-other-window): Add email interface function.
-
-* hibtypes.el (mail-address): Use hmail:compose-mail-other-window.
-
-* hgnus-mail.el: Mail definitions for Gnus as a mail reader.
-
-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.

diff --git a/hgnus-mail.el b/hgnus-mail.el
@@ -3,7 +3,7 @@
 ;; Author:       Mats Lidell
 ;;
 ;; Orig-Date:    17-Dec-22 at 22:04:19
-;; Last-Mod:     28-Jan-23 at 10:12:32 by Mats Lidell
+;; Last-Mod:      5-Feb-23 at 23:08:54 by Mats Lidell
 ;;
 ;; Copyright (C) 2023  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -30,7 +30,7 @@
 (defun Gnus-mail-init ()
   "Initialize Hyperbole support for Gnus mail reading."
   (interactive)
-  (setq hmail:compose-mail-other-window 'hgnus-mail--message-mail-other-window
+  (setq hmail:compose-mail-func 'hgnus-mail--message-mail-other-window
         hmail:composer  'message-mode
 	hmail:lister    'gnus-summary-mode
 	hmail:modifier  'message-mode
@@ -55,11 +55,10 @@
 ;;; Private functions
 ;;; ************************************************************************
 
-;; FIXME - noerase arg is nil in the other invocation so really not
-;; needed. We could use a local defun in the other case as well and so
-;; the noerase can go away.
 (defun hgnus-mail--message-mail-other-window (_noerase to)
-  "Open mail composer in other window with field TO set."
+  "Open mail composer in other window with field TO set.
+_NOERASE is for compatibility with `mail-other-window' type of
+mail functions."
   (gnus-msg-mail to nil nil nil #'switch-to-buffer-other-window))
 
 (defalias 'Gnus-Summ-goto #'gnus-summary-show-article)
@@ -78,5 +77,5 @@
   "Undelete all messages."
   (error "Sorry.  Deleted messages can't be undeleted"))
 
-(provide 'hgnus-mail.el)
+(provide 'hgnus-mail)
 ;;; hgnus-mail.el ends here
diff --git a/hibtypes.el b/hibtypes.el
@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    19-Sep-91 at 20:45:31
-;; Last-Mod:     22-Jan-23 at 23:58:44 by Mats Lidell
+;; Last-Mod:      5-Feb-23 at 23:02:42 by Mats Lidell
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -306,7 +306,7 @@ in all buffers."
 	         (eq 'autoload (car (symbol-function hmail:init-function))))
 	    (funcall hmail:init-function))
         (ibut:label-set address (match-beginning 1) (match-end 1))
-        (hact hmail:compose-mail-other-window nil address)))))
+        (hact hmail:compose-mail-func nil address)))))
 
 ;;; ========================================================================
 ;;; Follows Org links that are in non-Org mode buffers

diff --git a/hmail.el b/hmail.el
@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:     9-Oct-91 at 18:38:05
-;; Last-Mod:      5-Feb-23 at 09:03:29 by Mats Lidell
+;; Last-Mod:      6-Feb-23 at 00:09:25 by Mats Lidell
 ;;
 ;; SPDX-License-Identifier: GPL-3.0-or-later
 ;;
@@ -52,8 +52,8 @@ Valid values are: nil, Mh-init, Rmail-init, Vm-init or Gnus-mail-init."
 		 (function-item :tag "Gnus" :value Gnus-mail-init))
   :group 'hyperbole-commands)
 
-(defvar hmail:compose-mail-other-window 'mail-other-window
-  "Function for starting to compose a mail in the other window.")
+(defvar hmail:compose-mail-func 'mail-other-window
+  "Function for starting to compose a mail.")
 (defvar hmail:composer  'message-mode
  "Major mode for composing mail to be sent with Hyperbole buttons.")
 (defvar hmail:lister    nil