rpms/xemacs-packages-extra/devel xemacs-packages-extra-20061221-browsers.patch, NONE, 1.1 .cvsignore, 1.2, 1.3 sources, 1.2, 1.3 xemacs-packages-extra.spec, 1.2, 1.3 xemacs-packages-extra-20060510-browse-url-htmlview-84262.patch, 1.1, NONE xemacs-packages-extra-20060510-psgml-browsers-84262.patch, 1.1, NONE
Ville Skytta (scop)
fedora-extras-commits at redhat.com
Mon Apr 2 16:52:57 UTC 2007
Author: scop
Update of /cvs/extras/rpms/xemacs-packages-extra/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29702
Modified Files:
.cvsignore sources xemacs-packages-extra.spec
Added Files:
xemacs-packages-extra-20061221-browsers.patch
Removed Files:
xemacs-packages-extra-20060510-browse-url-htmlview-84262.patch
xemacs-packages-extra-20060510-psgml-browsers-84262.patch
Log Message:
* Mon Apr 2 2007 Ville Skyttä <ville.skytta at iki.fi> - 20061221-1
- 2006-12-21 + backport of upstream browse-url/xdg-open changes.
- Drop no longer needed ruby-mode-xemacs Provides/Obsoletes.
xemacs-packages-extra-20061221-browsers.patch:
--- NEW FILE xemacs-packages-extra-20061221-browsers.patch ---
--- xemacs-packages-extra-20061221/xemacs-packages/psgml/psgml-html.el~ 2003-08-29 11:19:58.000000000 +0300
+++ xemacs-packages-extra-20061221/xemacs-packages/psgml/psgml-html.el 2007-04-02 18:48:43.000000000 +0300
@@ -931,27 +931,27 @@
(defvar sgml-html-menu
(cons "HTML"
- (append '(["View in Netscape" sgml-html-netscape-file
- (buffer-file-name
- (current-buffer))]
- ["View in W3" w3-preview-this-buffer t]
- ["View in kfm" sgml-html-kfm-file
+ (append '(["View in default browser" browse-url-of-buffer t]
+ ["View in Firefox" sgml-html-netscape-file
+ (buffer-file-name (current-buffer))]
+ ["View in Konqueror" sgml-html-kfm-file
(buffer-file-name (current-buffer))]
+ ["View in W3" w3-preview-this-buffer t]
"---"
["HTML-Quote Region" html-quote-region t]
"---")
(cdr sgml-main-menu))))
(defun sgml-html-netscape-file ()
- "Preview the file for the current buffer in Netscape."
+ "Preview the file for the current buffer in Firefox."
(interactive)
- (highlight-headers-follow-url-netscape
+ (browse-url-firefox
(concat "file:" (buffer-file-name (current-buffer)))))
(defun sgml-html-kfm-file ()
- "Preview the file for the current buffer in kfm."
+ "Preview the file for the current buffer in Konqueror."
(interactive)
- (highlight-headers-follow-url-kfm
+ (browse-url-kde
(concat "file:" (buffer-file-name (current-buffer)))))
;;;###autoload(add-to-list 'auto-mode-alist '("\\.[sj]?html?\\'" . html-mode))
--- xemacs-packages-extra-20061221/xemacs-packages/mail-lib/browse-url.el~ 2006-10-19 22:57:06.000000000 +0300
+++ xemacs-packages-extra-20061221/xemacs-packages/mail-lib/browse-url.el 2007-04-02 18:51:08.000000000 +0300
@@ -58,6 +58,7 @@
;; browse-url-generic arbitrary
;; browse-url-default-windows-browser MS-Windows browser
;; browse-url-default-macosx-browser Mac OS X browser
+;; browse-url-default-xdg-browser freedesktop.org browser
;; browse-url-gnome-moz GNOME interface to Mozilla
;; browse-url-kde KDE konqueror (kfm)
;; browse-url-opera Opera
@@ -290,6 +291,8 @@
:value browse-url-default-windows-browser)
(function-item :tag "Default Mac OS X browser"
:value browse-url-default-macosx-browser)
+ (function-item :tag "Default freedesktop.org browser"
+ :value browse-url-default-xdg-browser)
(function-item :tag "GNOME invoking Mozilla"
:value browse-url-gnome-moz)
(function-item :tag "Default browser"
@@ -859,6 +862,20 @@
(interactive (browse-url-interactive-arg "URL: "))
(start-process (concat "open " url) nil "open" url))
+;;;###autoload
+(defcustom browse-url-xdg-open-program "xdg-open"
+ "*The name by which to invoke xdg-open."
+ :type 'string
+ :group 'browse-url)
+
+;;;###autoload
+(defun browse-url-default-xdg-browser (url &optional new-window)
+ (interactive (browse-url-interactive-arg "URL: "))
+ (let ((process-environment (browse-url-process-environment))
+ (process-connection-type nil))
+ (start-process (concat browse-url-xdg-open-program " " url) nil
+ browse-url-xdg-open-program url)))
+
;; --- Netscape ---
(defun browse-url-process-environment ()
@@ -894,11 +911,13 @@
When called non-interactively, optional second argument NEW-WINDOW is
used instead of `browse-url-new-window-flag'.
-The order attempted is emacs-w3m, gnome-moz-remote, Mozilla, Firefox,
-SeaMonkey, Galeon, Konqueror, Netscape, Opera, Mosaic, IXI Mosaic,
-Lynx in an xterm, MMM, and then W3."
+The order attempted is freedesktop.org default, gnome-moz-remote, Mozilla,
+Firefox, SeaMonkey, Galeon, Konqueror, Netscape, Opera, Mosaic, IXI Mosaic,
+emacs-w3m, Lynx in an xterm, MMM, and then W3."
(apply
(cond
+ ((executable-find browse-url-xdg-open-program)
+ 'browse-url-default-xdg-browser)
((executable-find browse-url-gnome-moz-program) 'browse-url-gnome-moz)
((executable-find browse-url-mozilla-program) 'browse-url-mozilla)
((executable-find browse-url-firefox-program) 'browse-url-firefox)
--- xemacs-packages-extra-20061221/xemacs-packages/mail-lib/browse-url-xemacs.el~ 2005-03-09 13:14:56.000000000 +0200
+++ xemacs-packages-extra-20061221/xemacs-packages/mail-lib/browse-url-xemacs.el 2007-04-02 18:51:20.000000000 +0300
@@ -140,6 +140,14 @@
:selected (eq browse-url-browser-function 'browse-url-default-windows-browser)
:active (and (fboundp 'mswindows-shell-execute)
(fboundp 'browse-url-default-windows-browser))]
+ ["Free%_desktop.org Default Browser"
+ (customize-set-variable 'browse-url-browser-function
+ 'browse-url-default-xdg-browser)
+ :style radio
+ :selected (eq browse-url-browser-function
+ 'browse-url-default-xdg-browser)
+ :active (and (fboundp 'browse-url-default-xdg-browser)
+ (executable-find browse-url-xdg-open-program))]
["G%_eneric Browser"
(customize-set-variable 'browse-url-browser-function
'browse-url-generic)
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xemacs-packages-extra/devel/.cvsignore,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- .cvsignore 10 Sep 2006 09:38:39 -0000 1.2
+++ .cvsignore 2 Apr 2007 16:52:24 -0000 1.3
@@ -1 +1 @@
-xemacs-packages-extra-20060510.tar.bz2
+xemacs-packages-extra-20061221.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xemacs-packages-extra/devel/sources,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- sources 10 Sep 2006 09:38:39 -0000 1.2
+++ sources 2 Apr 2007 16:52:24 -0000 1.3
@@ -1 +1 @@
-bd3add53ce482a2687127eabe338fe1f xemacs-packages-extra-20060510.tar.bz2
+7b9193c209dfa8416b62e034efdf7e76 xemacs-packages-extra-20061221.tar.bz2
Index: xemacs-packages-extra.spec
===================================================================
RCS file: /cvs/extras/rpms/xemacs-packages-extra/devel/xemacs-packages-extra.spec,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xemacs-packages-extra.spec 10 Sep 2006 11:54:06 -0000 1.2
+++ xemacs-packages-extra.spec 2 Apr 2007 16:52:24 -0000 1.3
@@ -2,8 +2,8 @@
%define xemver v=$(rpm -q --qf=%%{VERSION} xemacs) ; case $v in 2*) echo $v ;; *) echo 0 ;; esac
Name: xemacs-packages-extra
-Version: 20060510
-Release: 4%{?dist}
+Version: 20061221
+Release: 1%{?dist}
Summary: Collection of XEmacs lisp packages
Group: Applications/Editors
@@ -27,8 +27,7 @@
Patch3: %{name}-20060510-auctex-texsite-jlatex-detect-69129.patch
Patch4: %{name}-20060510-auctex-texjp-platex.patch
Patch5: %{name}-20060510-egg-wnn-host-unix-79826.patch
-Patch6: %{name}-20060510-browse-url-htmlview-84262.patch
-Patch7: %{name}-20060510-psgml-browsers-84262.patch
+Patch6: %{name}-20061221-browsers.patch
Patch8: %{name}-20060510-avoid-catch-error-65346.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -44,8 +43,6 @@
# Fake release in apel provision in order to avoid self-obsoletion (for now).
Provides: apel-xemacs = 10.6-6
Obsoletes: apel-xemacs < 10.6-6
-Provides: ruby-mode-xemacs
-Obsoletes: ruby-mode-xemacs
Provides: xemacs-sumo = %{version}-%{release}
Obsoletes: xemacs-sumo < 20060510-3
@@ -100,10 +97,8 @@
%patch4 -p1
# make egg-wnn use unix domain socket by default
%patch5 -p1
-# default to htmlview as generic browse-url browser
+# update browsers in browse-url and psgml-html
%patch6 -p1
-# update psgml-html preview menu to modern browsers
-%patch7 -p1
# catch harmless errors in mouse-avoidance-too-close-p (avoid.el)
%patch8 -p1
@@ -230,6 +225,10 @@
%changelog
+* Mon Apr 2 2007 Ville Skyttä <ville.skytta at iki.fi> - 20061221-1
+- 2006-12-21 + backport of upstream browse-url/xdg-open changes.
+- Drop no longer needed ruby-mode-xemacs Provides/Obsoletes.
+
* Sun Sep 10 2006 Ville Skyttä <ville.skytta at iki.fi> - 20060510-4
- BuildRequire tetex.
--- xemacs-packages-extra-20060510-browse-url-htmlview-84262.patch DELETED ---
--- xemacs-packages-extra-20060510-psgml-browsers-84262.patch DELETED ---
More information about the scm-commits
mailing list