Merge from emacs--rel--22

Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1032

diff --cc lisp/ChangeLog
index fe3ef875f013e30dbc0d5b49498d271de5d45db2,8537c0fbdb1740d5e17eded968df667342624fd2..d4d4b0861d97935b465b2f89d872d1ab6127987e
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,25 -1,12 +1,34 @@@
 -2008-01-31  Jason Rumney  <jasonr@gnu.org>
++2008-02-01  Jason Rumney  <jasonr@gnu.org>
+ 
+       * w32-fns.el: Partially revert 2007-11-10 change.
+ 
 -2008-01-31  Martin Rudalics  <rudalics@gmx.at>
++2008-02-01  Martin Rudalics  <rudalics@gmx.at>
+ 
+       * mail/rmail.el (rmail-highlight): Fix specification.
+         Reported by: pod <pod@herald.ox.ac.uk>.
+ 
 +2008-02-01  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * image-mode.el (image-mode-current-vscroll)
 +      (image-mode-current-hscroll): Make buffer-local.
 +      (image-set-window-vscroll, image-set-window-hscroll): Simplify.
 +      (image-reset-current-vhscroll): Use the latest setting when displaying
 +      for the first time in a window.  Apply to all windows in the frame.
 +      (image-mode): Don't make image-mode-current-[vh]scroll buffer-local.
 +
 +      * progmodes/grep.el (grep-compute-defaults):
 +      Don't mix up defaults for different connections to the same host.
 +
 +2008-01-31  Vinicius Jose Latorre  <viniciusjl@ig.com.br>
 +
 +      * blank-mode.el: Renamed to whitespace.el.
 +
 +      * obsolete/whitespace.el: Renamed to obsolete/old-whitespace.el.
 +
 +2008-01-31  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * net/rcompile.el (remote-compile): Remove broken code.
 +
  2008-01-31  Jason Rumney  <jasonr@gnu.org>
  
        * term/w32-win.el (image-library-alist): Prefer libxpm.dll.

diff --cc lisp/mail/rmail.el
Simple merge

diff --cc lisp/w32-fns.el
Simple merge

diff --cc src/ChangeLog
Simple merge

diff --cc src/ccl.c
Simple merge