[elpa] externals/hyperbole 45714d5 46/53: Minor doc and code improvements

[Robert Weiner]

branch: externals/hyperbole
commit 45714d5c68a56cd89377b0e5c2c05f50e4c5820a
Author: Bob Weiner <address@hidden>
Commit: Bob Weiner <address@hidden>

    Minor doc and code improvements
---
 Changes        |  2 --
 HY-NEWS        |  8 ++++++--
 HY-WHY.kotl    | 16 ++++++++++------
 hib-kbd.el     |  4 ++--
 hmouse-drv.el  |  2 +-
 hypb.el        |  5 ++++-
 hyrolo-demo.el |  2 ++
 hyrolo.el      |  2 +-
 8 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/Changes b/Changes
index 664d310..1974d8e 100644
--- a/Changes
+++ b/Changes
@@ -72,8 +72,6 @@
     environment variable matched a symbol but the symbol was unbound, e.g. 
(hpath:substitute-value
     "${PATH}/python")
 
-----
-
 * hmouse-tag.el (smart-lisp-at-definition-p): Fixed to ignore lines like: 
(default (find-tag--default))
     so the function in that line can be found as a tag.
 
diff --git a/HY-NEWS b/HY-NEWS
index 6eb618b..b27c099 100644
--- a/HY-NEWS
+++ b/HY-NEWS
@@ -49,6 +49,7 @@
         {M-x occur RET}                 - M-x extended commands
         {M-x apropos RET hyperbole RET} - commands with arguments
        {C-x 2 C-x 3}                   - sequences of commands
+       {ESC: (+ 2 3) RET}              - lisp expressions
 
     - Pathname Environment Variables: Implicit Buttons may contain environment
       variables such as "${PATH}/python" and Hyperbole resolves them to the
@@ -162,6 +163,7 @@
       'c'.
 
     - New Hyperbole Manual Sections:
+        * Referent Display - setting of where link referents are displayed
         * Smart Mouse Key Drags
         * Smart Mouse Drags outside a Window
         * Smart Key - Image Thumbnails
@@ -176,14 +178,16 @@
       the Global Key Bindings appendix.
 
     - Other Hyperbole Manual Section Changes:
-        * Button Colors): Added doc on hproperty:but-highlight-flag.
+        * Button Colors: Added doc on hproperty:but-highlight-flag.
         * Glossary: Added Windows Grid entry.
         * Hook Variables: Added doc of: action-key-depress-hook,
           action-key-release-hook, assist-key-depress-hook
           and assist-key-release-hook.
-        * HyControl: Added Concept Index entries.
+        * HyControl: Added Google Contacts use and additional Concept Index 
entries.
         * Koutliner: Centralized all key binding index entries under 
"koutliner, ".
         * Manual Overview: Improved pointer to DEMO.
+        * Smart Key - WWW URLs: Added browse-url-browser-function and 
Cust/URL-Display reference.
+        * Using URLs with Find-File: Added URL browser customization menu 
reference and image.
 
     - New DEMO File Sections:
         * Dragging Buffers, Windows and Items
diff --git a/HY-WHY.kotl b/HY-WHY.kotl
index 8b0db66..ad71656 100644
--- a/HY-WHY.kotl
+++ b/HY-WHY.kotl
@@ -33,13 +33,15 @@
       and rapidly changeable views.
 
    7. Rapid control over what is displayed where in multiple windows
-      and frames with the Hyperbole HyControl system.
+      and frames with mouse drags and the Hyperbole HyControl system.
 
      7a. Drag Buffer Menu or Dired items to other windows to display
          them wherever you want.  Drag-and-drop text regions across
          Emacs frames.
 
