diff options
Diffstat (limited to 'hui-mini.el')
| -rw-r--r-- | hui-mini.el | 47 |
1 files changed, 13 insertions, 34 deletions
diff --git a/hui-mini.el b/hui-mini.el index a2f1054..70b626a 100644 --- a/hui-mini.el +++ b/hui-mini.el @@ -4,7 +4,7 @@ ;; ;; Orig-Date: 15-Oct-91 at 20:13:17 ;; -;; Copyright (C) 1991-2017 Free Software Foundation, Inc. +;; Copyright (C) 1991-2019 Free Software Foundation, Inc. ;; See the "HY-COPY" file for license information. ;; ;; This file is part of GNU Hyperbole. @@ -17,6 +17,7 @@ ;;; ************************************************************************ (require 'hypb) +(require 'hsettings) ;For hyperbole-web-search-alist (require 'browse-url) ;;; ************************************************************************ @@ -149,13 +150,9 @@ With optional HELP-STRING-FLAG, instead returns the one line help string for the "Uses CHAR-STR or last input character as minibuffer argument." (interactive) (let ((input (or char-str (aref (recent-keys) (1- (length (recent-keys))))))) - (cond ((not (featurep 'xemacs)) - (and (not (integerp input)) - (eventp input) - (setq input (event-basic-type input)))) - ((featurep 'xemacs) - (if (eventp input) - (setq input (event-to-character input))))) + (and (not (integerp input)) + (eventp input) + (setq input (event-basic-type input))) (if (or (symbolp input) (and (integerp input) (= input ?\r))) (setq input (hargs:at-p))) @@ -202,24 +199,6 @@ With optional HELP-STRING-FLAG, instead returns the one line help string for the (if (eq owind (minibuffer-window)) (select-window owind))))) -(defun hui:menu-xemacs (&optional menu menu-list) - "Returns an XEmacs menu built from a Hyperbole minibuffer menu. -Optional MENU (a symbol) specifies a specific submenu of optional MENU-LIST. -a Hyperbole menu list structure. Otherwise, all menus are used. -MENU defaults to 'hyperbole and MENU-LIST to `hui:menus'. See `hui:menus' -definition for the format of the menu list structure." - (mapcar - (lambda (entry) - (or (consp entry) - (error "(hui:menu-xemacs): Invalid menu entry: %s" entry)) - (let ((label (car entry)) - (content (car (cdr entry)))) - (cond ((null content) (hypb:replace-match-string ">$" label "" t)) - ((and (consp content) (eq (car content) 'menu)) - (hui:menu-xemacs (cdr content))) - (t (vector label content 't))))) - (cdr (assq (or menu 'hyperbole) (or menu-list hui:menus))))) - (defun hui:menu-select (menu-alist &optional doc-flag help-string-flag) "Prompts user to choose the first character of any item from MENU-ALIST. Case is not significant. If chosen by direct selection with the Assist Key, @@ -384,10 +363,6 @@ constructs. If not given, the top-level Hyperbole menu is used." (define-key hui:menu-mode-map [backtab] #'hui:menu-backward-item) ;; Shift-TAB (define-key hui:menu-mode-map "\M-\C-i" #'hui:menu-backward-item) ;; M-TAB ;; - ;; This next binding is necessary since the default button1 binding under - ;; XEmacs, mouse-track, is broken under XEmacs V19.8. - (and (featurep 'xemacs) window-system - (define-key hui:menu-mode-map 'button1 'mouse-set-point)) (let ((i 32)) (while (<= i 126) (define-key hui:menu-mode-map (char-to-string i) 'hui:menu-enter) @@ -552,8 +527,8 @@ constructs. If not given, the top-level Hyperbole menu is used." )) '(ebut . (("EButton>") - ("Act" hui:hbut-act - "Activates button at point or prompts for explicit button.") + ("Act" hui:ebut-act + "Activates explicit button at point or prompts for explicit button to activate.") ("Create" hui:ebut-create) ("Delete" hui:ebut-delete) ("Edit" hui:ebut-modify "Modifies any desired button attributes.") @@ -605,6 +580,10 @@ constructs. If not given, the top-level Hyperbole menu is used." ("Help" hui:hbut-help "Reports on button's attributes.") ("Info" (id-info "(hyperbole)Implicit Buttons") "Displays manual section on implicit buttons.") + ("Label" hui:ibut-label-create + "Creates an implicit button label preceding an existing implicit button at point, if any.") + ("Rename" hui:ibut-rename + "Modifies a label preceding an implicit button in the current buffer.") ("Types" (hui:htype-help 'ibtypes 'no-sort) "Displays documentation for one or all implicit button types.") )) @@ -635,7 +614,7 @@ constructs. If not given, the top-level Hyperbole menu is used." )) '(otl . (("Kotl>") - ("All" kotl-mode:show-all "Expand all collapsed cells.") + ("All" kotl-mode:show-all "Expand all collapsed cells.") ("Blanks" kvspec:toggle-blank-lines "Toggle blank lines between cells on or off.") ("Create" kfile:find "Create or edit an outline file.") @@ -659,7 +638,7 @@ constructs. If not given, the top-level Hyperbole menu is used." (kotl-mode:show-tree (kcell-view:label))) "Expand tree rooted at point.") ("Top" kotl-mode:top-cells - "Hide all but top-level cells.") + "Hide all but top-level cells.") ("Vspec" kvspec:activate "Prompt for and activate a view specifiction.") )) |