branch: externals/hyperbole
commit a2b8a90a1759d3a2ebdf02344fc3e517d6cc4437
Author: Bob Weiner <[email protected]>
Commit: Bob Weiner <[email protected]>
* hyperbole.el: Updated the header fields to better match GNU standards for
use
by the Lisp maintainer package, lisp-mnt.el.
---
ChangeLog | 5 +++++
hinit.el | 29 ++++++++++++++---------------
hyperbole.el | 22 ++++++++++++----------
3 files changed, 31 insertions(+), 25 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 3bd756c..8f8cbd0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
-- Almost all changes listed herein are new as of 2016. --
+2016-07-28 Bob Weiner <[email protected]>
+
+* hyperbole.el: Updated the header fields to better match GNU standards for use
+ by the Lisp maintainer package, lisp-mnt.el.
+
2016-07-27 Bob Weiner <[email protected]>
* hactypes.el (exec-shell-cmd): Replaced call to old function
'show-output-from-shell'
diff --git a/hinit.el b/hinit.el
index 955716e..2483485 100644
--- a/hinit.el
+++ b/hinit.el
@@ -29,26 +29,25 @@
;;; Public functions
;;; ************************************************************************
-(if (not (fboundp 'br-in-browser))
- ;; Then the OO-Browser is not loaded, so we can never be within the
- ;; browser. Define this as a dummy function that always returns nil
- ;; until the OO-Browser is ever loaded.
- (defun br-in-browser ()
- "Always returns nil since the OO-Browser is not loaded."
- nil))
+(unless (fboundp 'br-in-browser)
+ ;; Then the OO-Browser is not loaded, so we can never be within the
+ ;; browser. Define this as a dummy function that always returns nil
+ ;; until the OO-Browser is ever loaded.
+ (defun br-in-browser ()
+ "Always returns nil since the OO-Browser is not loaded."
+ nil))
;;;###autoload
(defun hyperb:init-menubar ()
"Add a pulldown menu for Hyperbole, if appropriate."
(interactive)
- (if (not (featurep 'infodock))
- (progn
- ;; Initialize now for when this is loaded after startup.
- (and (or hyperb:emacs-p (and (boundp 'current-menubar) current-menubar))
- after-init-time
- (hyperbole-menubar-menu))
- ;; Initialize at startup. This really is needed.
- (add-hook 'after-init-hook #'hyperbole-menubar-menu))))
+ (unless (featurep 'infodock)
+ ;; Initialize now for when this is loaded after startup.
+ (and (or hyperb:emacs-p (and (boundp 'current-menubar) current-menubar))
+ after-init-time
+ (hyperbole-menubar-menu))
+ ;; Initialize at startup. This really is needed.
+ (add-hook 'after-init-hook #'hyperbole-menubar-menu)))
;;; ************************************************************************
;;; Menu Support Functions
diff --git a/hyperbole.el b/hyperbole.el
index e10c3f9..ef45e86 100644
--- a/hyperbole.el
+++ b/hyperbole.el
@@ -1,18 +1,20 @@
;;; hyperbole.el --- GNU Hyperbole: The Everyday Hypertextual Information
Manager
-;;
+
+;; Copyright (C) 1992-2016 Free Software Foundation, Inc.
+
;; Author: Bob Weiner
-;; Maintainer: Bob Weiner <[email protected]> and Mats Lidell <[email protected]>
+;; Maintainer: Bob Weiner <[email protected]>
+;; Mats Lidell <[email protected]>
+;; Created: 06-Oct-92 at 11:52:51
+;; Released: 27-Jul-16
+;; Version: 6.0.1
;; Keywords: comm, convenience, files, frames, hypermedia, languages,
mail, matching, mouse, multimedia, outlines, tools, wp
;; Package: hyperbole
;; Package-Requires: ((emacs "24.4"))
;; URL: http://www.gnu.org/software/hyperbole
-;; Version: 6.0.1
-;; Orig-Date: 06-Oct-92 at 11:52:51
-;; Date: 27-Jul-16
-;;
-;; Copyright (C) 1992-2016 Free Software Foundation, Inc.
+
;; See the "HY-COPY" file for license information.
-;;
+
;; This file is part of GNU Hyperbole.
;;; Commentary:
@@ -203,8 +205,8 @@ Entry format is: (key-description key-sequence
key-binding)."
;;
;; Binds the Action Key to {M-RET} and the Assist Key to {C-u M-RET}
;; and loads the Hyperbole mouse key bindings.
- (and (not (where-is-internal 'hkey-either))
- (hkey-global-set-key "\M-\C-m" 'hkey-either))
+ (unless (where-is-internal 'hkey-either)
+ (hkey-global-set-key "\M-\C-m" 'hkey-either))
;;
;; Bind a key, {C-h A}, for Action Key help and {C-u C-h A} for Assist key
;; help.
