[elpa] externals/hyperbole 56e88ca 47/51: Merge branch 'master' of hyperbole

[Stefan Monnier]

branch: externals/hyperbole
commit 56e88cadff71577e25dfbf91bd3610a43e242409
Merge: 8c234bf 034d672
Author: Bob Weiner <Bob.Weiner@DuffandPhelps.com>
Commit: Bob Weiner <Bob.Weiner@DuffandPhelps.com>

    Merge branch 'master' of hyperbole
---
 hsettings.el | 7 +++----
 hui-jmenu.el | 2 +-
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/hsettings.el b/hsettings.el
index 7a3e0eb..1ced82c 100644
--- a/hsettings.el
+++ b/hsettings.el
@@ -159,10 +159,9 @@ package to display search results."
     (if (assoc service-name hyperbole-web-search-alist)
        (let ((browse-url-browser-function
               hyperbole-web-search-browser-function))
-         (browse-url (browse-url-url-encode-chars
-                      (format (cdr (assoc service-name 
hyperbole-web-search-alist))
-                              search-term)
-                      "[*\"()',=;?% ]")))
+         (browse-url
+          (format (cdr (assoc service-name hyperbole-web-search-alist))
+                  (browse-url-url-encode-chars search-term "[*\"()',=;?% ]"))))
       (user-error "(Hyperbole): Invalid web search service `%s'" 
service-name))))
 
 (defcustom inhibit-hyperbole-messaging t
diff --git a/hui-jmenu.el b/hui-jmenu.el
index b8466d56..9a7277b 100644
--- a/hui-jmenu.el
+++ b/hui-jmenu.el
@@ -145,7 +145,7 @@
     (if mname
        ;; Next line needed to ensure mode name is always formatted as
        ;; a string.
-       (format-mode-line mname)
+       (format-mode-line (or (car-safe mname) mname))
       (capitalize (symbol-name (buffer-local-value 'major-mode buffer))))))
 
 (defun hui-menu-frame-name (frame)