Commits

youngs  committed 90029b2

2001-12-18 Steve Youngs <youngs@xemacs.org>

* package-info.in: (provides): Update to include all provides.

2001-11-20 Dr. Volker Zell <Dr.Volker.Zell@oracle.com>

* psgml-html.el (html-helper-expert-menu): Take into account if the
value of `browse-url-browser-function' is not a function but a list of
pairs.

Also increment the version in the Makefile

  • Participants
  • Parent commits 1cca86d
  • Tags psgml-1_24

Comments (0)

Files changed (4)

+2001-12-18  Steve Youngs  <youngs@xemacs.org>
+
+	* package-info.in: (provides): Update to include all provides.
+
+2001-11-20  Dr. Volker Zell  <Dr.Volker.Zell@oracle.com>
+
+	* psgml-html.el (html-helper-expert-menu): Take into account if the
+	value of `browse-url-browser-function' is not a function but a list of
+	pairs.
+
 2001-02-18  Adrian Aichner  <adrian@xemacs.org>
 
 	* psgml-edit.el (sgml-indent-line): Revert sgml-indent-line to
 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 # Boston, MA 02111-1307, USA.
 
-VERSION = 1.23
+VERSION = 1.24
 AUTHOR_VERSION = 1.22
 MAINTAINER = XEmacs Development Team <xemacs-beta@xemacs.org>
 PACKAGE = psgml

File package-info.in

    filename FILENAME
    md5sum MD5SUM
    size SIZE
-   provides (psgml sgml)
+   provides (iso-sgml psgml-api psgml-charent psgml-debug psgml-dtd psgml-edit psgml-fs psgml-html psgml-info psgml-parse psgml-xemacs psgml sgml-mode)
    requires (REQUIRES)
    type regular
 ))

File psgml-html.el

 	(setq html-helper-mode-menu
 	      (cons '["Load this Buffer in Browser" browse-url-of-file t]
 		    html-helper-mode-menu)))
-    (if (and (boundp 'browse-url-browser-function)
-	     (fboundp browse-url-browser-function))
-	(setq html-helper-mode-menu
-	      (cons (vector "Browse URL at point"
-			    browse-url-browser-function t)
-		    html-helper-mode-menu)))
+    (setq html-helper-mode-menu
+          (cons (vector "Browse URL at point"
+                        (when (and (boundp 'browse-url-browser-function)
+                                   browse-url-browser-function)
+                          ;; If the value is not a function it should be a list of pairs
+                          ;; (REGEXP . FUNCTION)
+                          (cond
+                           ((functionp browse-url-browser-function))
+                           ((listp browse-url-browser-function)
+                            (dolist (elt browse-url-browser-function)
+                              (when (not (string-match "mail" (symbol-name (cdr-safe elt))))
+                                (return (cdr elt)))))))
+                        t)
+                html-helper-mode-menu))
 
     ;; cons in the timestamp delimiters
     (setq html-helper-mode-menu