Mercurial > emacs
comparison 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 |
comparison
equal
deleted
inserted
replaced
85806:2a9d361b3986 | 85807:d93ce6f797f6 |
---|---|
1 2007-10-27 Juanma Barranquero <lekktu@gmail.com> | |
2 | |
3 * desktop.el (uniquify-managed): Pacify byte compiler. | |
4 (desktop-buffer-info): If the buffer name is managed by uniquify, | |
5 save the base name, not the uniquified one. | |
6 (desktop-create-buffer): Allow `rename-buffer' to generate a new | |
7 name in case of conflict. | |
8 | |
1 2007-10-30 Stefan Monnier <monnier@iro.umontreal.ca> | 9 2007-10-30 Stefan Monnier <monnier@iro.umontreal.ca> |
2 | 10 |
3 * doc-view.el: Use expand-file-name rather than concat. | 11 * doc-view.el: Use expand-file-name rather than concat. |
4 (doc-view-cache-directory): Add the UID so multiple users won't clash. | 12 (doc-view-cache-directory): Add the UID so multiple users won't clash. |
5 (doc-view-current-overlay, doc-view-pending-cache-flush): New vars. | 13 (doc-view-current-overlay, doc-view-pending-cache-flush): New vars. |