fix #316131
This commit is contained in:
parent
1f15d928ee
commit
618b2baae3
44
emacs-23.1-xdg.patch
Normal file
44
emacs-23.1-xdg.patch
Normal file
@ -0,0 +1,44 @@
|
|||||||
|
diff -up emacs-23.1/lisp/net/browse-url.el.xdg emacs-23.1/lisp/net/browse-url.el
|
||||||
|
--- emacs-23.1/lisp/net/browse-url.el.xdg 2009-09-18 15:10:03.000000000 -0400
|
||||||
|
+++ emacs-23.1/lisp/net/browse-url.el 2009-09-18 15:18:51.000000000 -0400
|
||||||
|
@@ -234,6 +234,7 @@ associated with the first REGEXP which m
|
||||||
|
function is passed the URL and any other args of `browse-url'. The last
|
||||||
|
regexp should probably be \".\" to specify a default browser."
|
||||||
|
:type '(choice
|
||||||
|
+ (function-item :tag "Default freedesktop.org browser" :value browse-url-default-xdg-browser)
|
||||||
|
(function-item :tag "Emacs W3" :value browse-url-w3)
|
||||||
|
(function-item :tag "W3 in another Emacs via `gnudoit'"
|
||||||
|
:value browse-url-w3-gnudoit)
|
||||||
|
@@ -266,6 +267,23 @@ regexp should probably be \".\" to speci
|
||||||
|
:version "21.1"
|
||||||
|
:group 'browse-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)))
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+
|
||||||
|
(defcustom browse-url-netscape-program "netscape"
|
||||||
|
;; Info about netscape-remote from Karl Berry.
|
||||||
|
"The name by which to invoke Netscape.
|
||||||
|
@@ -876,6 +894,8 @@ The order attempted is gnome-moz-remote,
|
||||||
|
Galeon, Konqueror, Netscape, Mosaic, Lynx in an xterm, 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)
|
@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
|
|||||||
Name: emacs
|
Name: emacs
|
||||||
Epoch: 1
|
Epoch: 1
|
||||||
Version: 23.1
|
Version: 23.1
|
||||||
Release: 8%{?dist}
|
Release: 9%{?dist}
|
||||||
License: GPLv3+
|
License: GPLv3+
|
||||||
URL: http://www.gnu.org/software/emacs/
|
URL: http://www.gnu.org/software/emacs/
|
||||||
Group: Applications/Editors
|
Group: Applications/Editors
|
||||||
@ -27,6 +27,8 @@ Patch1: rpm-spec-mode.patch
|
|||||||
Patch2: po-mode-auto-replace-date-71264.patch
|
Patch2: po-mode-auto-replace-date-71264.patch
|
||||||
Patch3: rpm-spec-mode-utc.patch
|
Patch3: rpm-spec-mode-utc.patch
|
||||||
Patch4: emacs-gtk.patch
|
Patch4: emacs-gtk.patch
|
||||||
|
Patch5: emacs-23.1-xdg.patch
|
||||||
|
|
||||||
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
Buildroot: %{_tmppath}/%{name}-%{version}-root
|
||||||
BuildRequires: atk-devel, cairo-devel, desktop-file-utils, freetype-devel, fontconfig-devel, dbus-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel
|
BuildRequires: atk-devel, cairo-devel, desktop-file-utils, freetype-devel, fontconfig-devel, dbus-devel, giflib-devel, glibc-devel, gtk2-devel, libpng-devel
|
||||||
BuildRequires: libjpeg-devel, libtiff-devel, libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel
|
BuildRequires: libjpeg-devel, libtiff-devel, libX11-devel, libXau-devel, libXdmcp-devel, libXrender-devel, libXt-devel
|
||||||
@ -116,6 +118,7 @@ Emacs packages or see some elisp examples.
|
|||||||
%setup -q
|
%setup -q
|
||||||
%patch0 -p1 -b .glibc-open-macro
|
%patch0 -p1 -b .glibc-open-macro
|
||||||
%patch4 -p1 -b .gtk
|
%patch4 -p1 -b .gtk
|
||||||
|
%patch5 -p1 -b .xdg
|
||||||
|
|
||||||
# install rest of site-lisp files
|
# install rest of site-lisp files
|
||||||
( cd site-lisp
|
( cd site-lisp
|
||||||
@ -375,6 +378,9 @@ alternatives --install %{_bindir}/etags emacs.etags %{_bindir}/etags.emacs 80 \
|
|||||||
%dir %{_datadir}/emacs/%{version}
|
%dir %{_datadir}/emacs/%{version}
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Sep 24 2009 Daniel Novotny <dnovotny@redhat.com> 1:23.1-9
|
||||||
|
- use xdg-open(1) for opening URLs (#316131)
|
||||||
|
|
||||||
* Wed Sep 23 2009 Daniel Novotny <dnovotny@redhat.com> 1:23.1-8
|
* Wed Sep 23 2009 Daniel Novotny <dnovotny@redhat.com> 1:23.1-8
|
||||||
- updated rpm-spec-mode.el to latest upstream version (#524851)
|
- updated rpm-spec-mode.el to latest upstream version (#524851)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user