From: Miles Bader Date: Fri, 1 Feb 2008 02:40:23 +0000 (+0000) Subject: Merge from emacs--rel--22 X-Git-Tag: emacs-pretest-23.0.90~8305 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=68e7476278a3dc4bd13dab63cc23bc0e671e5525;p=emacs.git Merge from emacs--rel--22 Revision: emacs@sv.gnu.org/emacs--devo--0--patch-1032 --- 68e7476278a3dc4bd13dab63cc23bc0e671e5525 diff --cc lisp/ChangeLog index fe3ef875f01,8537c0fbdb1..d4d4b0861d9 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,25 -1,12 +1,34 @@@ -2008-01-31 Jason Rumney ++2008-02-01 Jason Rumney + + * w32-fns.el: Partially revert 2007-11-10 change. + -2008-01-31 Martin Rudalics ++2008-02-01 Martin Rudalics + + * mail/rmail.el (rmail-highlight): Fix specification. + Reported by: pod . + +2008-02-01 Stefan Monnier + + * 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 + + * blank-mode.el: Renamed to whitespace.el. + + * obsolete/whitespace.el: Renamed to obsolete/old-whitespace.el. + +2008-01-31 Stefan Monnier + + * net/rcompile.el (remote-compile): Remove broken code. + 2008-01-31 Jason Rumney * term/w32-win.el (image-library-alist): Prefer libxpm.dll.