rpms/emacs
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Mention xdg-open in browse-url-default-browser docstring (rhbz#624359)

Browse Source
This commit is contained in:
Karel Klic 2010-08-19 16:51:25 +02:00
parent a6db380e63
commit 9a6eac7ea3
2 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
emacs-23.1-xdg.patch
View File

@ -1,7 +1,7 @@
diff -up emacs-23.1/lisp/net/browse-url.el.xdg emacs-23.1/lisp/net/browse-url.el diff -u emacs-23.2/lisp/net/browse-url.el.xdg emacs-23.2/lisp/net/browse-url.el
--- emacs-23.1/lisp/net/browse-url.el.xdg 2009-09-18 15:10:03.000000000 -0400 --- emacs-23.2/lisp/net/browse-url.el.xdg 2010-04-04 08:26:06.000000000 +1000
+++ emacs-23.1/lisp/net/browse-url.el 2009-09-18 15:18:51.000000000 -0400 +++ emacs-23.2/lisp/net/browse-url.el 2010-08-16 16:49:33.000000000 +1000
@@ -234,6 +234,7 @@ associated with the first REGEXP which m @@ -234,6 +234,7 @@
function is passed the URL and any other args of `browse-url'. The last function is passed the URL and any other args of `browse-url'. The last
regexp should probably be \".\" to specify a default browser." regexp should probably be \".\" to specify a default browser."
:type '(choice :type '(choice
@ -9,7 +9,7 @@ diff -up emacs-23.1/lisp/net/browse-url.el.xdg emacs-23.1/lisp/net/browse-url.el
(function-item :tag "Emacs W3" :value browse-url-w3) (function-item :tag "Emacs W3" :value browse-url-w3)
(function-item :tag "W3 in another Emacs via `gnudoit'" (function-item :tag "W3 in another Emacs via `gnudoit'"
:value browse-url-w3-gnudoit) :value browse-url-w3-gnudoit)
@@ -266,6 +267,23 @@ regexp should probably be \".\" to speci @@ -266,6 +267,23 @@
:version "21.1" :version "21.1"
:group 'browse-url) :group 'browse-url)
@ -33,7 +33,12 @@ diff -up emacs-23.1/lisp/net/browse-url.el.xdg emacs-23.1/lisp/net/browse-url.el
(defcustom browse-url-netscape-program "netscape" (defcustom browse-url-netscape-program "netscape"
;; Info about netscape-remote from Karl Berry. ;; Info about netscape-remote from Karl Berry.
"The name by which to invoke Netscape. "The name by which to invoke Netscape.
@@ -876,6 +894,8 @@ The order attempted is gnome-moz-remote, @@ -885,10 +903,12 @@
When called non-interactively, optional second argument NEW-WINDOW is
used instead of `browse-url-new-window-flag'.
-The order attempted is gnome-moz-remote, Mozilla, Firefox,
+The order attempted is xdg-open, gnome-moz-remote, Mozilla, Firefox,
Galeon, Konqueror, Netscape, Mosaic, Lynx in an xterm, and then W3." Galeon, Konqueror, Netscape, Mosaic, Lynx in an xterm, and then W3."
(apply (apply
(cond (cond

6
emacs.spec
View File

@ -4,7 +4,7 @@ Summary: GNU Emacs text editor
Name: emacs Name: emacs
Epoch: 1 Epoch: 1
Version: 23.2 Version: 23.2
Release: 11%{?dist} Release: 12%{?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
@ -444,6 +444,10 @@ update-desktop-database &> /dev/null || :
%{_datadir}/applications/emacs-terminal.desktop %{_datadir}/applications/emacs-terminal.desktop
%changelog %changelog
* Thu Aug 19 2010 Karel Klic <kklic@redhat.com> - 1:23.2-12
- Mention xdg-open in browse-url-default-browser docstring (rhbz#624359)
Updates emacs-23.1-xdg.patch
* Tue Aug 17 2010 Karel Klic <kklic@redhat.com> - 1:23.2-11 * Tue Aug 17 2010 Karel Klic <kklic@redhat.com> - 1:23.2-11
- Own /usr/bin/emacs (rhbz#614935) - Own /usr/bin/emacs (rhbz#614935)
- Updated the handling of alternatives to match - Updated the handling of alternatives to match