Hello community, here is the log from the commit of package emacs for openSUSE:Factory checked in at 2013-12-03 16:11:07 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/emacs (Old) and /work/SRC/openSUSE:Factory/.emacs.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "emacs" Changes: -------- --- /work/SRC/openSUSE:Factory/emacs/emacs.changes 2013-11-26 06:09:57.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.emacs.new/emacs.changes 2013-12-03 16:11:08.000000000 +0100 @@ -1,0 +2,7 @@ +Tue Dec 3 11:00:44 UTC 2013 - [email protected] + +- Change emacs wrapper script to use new dbus-run-session tool to + avoid hanging emacs on terminal mode due I/O conflict on stdin + of both emacs and dbus-launch session (bnc#853082) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ emacs.sh ++++++ --- /var/tmp/diff_new_pack.YDjSyd/_old 2013-12-03 16:11:09.000000000 +0100 +++ /var/tmp/diff_new_pack.YDjSyd/_new 2013-12-03 16:11:09.000000000 +0100 @@ -43,10 +43,13 @@ echo "no emacs binary found" exit 1 fi +dbusdaemon=$(type -p dbus-daemon 2>/dev/null) +dbuslaunch=$(type -p dbus-launch 2>/dev/null) +dbusession=$(type -p dbus-run-session 2>/dev/null) # # Now check for valid dbus, e.g. after su/sudo/slogin # -if dbusdaemon=$(type -p dbus-daemon) && dbuslaunch=$(type -p dbus-launch) ; then +if test -n "$dbusdaemon" ; then # # Currently (2013/05/24) the option --autolaunch for scanning for an # already existing session is an internal option of dbus-launch(1). @@ -91,8 +94,15 @@ unset mid guid suid dadd # Oops ... no dbus-daemon then launch a new session if test -z "$DBUS_SESSION_BUS_ADDRESS" ; then - set -- $dbuslaunch --sh-syntax --close-stderr --exit-with-session ${1+"$@"} - arg0=$dbuslaunch + if test -z "$dbusession" -a -n "$dbuslaunch" ; then + set -- $dbuslaunch --sh-syntax --close-stderr --exit-with-session ${1+"$@"} + arg0=$dbuslaunch + elif test -n "$dbusession" ; then + set -- $dbusession -- ${1+"$@"} + arg0=$dbusession + else + arg0=emacs + fi fi unset dbuslaunch dbusdaemon fi -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
