Merged from [email protected]

Patches applied:

 * [email protected]/emacs--devo--0--patch-413
   Update from CVS

 * [email protected]/emacs--devo--0--patch-414
   Update from CVS

 * [email protected]/emacs--devo--0--patch-415
   Update from CVS

 * [email protected]/emacs--devo--0--patch-416
   Update from CVS

 * [email protected]/emacs--devo--0--patch-417
   Update from CVS

 * [email protected]/emacs--devo--0--patch-418
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-419
   Update from CVS

 * [email protected]/emacs--devo--0--patch-420
   Update from CVS

 * [email protected]/emacs--devo--0--patch-421
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-422
   Update from CVS

 * [email protected]/emacs--devo--0--patch-423
   Update from CVS

 * [email protected]/emacs--devo--0--patch-424
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-425
   Update from CVS

 * [email protected]/emacs--devo--0--patch-426
   Update from CVS

 * [email protected]/emacs--devo--0--patch-427
   Update from CVS

 * [email protected]/emacs--devo--0--patch-428
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-429
   Update from CVS

 * [email protected]/emacs--devo--0--patch-430
   Update from CVS

 * [email protected]/emacs--devo--0--patch-431
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-432
   Update from CVS

 * [email protected]/emacs--devo--0--patch-433
   Update from CVS

 * [email protected]/emacs--devo--0--patch-434
   Update from CVS

 * [email protected]/emacs--devo--0--patch-435
   Update from CVS

 * [email protected]/emacs--devo--0--patch-436
   Update from CVS

 * [email protected]/emacs--devo--0--patch-437
   Update from CVS

 * [email protected]/emacs--devo--0--patch-438
   Update from CVS

 * [email protected]/emacs--devo--0--patch-439
   Update from CVS

 * [email protected]/emacs--devo--0--patch-440
   Update from CVS

 * [email protected]/emacs--devo--0--patch-441
   lisp/url/url-methods.el: Fix format error when http_proxy is empty string

 * [email protected]/emacs--devo--0--patch-442
   Update from CVS

 * [email protected]/emacs--devo--0--patch-443
   Update from CVS

 * [email protected]/emacs--devo--0--patch-444
   Update from CVS

 * [email protected]/emacs--devo--0--patch-445
   Update from CVS

 * [email protected]/emacs--devo--0--patch-446
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-447
   Update from CVS

 * [email protected]/emacs--devo--0--patch-448
   Update from CVS

 * [email protected]/emacs--devo--0--patch-449
   Update from CVS

 * [email protected]/emacs--devo--0--patch-450
   Update from CVS

 * [email protected]/emacs--devo--0--patch-451
   Update from CVS

 * [email protected]/emacs--devo--0--patch-452
   Update from CVS

 * [email protected]/emacs--devo--0--patch-453
   Update from CVS

 * [email protected]/emacs--devo--0--patch-454
   Update from CVS

 * [email protected]/emacs--devo--0--patch-455
   Update from CVS

 * [email protected]/emacs--devo--0--patch-456
   Update from CVS

 * [email protected]/emacs--devo--0--patch-457
   Update from CVS

 * [email protected]/emacs--devo--0--patch-458
   Update from CVS

 * [email protected]/emacs--devo--0--patch-459
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-460
   Update from CVS

 * [email protected]/emacs--devo--0--patch-461
   Update from CVS

 * [email protected]/emacs--devo--0--patch-462
   Update from CVS

 * [email protected]/emacs--devo--0--patch-463
   Update from CVS

 * [email protected]/emacs--devo--0--patch-464
   Update from CVS

 * [email protected]/emacs--devo--0--patch-465
   Update from CVS

 * [email protected]/emacs--devo--0--patch-466
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-467
   Update from CVS

 * [email protected]/emacs--devo--0--patch-468
   Merge from gnus--rel--5.10

 * [email protected]/emacs--devo--0--patch-469
   Update from CVS

 * [email protected]/emacs--devo--0--patch-470
   Update from CVS

 * [email protected]/emacs--devo--0--patch-471
   Update from CVS

 * [email protected]/emacs--devo--0--patch-472
   Update from CVS

 * [email protected]/emacs--devo--0--patch-473
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-128
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-129
   Merge from emacs--devo--0

 * [email protected]/gnus--rel--5.10--patch-130
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-131
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-132
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-133
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-134
   Merge from emacs--devo--0

 * [email protected]/gnus--rel--5.10--patch-135
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-136
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-137
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-138
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-139
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-140
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-141
   Merge from emacs--devo--0

 * [email protected]/gnus--rel--5.10--patch-142
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-143
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-144
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-145
   Merge from emacs--devo--0

 * [email protected]/gnus--rel--5.10--patch-146
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-147
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-148
   Update from CVS

 * [email protected]/gnus--rel--5.10--patch-149
   Update from CVS


git-archimport-id: [email protected]/emacs--multi-tty--0--patch-582

1 files changed, 2 insertions, 2 deletions

diff --git a/configure.in b/configure.in
index 307208918e..604ac7ec3e 100644
--- a/configure.in
+++ b/configure.in
@@ -33,8 +33,8 @@ AC_ARG_PROGRAM
 
 lispdir='${datadir}/emacs/${version}/lisp'
 locallisppath='${datadir}/emacs/${version}/site-lisp:'\
-'${datadir}/emacs/site-lisp:${datadir}/emacs/${version}/leim'
-lisppath='${locallisppath}:${lispdir}'
+'${datadir}/emacs/site-lisp'
+lisppath='${locallisppath}:${lispdir}:${datadir}/emacs/${version}/leim'
 etcdir='${datadir}/emacs/${version}/etc'
 archlibdir='${libexecdir}/emacs/${version}/${configuration}'
 docdir='${datadir}/emacs/${version}/etc'