comparison lisp/ChangeLog @ 108756:f3d817d46523

Merge from emacs-23
author Stefan Monnier <monnier@iro.umontreal.ca>
date Mon, 24 May 2010 20:54:13 -0400
parents 24d486687f54 30ebb77362b6
children d3db77511b9e
comparison
equal deleted inserted replaced
108755:3f667e9ab359 108756:f3d817d46523
1 2010-05-24 Uday S Reddy <u.s.reddy@cs.bham.ac.uk> (tiny change)
2
3 * textmodes/fill.el (fill-region): Don't fill past the end (bug#6201).
4
5 2010-05-24 Stefan Monnier <monnier@iro.umontreal.ca>
6
7 * subr.el (read-quoted-char): Resolve modifiers after key
8 remapping (bug#6212).
9
1 2010-05-22 Chong Yidong <cyd@stupidchicken.com> 10 2010-05-22 Chong Yidong <cyd@stupidchicken.com>
2 11
3 * image.el (image-refresh): Define as an alias for image-flush. 12 * image.el (image-refresh): Define as an alias for image-flush.
4 13
5 * image-mode.el (image-toggle-display-image): Caller changed. 14 * image-mode.el (image-toggle-display-image): Caller changed.
11 whitespace, call wildcard-to-regexp on substrings and concat them 20 whitespace, call wildcard-to-regexp on substrings and concat them
12 with "\\|". (Bug#6114) 21 with "\\|". (Bug#6114)
13 22
14 2010-05-21 Alan Mackenzie <acm@muc.de> 23 2010-05-21 Alan Mackenzie <acm@muc.de>
15 24
16 * progmodes/cc-engine.el (c-parse-state-get-strategy): Replace 25 * progmodes/cc-engine.el (c-parse-state-get-strategy):
17 parameter `here' with `here-' and `here-plus', which sandwich any 26 Replace parameter `here' with `here-' and `here-plus', which sandwich
18 pertinent CPP construct. 27 any pertinent CPP construct.
19 (c-remove-stale-state-cache-backwards): Fix a bug which happens 28 (c-remove-stale-state-cache-backwards): Fix a bug which happens
20 when doing (c-parse-state) in a CPP construct: Exclude any "new" 29 when doing (c-parse-state) in a CPP construct: Exclude any "new"
21 CPP construct from taking part in the scanning. 30 CPP construct from taking part in the scanning.
22 31
23 2010-05-21 Michael Albinus <michael.albinus@gmx.de> 32 2010-05-21 Michael Albinus <michael.albinus@gmx.de>
24 33
25 * net/tramp.el (tramp-do-copy-or-rename-file) 34 * net/tramp.el (tramp-do-copy-or-rename-file)
26 (tramp-handle-file-local-copy, tramp-maybe-open-connection): Tune 35 (tramp-handle-file-local-copy, tramp-maybe-open-connection):
27 `with-progress-reporter' messages. 36 Tune `with-progress-reporter' messages.
28 (tramp-handle-vc-registered): 37 (tramp-handle-vc-registered):
29 * net/tramp-fish.el (tramp-fish-handle-file-local-copy) 38 * net/tramp-fish.el (tramp-fish-handle-file-local-copy)
30 (tramp-fish-handle-insert-file-contents) 39 (tramp-fish-handle-insert-file-contents)
31 (tramp-fish-maybe-open-connection): 40 (tramp-fish-maybe-open-connection):
32 * net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection): 41 * net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection):