Mercurial > emacs
diff lisp/ChangeLog @ 85807:d93ce6f797f6
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 138-139)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-914
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Tue, 30 Oct 2007 23:28:12 +0000 |
| parents | 1d1d43e36948 82fb16d03f6f |
| children | cbf5cba1e788 |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Oct 30 23:27:59 2007 +0000 +++ b/lisp/ChangeLog Tue Oct 30 23:28:12 2007 +0000 @@ -1,3 +1,11 @@ +2007-10-27 Juanma Barranquero <lekktu@gmail.com> + + * desktop.el (uniquify-managed): Pacify byte compiler. + (desktop-buffer-info): If the buffer name is managed by uniquify, + save the base name, not the uniquified one. + (desktop-create-buffer): Allow `rename-buffer' to generate a new + name in case of conflict. + 2007-10-30 Stefan Monnier <monnier@iro.umontreal.ca> * doc-view.el: Use expand-file-name rather than concat.