* [gentoo-commits] proj/emacs-tools:patchsets commit in: emacs/24.4/
@ 2014-10-28 18:30 Ulrich Müller
0 siblings, 0 replies; 4+ messages in thread
From: Ulrich Müller @ 2014-10-28 18:30 UTC (permalink / raw
To: gentoo-commits
commit: 841b949f03976e0f9db1a7c55665e6ccfa466354
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 28 02:51:32 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Tue Oct 28 02:51:32 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=841b949f
Add PaX/xattr patch to Emacs 24.4, bug 526948.
---
emacs/24.4/01_all_pax-xattr.patch | 16 ++++++++++++++++
1 file changed, 16 insertions(+)
diff --git a/emacs/24.4/01_all_pax-xattr.patch b/emacs/24.4/01_all_pax-xattr.patch
new file mode 100644
index 0000000..7cfce4b
--- /dev/null
+++ b/emacs/24.4/01_all_pax-xattr.patch
@@ -0,0 +1,16 @@
+Fix temacs startup failure with hardened Linux kernel when both
+CONFIG_PAX_PT_PAX_FLAGS and CONFIG_PAX_XATTR_PAX_FLAGS are enabled.
+https://bugs.gentoo.org/497498
+https://bugs.gentoo.org/526948
+
+--- emacs-24.4-orig/src/Makefile.in
++++ emacs-24.4/src/Makefile.in
+@@ -497,7 +497,7 @@
+ test "$(CANNOT_DUMP)" = "yes" || \
+ test "X$(PAXCTL)" = X || $(PAXCTL) -r temacs$(EXEEXT)
+ test "$(CANNOT_DUMP)" = "yes" || test -z "$(SETFATTR)" || \
+- $(SETFATTR) -n user.pax.flags -v r $@
++ $(SETFATTR) -n user.pax.flags -v er $@
+
+ ## The following oldxmenu-related rules are only (possibly) used if
+ ## HAVE_X11 && !USE_GTK, but there is no harm in always defining them.
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/emacs-tools:patchsets commit in: emacs/24.4/
@ 2014-11-10 8:04 Ulrich Müller
0 siblings, 0 replies; 4+ messages in thread
From: Ulrich Müller @ 2014-11-10 8:04 UTC (permalink / raw
To: gentoo-commits
commit: 4b91be334a8f82cb5dc3df6d884c44eebfc605aa
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 10 07:37:04 2014 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Nov 10 07:37:04 2014 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=4b91be33
Fix runtime failure when load-path contains a nil element, bug 528664.
---
emacs/24.4/02_all_nil-in-load-path.patch | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/emacs/24.4/02_all_nil-in-load-path.patch b/emacs/24.4/02_all_nil-in-load-path.patch
new file mode 100644
index 0000000..ffced77
--- /dev/null
+++ b/emacs/24.4/02_all_nil-in-load-path.patch
@@ -0,0 +1,14 @@
+Fix runtime failure when load-path contains a nil element.
+https://bugs.gentoo.org/528664
+http://thread.gmane.org/gmane.emacs.devel/176646
+
+--- emacs-24.4-orig/lisp/startup.el
++++ emacs-24.4/lisp/startup.el
+@@ -1319,6 +1319,7 @@
+ (let (warned)
+ (dolist (dir load-path)
+ (and (not warned)
++ (stringp dir)
+ (string-match-p "/[._]emacs\\.d/?\\'" dir)
+ (string-equal (file-name-as-directory (expand-file-name dir))
+ (expand-file-name user-emacs-directory))
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/emacs-tools:patchsets commit in: emacs/24.4/
@ 2015-01-23 20:40 Ulrich Müller
0 siblings, 0 replies; 4+ messages in thread
From: Ulrich Müller @ 2015-01-23 20:40 UTC (permalink / raw
To: gentoo-commits
commit: 7f10f7bade537956fda28461a0cf36aa63282ce4
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 23 07:26:55 2015 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Fri Jan 23 07:26:55 2015 +0000
URL: http://sources.gentoo.org/gitweb/?p=proj/emacs-tools.git;a=commit;h=7f10f7ba
Don't shadow load-path in gnus, bug 537156.
---
emacs/24.4/03_all_gnus-image.patch | 25 +++++++++++++++++++++++++
1 file changed, 25 insertions(+)
diff --git a/emacs/24.4/03_all_gnus-image.patch b/emacs/24.4/03_all_gnus-image.patch
new file mode 100644
index 0000000..cb46e3b
--- /dev/null
+++ b/emacs/24.4/03_all_gnus-image.patch
@@ -0,0 +1,25 @@
+https://bugs.gentoo.org/537156
+http://debbugs.gnu.org/18813
+
+commit 7515423bc1935efeb43a85097e00f8758a7cc394
+Author: Katsumi Yamaoka <yamaoka@jpl.org>
+Date: Mon Oct 27 22:51:18 2014 +0000
+
+ [Backport] gnus.el (gnus-mode-line-buffer-identification):
+ Don't add image data for a non-graphic display;
+ Don't shadow load-path, it blocks autoloading of find-image (bug#18813)
+
+--- emacs-24.4-orig/lisp/gnus/gnus.el
++++ emacs-24.4/lisp/gnus/gnus.el
+@@ -328,8 +328,9 @@
+ (if (fboundp 'find-image)
+ (defun gnus-mode-line-buffer-identification (line)
+ (let ((str (car-safe line))
+- (load-path (mm-image-load-path)))
+- (if (and (stringp str)
++ (load-path (append (mm-image-load-path) load-path)))
++ (if (and (display-graphic-p)
++ (stringp str)
+ (string-match "^Gnus:" str))
+ (progn (add-text-properties
+ 0 5
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] proj/emacs-tools:patchsets commit in: emacs/24.4/
@ 2017-02-18 7:26 Ulrich Müller
0 siblings, 0 replies; 4+ messages in thread
From: Ulrich Müller @ 2017-02-18 7:26 UTC (permalink / raw
To: gentoo-commits
commit: 523c006893914c34bb63638d8e146fd5dc18016c
Author: Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 18 07:11:26 2017 +0000
Commit: Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Sat Feb 18 07:11:26 2017 +0000
URL: https://gitweb.gentoo.org/proj/emacs-tools.git/commit/?id=523c0068
Remove 24.4 patchset.
emacs/24.4/01_all_pax-xattr.patch | 16 --
emacs/24.4/02_all_nil-in-load-path.patch | 14 --
emacs/24.4/03_all_gnus-image.patch | 25 ---
emacs/24.4/04_all_games-sgid.patch | 259 -----------------------------
emacs/24.4/05_all_browse-url-firefox.patch | 110 ------------
5 files changed, 424 deletions(-)
diff --git a/emacs/24.4/01_all_pax-xattr.patch b/emacs/24.4/01_all_pax-xattr.patch
deleted file mode 100644
index 7cfce4b..0000000
--- a/emacs/24.4/01_all_pax-xattr.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Fix temacs startup failure with hardened Linux kernel when both
-CONFIG_PAX_PT_PAX_FLAGS and CONFIG_PAX_XATTR_PAX_FLAGS are enabled.
-https://bugs.gentoo.org/497498
-https://bugs.gentoo.org/526948
-
---- emacs-24.4-orig/src/Makefile.in
-+++ emacs-24.4/src/Makefile.in
-@@ -497,7 +497,7 @@
- test "$(CANNOT_DUMP)" = "yes" || \
- test "X$(PAXCTL)" = X || $(PAXCTL) -r temacs$(EXEEXT)
- test "$(CANNOT_DUMP)" = "yes" || test -z "$(SETFATTR)" || \
-- $(SETFATTR) -n user.pax.flags -v r $@
-+ $(SETFATTR) -n user.pax.flags -v er $@
-
- ## The following oldxmenu-related rules are only (possibly) used if
- ## HAVE_X11 && !USE_GTK, but there is no harm in always defining them.
diff --git a/emacs/24.4/02_all_nil-in-load-path.patch b/emacs/24.4/02_all_nil-in-load-path.patch
deleted file mode 100644
index ffced77..0000000
--- a/emacs/24.4/02_all_nil-in-load-path.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-Fix runtime failure when load-path contains a nil element.
-https://bugs.gentoo.org/528664
-http://thread.gmane.org/gmane.emacs.devel/176646
-
---- emacs-24.4-orig/lisp/startup.el
-+++ emacs-24.4/lisp/startup.el
-@@ -1319,6 +1319,7 @@
- (let (warned)
- (dolist (dir load-path)
- (and (not warned)
-+ (stringp dir)
- (string-match-p "/[._]emacs\\.d/?\\'" dir)
- (string-equal (file-name-as-directory (expand-file-name dir))
- (expand-file-name user-emacs-directory))
diff --git a/emacs/24.4/03_all_gnus-image.patch b/emacs/24.4/03_all_gnus-image.patch
deleted file mode 100644
index cb46e3b..0000000
--- a/emacs/24.4/03_all_gnus-image.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-https://bugs.gentoo.org/537156
-http://debbugs.gnu.org/18813
-
-commit 7515423bc1935efeb43a85097e00f8758a7cc394
-Author: Katsumi Yamaoka <yamaoka@jpl.org>
-Date: Mon Oct 27 22:51:18 2014 +0000
-
- [Backport] gnus.el (gnus-mode-line-buffer-identification):
- Don't add image data for a non-graphic display;
- Don't shadow load-path, it blocks autoloading of find-image (bug#18813)
-
---- emacs-24.4-orig/lisp/gnus/gnus.el
-+++ emacs-24.4/lisp/gnus/gnus.el
-@@ -328,8 +328,9 @@
- (if (fboundp 'find-image)
- (defun gnus-mode-line-buffer-identification (line)
- (let ((str (car-safe line))
-- (load-path (mm-image-load-path)))
-- (if (and (stringp str)
-+ (load-path (append (mm-image-load-path) load-path)))
-+ (if (and (display-graphic-p)
-+ (stringp str)
- (string-match "^Gnus:" str))
- (progn (add-text-properties
- 0 5
diff --git a/emacs/24.4/04_all_games-sgid.patch b/emacs/24.4/04_all_games-sgid.patch
deleted file mode 100644
index 882e3ca..0000000
--- a/emacs/24.4/04_all_games-sgid.patch
+++ /dev/null
@@ -1,259 +0,0 @@
-Backport support for update-game-score to run sgid instead of suid.
-This comprises parts of the following commits from upstream git:
-
-commit dbde138155118344b33dfd2db95f688a24a42fec
-Author: Ulrich Müller <ulm@gentoo.org>
-Date: Sun Feb 8 21:00:49 2015 +0100
-
- configure --with-gameuser now defaults to games group.
-
-commit 74ab488ff2e57f31eb5290266f0f3b1995ebf83e
-Author: Paul Eggert <eggert@cs.ucla.edu>
-Date: Thu Jan 22 00:39:30 2015 -0800
-
- Check exit statuses in lib-src/Makefile
-
-commit 7f4e7dd378c456b498c270b47b46aaae365a72ab
-Author: Ulrich Müller <ulm@gentoo.org>
-Date: Thu Jan 22 08:24:42 2015 +0100
-
- Don't fail if chown or chgrp for 'update-game-score' is unsuccessful.
-
-commit 20f66485526b69eb26f2e70bd835a5e1333559d5
-Author: Ulrich Müller <ulm@gentoo.org>
-Date: Fri Jan 16 09:25:25 2015 +0100
-
- Allow update-game-score to run sgid instead of suid.
-
---- emacs-24.4-orig/configure.ac
-+++ emacs-24.4/configure.ac
-@@ -313,10 +313,20 @@
- fi
-
- AC_ARG_WITH(gameuser,dnl
--[AS_HELP_STRING([--with-gameuser=USER],[user for shared game score files])])
--test "X${with_gameuser}" != X && test "${with_gameuser}" != yes \
-- && gameuser="${with_gameuser}"
--test "X$gameuser" = X && gameuser=games
-+[AS_HELP_STRING([--with-gameuser=USER_OR_GROUP],
-+ [user for shared game score files.
-+ An argument prefixed by ':' specifies a group instead.])])
-+gameuser=
-+gamegroup=
-+# We don't test if we can actually chown/chgrp here, because configure
-+# may run without root privileges. lib-src/Makefile.in will handle
-+# any errors due to missing user/group gracefully.
-+case ${with_gameuser} in
-+ no) ;;
-+ "" | yes) gamegroup=games ;;
-+ :*) gamegroup=`echo "${with_gameuser}" | sed -e "s/://"` ;;
-+ *) gameuser=${with_gameuser} ;;
-+esac
-
- AC_ARG_WITH([gnustep-conf],dnl
- [AS_HELP_STRING([--with-gnustep-conf=FILENAME],
-@@ -4658,6 +4668,7 @@
- AC_SUBST(bitmapdir)
- AC_SUBST(gamedir)
- AC_SUBST(gameuser)
-+AC_SUBST(gamegroup)
- ## FIXME? Nothing uses @LD_SWITCH_X_SITE@.
- ## src/Makefile.in did add LD_SWITCH_X_SITE (as a cpp define) to the
- ## end of LIBX_BASE, but nothing ever set it.
---- emacs-24.4-orig/lib-src/Makefile.in
-+++ emacs-24.4/lib-src/Makefile.in
-@@ -101,6 +101,7 @@
-
- gamedir=@gamedir@
- gameuser=@gameuser@
-+gamegroup=@gamegroup@
-
- # ==================== Utility Programs for the Build =================
-
-@@ -243,10 +244,25 @@
- umask 022; ${MKDIR_P} "$(DESTDIR)${gamedir}"; \
- touch "$(DESTDIR)${gamedir}/snake-scores"; \
- touch "$(DESTDIR)${gamedir}/tetris-scores"
-- -if chown ${gameuser} "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}" && chmod u+s "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}"; then \
-- chown ${gameuser} "$(DESTDIR)${gamedir}"; \
-+ifneq ($(gameuser),)
-+ if chown ${gameuser} \
-+ "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}" && \
-+ chmod u+s,go-r \
-+ "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}"; \
-+ then \
-+ chown ${gameuser} "$(DESTDIR)${gamedir}" && \
-+ chmod u=rwx,g=rx,o=rx "$(DESTDIR)${gamedir}"; \
-+ fi
-+else ifneq ($(gamegroup),)
-+ if chgrp ${gamegroup} \
-+ "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}" && \
-+ chmod g+s,o-r \
-+ "$(DESTDIR)${archlibdir}/update-game-score${EXEEXT}"; \
-+ then \
-+ chgrp ${gamegroup} "$(DESTDIR)${gamedir}" && \
- chmod u=rwx,g=rwx,o=rx "$(DESTDIR)${gamedir}"; \
- fi
-+endif
- exp_archlibdir=`cd "$(DESTDIR)${archlibdir}" && /bin/pwd`; \
- if [ "$$exp_archlibdir" != "`cd ${srcdir} && /bin/pwd`" ]; then \
- for file in ${SCRIPTS}; do \
---- emacs-24.4-orig/lib-src/update-game-score.c
-+++ emacs-24.4/lib-src/update-game-score.c
-@@ -21,8 +21,8 @@
-
-
- /* This program allows a game to securely and atomically update a
-- score file. It should be installed setuid, owned by an appropriate
-- user like `games'.
-+ score file. It should be installed either setuid or setgid, owned
-+ by an appropriate user or group like `games'.
-
- Alternatively, it can be compiled without HAVE_SHARED_GAME_DIR
- defined, and in that case it will store scores in the user's home
-@@ -89,7 +89,7 @@
- ptrdiff_t *size, struct score_entry const *newscore);
- static void sort_scores (struct score_entry *scores, ptrdiff_t count,
- bool reverse);
--static int write_scores (const char *filename,
-+static int write_scores (const char *filename, mode_t mode,
- const struct score_entry *scores, ptrdiff_t count);
-
- static _Noreturn void
-@@ -122,18 +122,19 @@
- }
-
- static const char *
--get_prefix (bool running_suid, const char *user_prefix)
-+get_prefix (bool privileged, const char *user_prefix)
- {
-- if (!running_suid && user_prefix == NULL)
-- lose ("Not using a shared game directory, and no prefix given.");
-- if (running_suid)
-+ if (privileged)
- {
- #ifdef HAVE_SHARED_GAME_DIR
- return HAVE_SHARED_GAME_DIR;
- #else
-- lose ("This program was compiled without HAVE_SHARED_GAME_DIR,\n and should not be suid.");
-+ lose ("This program was compiled without HAVE_SHARED_GAME_DIR,\n"
-+ "and should not run with elevated privileges.");
- #endif
- }
-+ if (user_prefix == NULL)
-+ lose ("Not using a shared game directory, and no prefix given.");
- return user_prefix;
- }
-
-@@ -141,7 +142,7 @@
- main (int argc, char **argv)
- {
- int c;
-- bool running_suid;
-+ bool running_suid, running_sgid;
- void *lockstate;
- char *scorefile;
- char *nl;
-@@ -183,8 +184,11 @@
- usage (EXIT_FAILURE);
-
- running_suid = (getuid () != geteuid ());
-+ running_sgid = (getgid () != getegid ());
-+ if (running_suid && running_sgid)
-+ lose ("This program can run either suid or sgid, but not both.");
-
-- prefix = get_prefix (running_suid, user_prefix);
-+ prefix = get_prefix (running_suid || running_sgid, user_prefix);
-
- scorefile = malloc (strlen (prefix) + strlen (argv[optind]) + 2);
- if (!scorefile)
-@@ -234,7 +238,8 @@
- scores += scorecount - max_scores;
- scorecount = max_scores;
- }
-- if (write_scores (scorefile, scores, scorecount) < 0)
-+ if (write_scores (scorefile, running_sgid ? 0664 : 0644,
-+ scores, scorecount) < 0)
- {
- unlock_file (scorefile, lockstate);
- lose_syserr ("Failed to write scores file");
-@@ -429,8 +434,8 @@
- }
-
- static int
--write_scores (const char *filename, const struct score_entry *scores,
-- ptrdiff_t count)
-+write_scores (const char *filename, mode_t mode,
-+ const struct score_entry *scores, ptrdiff_t count)
- {
- int fd;
- FILE *f;
-@@ -444,7 +449,7 @@
- if (fd < 0)
- return -1;
- #ifndef DOS_NT
-- if (fchmod (fd, 0644) != 0)
-+ if (fchmod (fd, mode) != 0)
- return -1;
- #endif
- f = fdopen (fd, "w");
-@@ -460,7 +465,7 @@
- if (rename (tempfile, filename) != 0)
- return -1;
- #ifdef DOS_NT
-- if (chmod (filename, 0644) < 0)
-+ if (chmod (filename, mode) < 0)
- return -1;
- #endif
- return 0;
---- emacs-24.4-orig/lisp/play/gamegrid.el
-+++ emacs-24.4/lisp/play/gamegrid.el
-@@ -462,22 +462,22 @@
- ;; `gamegrid-add-score' was supposed to be used in the past and
- ;; is covered here for backward-compatibility.
- ;;
--;; 2. The helper program "update-game-score" is setuid and the
--;; file FILE does already exist in a system wide shared game
--;; directory. This should be the normal case on POSIX systems,
--;; if the game was installed system wide. Use
-+;; 2. The helper program "update-game-score" is setgid or setuid
-+;; and the file FILE does already exist in a system wide shared
-+;; game directory. This should be the normal case on POSIX
-+;; systems, if the game was installed system wide. Use
- ;; "update-game-score" to add the score to the file in the
- ;; shared game directory.
- ;;
--;; 3. "update-game-score" is setuid, but the file FILE does *not*
--;; exist in the system wide shared game directory. Use
-+;; 3. "update-game-score" is setgid/setuid, but the file FILE does
-+;; *not* exist in the system wide shared game directory. Use
- ;; `gamegrid-add-score-insecure' to create--if necessary--and
- ;; update FILE. This is for the case that a user has installed
- ;; a game on her own.
- ;;
--;; 4. "update-game-score" is not setuid. Use it to create/update
--;; FILE in the user's home directory. There is presumably no
--;; shared game directory.
-+;; 4. "update-game-score" is not setgid/setuid. Use it to
-+;; create/update FILE in the user's home directory. There is
-+;; presumably no shared game directory.
-
- (defvar gamegrid-shared-game-dir)
-
-@@ -486,13 +486,13 @@
- (not (zerop (logand (file-modes
- (expand-file-name "update-game-score"
- exec-directory))
-- #o4000)))))
-+ #o6000)))))
- (cond ((file-name-absolute-p file)
- (gamegrid-add-score-insecure file score))
- ((and gamegrid-shared-game-dir
- (file-exists-p (expand-file-name file shared-game-score-directory)))
-- ;; Use the setuid "update-game-score" program to update a
-- ;; system-wide score file.
-+ ;; Use the setgid (or setuid) "update-game-score" program
-+ ;; to update a system-wide score file.
- (gamegrid-add-score-with-update-game-score-1 file
- (expand-file-name file shared-game-score-directory) score))
- ;; Else: Add the score to a score file in the user's home
diff --git a/emacs/24.4/05_all_browse-url-firefox.patch b/emacs/24.4/05_all_browse-url-firefox.patch
deleted file mode 100644
index 39b49c9..0000000
--- a/emacs/24.4/05_all_browse-url-firefox.patch
+++ /dev/null
@@ -1,110 +0,0 @@
-https://bugs.gentoo.org/542046
-http://debbugs.gnu.org/19921
-
-This comprises parts of the following commit from upstream git:
-
-commit 1b0ebbdb566a8dfa5f45ce121b2c835e9760091f
-Author: Glenn Morris <rgm@gnu.org>
-Date: Tue Feb 24 18:02:11 2015 -0500
-
- browse-url-firefox: update for firefox 36's removal of -remote
-
---- emacs-24.4-orig/lisp/net/browse-url.el
-+++ emacs-24.4/lisp/net/browse-url.el
-@@ -337,6 +337,9 @@
- :type '(repeat (string :tag "Argument"))
- :group 'browse-url)
-
-+(make-obsolete-variable 'browse-url-firefox-startup-arguments
-+ "it no longer has any effect." "24.4-r4")
-+
- (defcustom browse-url-chromium-program
- (let ((candidates '("chromium" "chromium-browser")))
- (while (and candidates (not (executable-find (car candidates))))
-@@ -1102,68 +1105,32 @@
- ;;;###autoload
- (defun browse-url-firefox (url &optional new-window)
- "Ask the Firefox WWW browser to load URL.
--Default to the URL around or before point. The strings in
--variable `browse-url-firefox-arguments' are also passed to
--Firefox.
-+Defaults to the URL around or before point. Passes the strings
-+in the variable `browse-url-firefox-arguments' to Firefox.
-
--When called interactively, if variable
--`browse-url-new-window-flag' is non-nil, load the document in a
--new Firefox window, otherwise use a random existing one. A
--non-nil interactive prefix argument reverses the effect of
--`browse-url-new-window-flag'.
-+Interactively, if the variable `browse-url-new-window-flag' is non-nil,
-+loads the document in a new Firefox window. A non-nil prefix argument
-+reverses the effect of `browse-url-new-window-flag'.
-
- If `browse-url-firefox-new-window-is-tab' is non-nil, then
- whenever a document would otherwise be loaded in a new window, it
- is loaded in a new tab in an existing window instead.
-
--When called non-interactively, optional second argument
--NEW-WINDOW is used instead of `browse-url-new-window-flag'.
--
--On MS-Windows systems the optional `new-window' parameter is
--ignored. Firefox for Windows does not support the \"-remote\"
--command line parameter. Therefore, the
--`browse-url-new-window-flag' and `browse-url-firefox-new-window-is-tab'
--are ignored as well. Firefox on Windows will always open the requested
--URL in a new window."
-+Non-interactively, this uses the optional second argument NEW-WINDOW
-+instead of `browse-url-new-window-flag'."
- (interactive (browse-url-interactive-arg "URL: "))
- (setq url (browse-url-encode-url url))
-- (let* ((process-environment (browse-url-process-environment))
-- (use-remote
-- (not (memq system-type '(windows-nt ms-dos))))
-- (process
-- (apply 'start-process
-- (concat "firefox " url) nil
-- browse-url-firefox-program
-- (append
-- browse-url-firefox-arguments
-- (if use-remote
-- (list "-remote"
-- (concat
-- "openURL("
-- url
-- (if (browse-url-maybe-new-window new-window)
-- (if browse-url-firefox-new-window-is-tab
-- ",new-tab"
-- ",new-window"))
-- ")"))
-- (list url))))))
-- ;; If we use -remote, the process exits with status code 2 if
-- ;; Firefox is not already running. The sentinel runs firefox
-- ;; directly if that happens.
-- (when use-remote
-- (set-process-sentinel process
-- `(lambda (process change)
-- (browse-url-firefox-sentinel process ,url))))))
--
--(defun browse-url-firefox-sentinel (process url)
-- "Handle a change to the process communicating with Firefox."
-- (or (eq (process-exit-status process) 0)
-- (let* ((process-environment (browse-url-process-environment)))
-- ;; Firefox is not running - start it
-- (message "Starting Firefox...")
-- (apply 'start-process (concat "firefox " url) nil
-- browse-url-firefox-program
-- (append browse-url-firefox-startup-arguments (list url))))))
-+ (let* ((process-environment (browse-url-process-environment)))
-+ (apply 'start-process
-+ (concat "firefox " url) nil
-+ browse-url-firefox-program
-+ (append
-+ browse-url-firefox-arguments
-+ (if (browse-url-maybe-new-window new-window)
-+ (if browse-url-firefox-new-window-is-tab
-+ '("-new-tab")
-+ '("-new-window")))
-+ (list url)))))
-
- ;;;###autoload
- (defun browse-url-chromium (url &optional _new-window)
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2017-02-18 7:27 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-02-18 7:26 [gentoo-commits] proj/emacs-tools:patchsets commit in: emacs/24.4/ Ulrich Müller
-- strict thread matches above, loose matches on Subject: below --
2015-01-23 20:40 Ulrich Müller
2014-11-10 8:04 Ulrich Müller
2014-10-28 18:30 Ulrich Müller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox