Remove xemacs compatibility code fragments

ChangeLog

@@ -1,3 +1,41 @@
+2022-06-19  Mats Lidell  <matsl@gnu.org>
+
+* hui-select.el: Remove mention of Emacs versions in comment.
+
+* hmoccur.el (moccur): Remove XEmacs and InfoDock font-lock code.
+
+* hui-mouse.el: Remove mention of Emacs versions and NEXTSTEP.
+
+* hsettings.el: Remove XEmacs from comment.
+
+* kotl/kotl-mode.el (kotl-mode:fill-paragraph-or-region):
+    (kotl-mode-map): Remove XEmacs compatibility code.
+
+* hmouse-drv.el (hmouse-use-region-p): Remove XEmacs and InfoDock
+    compatibility code.
+
+* kotl/kmenu.el (id-menubar-set): Remove declared unused function.
+    (id-menubar-kotl): Remove unsued InfoDock menu.
+    (kotl-menubar-menu): Remove XEmacs compatibility code.
+    (kotl-mode-hook): Set hook unconditionally.
+
+* hyrolo-menu.el (id-menubar-hyrolo): Remove InfoDock menu.
+    (id-menubar-set, mode-popup-menu): Remove unused public declarations.
+    (hyrolo-menubar-menu): Remove XEmacs compatibility code.
+    (hyrolo-mode-hook): Set hook unconditionally.
+
+* hmouse-tag.el (smart-emacs-tags-file): Remove XEmacs, Infodock from doc.
+    (smart-tags-find-p, smart-tags-display, smart-tags-file-list):
+    Remove XEmacs and Infodock compatibility code.
+
+* hmouse-mod.el (hmouse-mod-last-char): Remove XEmacs compatibility code.
+
+* hyrolo.el (hyrolo-prompt):
+    (hyrolo-rename): Remove XEmacs dialog box and parameter.
+
+* hui-window.el (hmouse-modeline-event-p): Remove XEmacs and old Emacs
+    compatibility code.
+
 2022-06-18  Mats Lidell  <matsl@gnu.org>
 
 * hact.el (hact): Use defun. Patch from Stefan Monnier. Thanks Stefan.

hmoccur.el

@@ -3,9 +3,9 @@
 ;; Author:       Markus Freericks <Mfx@cs.tu-berlin.de> / Bob Weiner
 ;;
 ;; Orig-Date:     1-Aug-91
-;; Last-Mod:     24-Jan-22 at 00:18:46 by Bob Weiner
+;; Last-Mod:     18-Apr-22 at 00:19:03 by Mats Lidell
 ;;
-;; Copyright (C) 1991-2021  Free Software Foundation, Inc.
+;; Copyright (C) 1991-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
 ;;
 ;; This file is part of GNU Hyperbole.
