Merge from emacs--devo--0
authorMiles Bader <miles@gnu.org>
Wed, 20 Sep 2006 06:04:23 +0000 (06:04 +0000)
committerMiles Bader <miles@gnu.org>
Wed, 20 Sep 2006 06:04:23 +0000 (06:04 +0000)
commit465384748f74266cec1e2b9c9308eb82efb462b1
tree28b11f0a737ad1add652e84c1f193843322be702
parent863153c57b164f79f030f34dba6953a3d0d60097
parent0327a4644bffc9570fe50dbb7a13a54726c4ff8b
Merge from emacs--devo--0

Patches applied:

 * emacs--devo--0  (patch 437-446)

   - Update from CVS
   - lisp/url/url-methods.el: Fix format error when http_proxy is empty string
   - Merge from gnus--rel--5.10

 * gnus--rel--5.10  (patch 137-140)

   - Update from CVS

Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-111
25 files changed:
etc/NEWS
lisp/ChangeLog
lisp/bindings.el
lisp/cus-start.el
lisp/faces.el
lisp/font-lock.el
lisp/simple.el
lisp/startup.el
lisp/term/x-win.el
lisp/wid-edit.el
src/ChangeLog
src/Makefile.in
src/dispnew.c
src/emacs.c
src/indent.c
src/keyboard.c
src/keymap.c
src/macterm.c
src/print.c
src/regex.c
src/search.c
src/syntax.c
src/window.c
src/xdisp.c
src/xfns.c