setup, dot/xinitrc: Provisionally prefer Emacs 24 over 23.

I think the bug which breaks X selection handling may have been
defeated, but I'm not sure.  Certainly the new and shiny Magit requires
Emacs 24, and that's probably reason enough to prefer it.

diff --git a/dot/xinitrc b/dot/xinitrc
index 8bff85f567c2f2e8db807b7a75d0552dd8ea9ba8..51a9caeefde41e9a6bf2ef3371e489acd031d508 100755 (executable)
--- a/dot/xinitrc
+++ b/dot/xinitrc
@@ -217,7 +217,7 @@ start-clients () {
 
 ## Choose appropriate clients.
 emacs=$(pick_program emacs \
 
 ## Choose appropriate clients.
 emacs=$(pick_program emacs \

-  emacs23-lucid emacs24-lucid emacs23 emacs24 emacs22 emacs21 emacs)
+  emacs24-lucid emacs23-lucid emacs24 emacs23 emacs22 emacs21 emacs)

 term=$(pick_program terminal pterm Eterm xterm)
 
 ## Emacs window measurements.
 term=$(pick_program terminal pterm Eterm xterm)
 
 ## Emacs window measurements.

diff --git a/setup b/setup
index b9f72b9e8230bfce0df23436fbf1cd6133af2eb5..5cd280ddf2a3ab3335f0520ef10e51ace2585345 100755 (executable)
--- a/setup
+++ b/setup
@@ -303,7 +303,7 @@ echo "      all done."
 
 $echon "Finding a suitable emacs:$echoc"
 emacs=no
 
 $echon "Finding a suitable emacs:$echoc"
 emacs=no

-for i in emacs23 emacs24 emacs22 emacs21 emacs; do
+for i in emacs24 emacs23 emacs22 emacs21 emacs; do

   if type -p >/dev/null $i; then
     emacs=$i
     break
   if type -p >/dev/null $i; then
     emacs=$i
     break