@@ -84,9 +84,7 @@ serves as a menu to find any of the occurrences in this buffer.
     (insert "Lines matching '" regexp "':\n\n")
     (let ((currbuf) (currfile) (kill-buf)
 	  ;; Disable syntax highlighting of new buffers created by this command.
-	  (font-lock-auto-fontify) ;; For XEmacs and InfoDock
-	  (font-lock-global-modes) ;; For GNU Emacs
-	  )
+	  (font-lock-global-modes))
       (while buffers
 	(setq currbuf (car buffers)
 	      currfile (if (stringp currbuf) currbuf)

hmouse-drv.el

@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    04-Feb-90
-;; Last-Mod:     22-May-22 at 09:59:49 by Bob Weiner
+;; Last-Mod:     18-Jun-22 at 21:55:43 by Mats Lidell
 ;;
 ;; Copyright (C) 1989-2021  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -1388,12 +1388,8 @@ compute the actual release location and include that."
 
 (defun hmouse-use-region-p ()
   "Return t if there is a non-empty, highlighted region, else nil."
-  ;; Newer GNU Emacs
-  (if (fboundp 'use-region-p)
-      (let ((use-empty-active-region))
-	(use-region-p))
-    ;; Older GNU Emacs
-    (and transient-mark-mode mark-active)))
+  (let ((use-empty-active-region))
+    (use-region-p)))
 
 (defun hmouse-save-region ()
   "Save to `hkey-region' and return any active region within the current buffer.

hmouse-key.el

@@ -3,9 +3,9 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    30-May-94 at 00:11:57
-;; Last-Mod:     24-Jan-22 at 00:18:46 by Bob Weiner
+;; Last-Mod:     17-Apr-22 at 22:10:08 by Mats Lidell
 ;;
-;; Copyright (C) 1994-2021  Free Software Foundation, Inc.
+;; Copyright (C) 1994-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
 ;;
 ;; This file is part of GNU Hyperbole.
@@ -58,7 +58,7 @@ bindings after Smart Key setup."
     ;; Do nothing when running in batch mode.
     (noninteractive)
     ;;
-    ;; GNU Emacs, XEmacs or InfoDock
+    ;; GNU Emacs or InfoDock
     (t
      (mapcar
        (lambda (key-and-binding)

hmouse-mod.el

@@ -3,9 +3,9 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:     8-Oct-92 at 19:08:31
-;; Last-Mod:     17-Apr-22 at 13:09:12 by Bob Weiner
+;; Last-Mod:     17-Apr-22 at 22:38:13 by Mats Lidell
 ;;
-;; Copyright (C) 1992-2021  Free Software Foundation, Inc.
+;; Copyright (C) 1992-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
 ;;
 ;; This file is part of GNU Hyperbole.
@@ -202,10 +202,8 @@ Second argument COUNT is used as a prefix argument to the command."
   (keyboard-quit))
 
 (defun hmouse-mod-last-char ()
-  (cond	((boundp 'last-command-char) ;; XEmacs
-	 (and (>= 0 last-command-char) (< last-command-char 128) last-command-char))
-	((characterp last-command-event) ;; GNU Emacs
-	 last-command-event)))
+  (when (characterp last-command-event)
+    last-command-event))
 
 (provide 'hmouse-mod)
 

hmouse-tag.el

@@ -3,9 +3,9 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    24-Aug-91
-;; Last-Mod:     12-Feb-22 at 10:42:20 by Mats Lidell
+;; Last-Mod:     17-Apr-22 at 23:15:45 by Mats Lidell
 ;;
-;; Copyright (C) 1991-2021  Free Software Foundation, Inc.
+;; Copyright (C) 1991-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
 ;;
 ;; This file is part of GNU Hyperbole.
@@ -125,7 +125,7 @@ Each directory must end with a directory separator."
 Keyword matched is grouping 1.  Referent is grouping 2.")
 
 (defcustom smart-emacs-tags-file nil
-  "*Full path name of etags file for InfoDock, XEmacs or GNU Emacs source."
+  "*Full path name of etags file for GNU Emacs source."
   :type '(file :must-match t)
   :group 'hyperbole-commands)
 
@@ -1156,17 +1156,7 @@ TAG-SYM may be a function, variable or face."
 			     nil
 			   (and (boundp 'tags-file-name) tags-file-name)))
 	 find-tag-result
-	 ;; For InfoDock and XEmacs
-	 (tags-always-exact t)
-	 (tag-table-alist
-	  (mapcar (lambda (tags-file) (cons "." tags-file))
-		  tags-table-list))
-	 ;; For GNU Emacs
 	 (tags-add-tables nil))
-    ;; For InfoDock (XEmacs may also take this branch), force exact match
-    ;; (otherwise tag might = nil and the following stringp test could fail).
-    (if (featurep 'infodock)
-	(if (stringp tag) (setq tag (list tag))))
     (condition-case ()
 	(and func (funcall func tag) t)
       (error nil))))
@@ -1374,30 +1364,12 @@ See the \"${hyperb:dir}/smart-clib-sym\" script for more information."
 	 (tags-file-name (unless tags-table-list
 			   (when (boundp 'tags-file-name) tags-file-name)))
 	 find-tag-result
-	 ;; For InfoDock and XEmacs
-	 (tags-always-exact t)
-	 (tag-table-alist
-	  (mapcar (lambda (tags-file) (cons "." tags-file))
-		  tags-table-list))
-	 ;; For GNU Emacs
 	 (tags-add-tables nil))
-    ;; For InfoDock (XEmacs may also take this branch), force exact match
-    ;; when `next' is false (otherwise tag would = nil and the following
-    ;; stringp test would fail).
-    (and (featurep 'infodock) (stringp tag) (setq tag (list tag)))
     (cond ((and func (or tags-table-list tags-file-name) (setq find-tag-result (funcall func tag)))
-	   (cond ((eq func 'find-tag-internal)
-		  ;; InfoDock and XEmacs
-		  (hpath:display-buffer (car find-tag-result))
-		  (goto-char (cdr find-tag-result)))
-		 ((or (eq (type-of find-tag-result) 'xref-item)
+	   (cond ((or (eq (type-of find-tag-result) 'xref-item)
 		      (vectorp find-tag-result))
-		  ;; Newer GNU Emacs with xref.el
 		  (hpath:display-buffer (xref-item-buffer find-tag-result))
 		  (goto-char (xref-item-position find-tag-result)))
-		 ((bufferp find-tag-result)
-		  ;; Older GNU Emacs
-		  (hpath:display-buffer find-tag-result))
 		 (t
 		  ;; Emacs with some unknown version of tags.
 		  ;; Signals an error if tag is not found which is caught by
@@ -1465,12 +1437,6 @@ to look.  If no tags file is found, an error is signaled."
 	   ;; GNU Emacs in other cases
 	   (tags-table-check-computed-list)
 	   tags-table-computed-list)
-	  ((fboundp 'buffer-tag-table-list)
-	   ;; InfoDock and XEmacs
-	   (buffer-tag-table-list))
-	  ((when (boundp 'buffer-tag-table) buffer-tag-table)
-	   ;; InfoDock and XEmacs
-	   (list buffer-tag-table))
 	  ((when (boundp 'tags-file-name) tags-file-name)
 	   (list tags-file-name))
 	  (t (error "Needed tags file not found; see `man etags' for how to build one")))))

hsettings.el

@@ -3,9 +3,9 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    15-Apr-91 at 00:48:49
-;; Last-Mod:     24-Apr-22 at 13:14:18 by Bob Weiner
+;; Last-Mod:     18-Jun-22 at 21:56:43 by Mats Lidell
 ;;
-;; Copyright (C) 1991-2021  Free Software Foundation, Inc.
+;; Copyright (C) 1991-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
 ;;
 ;; This file is part of GNU Hyperbole.
@@ -259,7 +259,7 @@ then runs the search."
   :group 'hyperbole-commands)
 
 ;;; ************************************************************************
-;;; GNU EMACS AND XEMACS CONFIGURATION
+;;; GNU EMACS CONFIGURATION
 ;;; ************************************************************************
 
 ;; No-op unless set by one of the conditionals below.

hui-mouse.el

@@ -3,7 +3,7 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    04-Feb-89
-;; Last-Mod:      5-Jun-22 at 17:59:48 by Bob Weiner
+;; Last-Mod:     18-Jun-22 at 21:57:35 by Mats Lidell
 ;;
 ;; Copyright (C) 1991-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
@@ -20,12 +20,12 @@
 ;;  If you want to use your shift-middle mouse button to select Hyperbole menu
 ;;  items and Hyperbole buttons, follow these instructions.
 ;;
-;;  If you plan to use a mouse only with the X window system (XEmacs, GNU Emacs
-;;  19, or InfoDock), macOS, or NEXTSTEP, and you want to use the
-;;  shift-middle and shift-right buttons, you need not do any mouse
-;;  configuration.  Your Emacs executable must have been built so as to
-;;  include the mouse support files for your window system, however.  These
-;;  are in the Emacs "src" directory: for X - "x*.c", for macOS - "ns*.c".
+;;  If you plan to use a mouse only with the X window system or macOS
+;;  and you want to use the shift-middle and shift-right buttons, you
+;;  need not do any mouse configuration.  Your Emacs executable must
+;;  have been built so as to include the mouse support files for your
+;;  window system, however.  These are in the Emacs "src" directory:
+;;  for X - "x*.c", for macOS - "ns*.c".
 ;;
 ;;  To use a different mouse key or a different window system, modify the
 ;;  mouse key bindings in "hmouse-sh.el".

hui-select.el

@@ -3,9 +3,9 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    19-Oct-96 at 02:25:27
-;; Last-Mod:      5-Jun-22 at 17:59:19 by Bob Weiner
+;; Last-Mod:     18-Jun-22 at 21:58:08 by Mats Lidell
 ;;
-;; Copyright (C) 1996-2021  Free Software Foundation, Inc.
+;; Copyright (C) 1996-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
 ;;
 ;; This file is part of GNU Hyperbole.
@@ -75,9 +75,8 @@
 ;;   ---------------
 ;;   SETUP IF USED SEPARATELY FROM HYPERBOLE (otherwise ignore):
 ;;
-;;   To autoload this package under Emacs, XEmacs or InfoDock via
-;;   mouse usage, add the following line to one of your initialization
-;;   files.
+;;   To autoload this package via mouse usage add the following line
+;;   to one of your initialization files.
 ;;
 ;;      (hui-select-initialize)
 ;;

hui-window.el

@@ -3,9 +3,9 @@
 ;; Author:       Bob Weiner
 ;;
 ;; Orig-Date:    21-Sep-92
-;; Last-Mod:      5-Jun-22 at 17:59:19 by Bob Weiner
+;; Last-Mod:     18-Jun-22 at 21:53:08 by Mats Lidell
 ;;
-;; Copyright (C) 1992-2021  Free Software Foundation, Inc.
+;; Copyright (C) 1992-2022  Free Software Foundation, Inc.
 ;; See the "HY-COPY" file for license information.
 ;;
 ;; This file is part of GNU Hyperbole.
@@ -988,7 +988,7 @@ window, its frame may have been moved by a bottommost modeline drag."
        (not (or (hmouse-drag-horizontally) (hmouse-drag-vertically) (hmouse-drag-diagonally)))))
 
 (defun hmouse-emacs-modeline-event-p (event)
-  "GNU Emacs: Return non-nil if EVENT happened on a window mode line."
+  "Return non-nil if EVENT happened on a window mode line."
   (or (and (eventp event) (eq (posn-area (event-start event)) 'mode-line))
       ;; If drag release was to an unselected frame mode-line, on
       ;; click-to-focus systems, the release event will not include
@@ -1006,22 +1006,7 @@ window, its frame may have been moved by a bottommost modeline drag."
     (when (and (hyperb:window-system) event
 	       (not (posnp event))
 	       (not (markerp event)))
-      (cond
-       ;; Modern GNU Emacs
-       ((fboundp 'posn-area)
-	(hmouse-emacs-modeline-event-p event))
-       ;; XEmacs
-       ((fboundp 'event-over-modeline-p)
-	(event-over-modeline-p event))
-       ;; Early Emacs
-       (t
-	(let* ((w (smart-window-of-coords event))
-	       (mode-ln (if w (nth 3 (window-edges w))))
-	       (last-press-y (hmouse-y-coord event)))
-	  ;; Mode-line is always 1 less than the bottom of the window, unless it
-	  ;; is a minibuffer window which does not have a modeline.
-	  (if (not (eq w (minibuffer-window))) (setq mode-ln (1- mode-ln)))
-	  (and last-press-y mode-ln (= last-press-y mode-ln)))))))
+      (hmouse-emacs-modeline-event-p event)))
 
 (defun hmouse-modeline-depress ()
   "Return non-nil if Action Key was depressed on a window mode line.