-     7b. With one command, rapidly create a grid of tiled windows
+     7b. Swap buffers in windows across frames with a mouse drag.
+
+     7c. With one command, rapidly create a grid of tiled windows
          displaying either selected buffers, buffers with a specific
          major mode or the most recently used buffer list, e.g.
          {63 C-c @} creates 6 rows, each with 3 columns of windows (18
@@ -61,19 +63,19 @@
          
      7f. Easily adjust the height and width of windows as needed.
 
-     7g. Quick clicks on different areas of a buffer's modeline will
+     7f. Quick clicks on different areas of a buffer's modeline will
          rotate through your working list of buffers, changing what
          each window displays.  A popup menu gives you quick access to
          Hyperbole commands plus frame, window and buffer selection
          and management commands.  GNU documentation manuals may be
          shown and navigated with a single mouse key.
 
-     7h. A single mouse drag swaps what is displayed in each of two
+     7g. A single mouse drag swaps what is displayed in each of two
          windows, even across frames.
 
 
 "ben" ;; kvspec:current
-22 ;; id-counter
+23 ;; id-counter
 alpha ;; label-type
 4 ;; label-min-width
 ". " ;; label-separator
@@ -81,7 +83,7 @@ alpha ;; label-type
 
 ;; depth-first kcell attributes
 [[0
-  (creator "address@hidden" create-time "20171027:13:29:32" id-counter 22 file 
"/Users/bk/Dropbox/emacs/hyperbole/HY-WHY.kotl")]
+  (creator "address@hidden" create-time "20171108:01:14:52" id-counter 23 file 
"/Users/bk/Dropbox/emacs/hyperbole/HY-WHY.kotl")]
  [1
   (creator "address@hidden" create-time "20160524:15:04:17" no-fill t)]
  [17
@@ -98,6 +100,8 @@ alpha ;; label-type
   (creator "address@hidden" create-time "20160524:15:32:11" no-fill t)]
  [20
   (creator "address@hidden" create-time "20171019:22:07:29" no-fill t)]
+ [23
+  (creator "address@hidden" create-time "20171108:01:15:39" no-fill t)]
  [22
   (creator "address@hidden" create-time "20171024:13:41:50" no-fill t)]
  [15
diff --git a/hib-kbd.el b/hib-kbd.el
index e409673..2b19913 100644
--- a/hib-kbd.el
+++ b/hib-kbd.el
@@ -148,9 +148,9 @@ With optional prefix arg FULL, displays full documentation 
for command."
                            
"@key{RET}\\|<RET>\\|@key{RTN}\\|\\<RETURN\\>\\|\\<RET\\>\\|\\<RTN\\>"
                            norm-key-seq "address@hidden" t)
              norm-key-seq (hypb:replace-match-string
-                           "\\<ESCESC\\>" norm-key-seq "\233" t)
+                           "\\<ESC\s-*ESC\\>" norm-key-seq "\233" t)
              norm-key-seq (hypb:replace-match-string
-                           "@key{ESC}\\|<ESC>\\|\\<ESC\\>" norm-key-seq "M-" t)
+                           "@key{ESC}\\|<ESC>\\|\\<ESC\\(APE\\)?\\>" 
norm-key-seq "M-" t)
              norm-key-seq (hypb:replace-match-string
                            "C-M-" norm-key-seq "M-C-" t)
              norm-key-seq (kbd-key:mark-spaces-to-keep norm-key-seq "(" ")")
diff --git a/hmouse-drv.el b/hmouse-drv.el
index 994cedc..5485c36 100644
--- a/hmouse-drv.el
+++ b/hmouse-drv.el
@@ -409,7 +409,7 @@ Return non-nil iff associated help documentation is found."
                                (princ (if (string-match 
"\\`[a-zA-Z]*[a-rt-zA-RT-Z]+s[ [:punct:]]" doc)
                                           ":" " WILL:"))
                                (terpri) (terpri)
-                               (princ (replace-regexp-in-string "^" "  " doc))
+                               (princ (replace-regexp-in-string "^" "  " doc 
nil t))
                                (terpri) (terpri)))
                            calls)
 
diff --git a/hypb.el b/hypb.el
index afb8f91..16739f7 100644
--- a/hypb.el
+++ b/hypb.el
@@ -238,7 +238,10 @@ FILE is temporarily read into a buffer to determine the 
major mode if necessary.
   (if (stringp string)
       (replace-regexp-in-string
        "@@@" "%%" (replace-regexp-in-string
-                  "%" "%%" (replace-regexp-in-string "%%" "@@@" string)))))
+                  "%" "%%" (replace-regexp-in-string "%%" "@@@" string nil t)
+                  nil t)
+       nil t)))
+
 ;;;###autoload
 (defun hypb:functionp (obj)
 "Returns t if OBJ is a function, nil otherwise."
diff --git a/hyrolo-demo.el b/hyrolo-demo.el
index 50a0964..2b218cd 100644
--- a/hyrolo-demo.el
+++ b/hyrolo-demo.el
@@ -65,6 +65,8 @@ single argument."
   (fmakunbound 'hyrolo-demo-fgrep)
   (fmakunbound 'hyrolo-demo-fgrep-logical)
   (setq features (delq 'hyrolo-demo features))
+  (mapc (lambda (buf) (when (get-buffer buf) (kill-buffer buf)))
+       '("*Hyperbole Rolo*" "DEMO-ROLO.otl"))
   (load "hyperbole-autoloads")
   (fmakunbound 'hyrolo-demo-quit)
   (message "HyRolo demo code removed and {C-x 4 r} key binding reset."))
diff --git a/hyrolo.el b/hyrolo.el
index 010e89f..6116271 100644
--- a/hyrolo.el
+++ b/hyrolo.el
@@ -53,7 +53,7 @@ See documentation of the function `format-time-string' for 
format options."
 (defvar hyrolo-display-format-function
   ;; Set trailing newlines to exactly two.
   (lambda (entry)
-    (concat (replace-regexp-in-string "[ \t\n\r]+\\'" "" entry) "\n\n"))
+    (concat (replace-regexp-in-string "[ \t\n\r]+\\'" "" entry nil t) "\n\n"))
   "*Function of one argument, a rolo entry string, which modifies the string 
for display.")
 
 (defcustom hyrolo-email-format "%s\t\t<%s>"