Mercurial > emacs
changeset 59729:4ab28e432130
*** empty log message ***
| author | Carsten Dominik <dominik@science.uva.nl> |
|---|---|
| date | Tue, 25 Jan 2005 10:24:52 +0000 |
| parents | b694c88295ed |
| children | 7ba49e975d57 |
| files | lisp/ChangeLog |
| diffstat | 1 files changed, 6 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/lisp/ChangeLog Tue Jan 25 03:36:37 2005 +0000 +++ b/lisp/ChangeLog Tue Jan 25 10:24:52 2005 +0000 @@ -1,3 +1,7 @@ +2005-01-17 Carsten Dominik <dominik@science.uva.nl> + + * textmodes/org.el (org-version): Unnecessary prefix arg removed. + 2005-01-24 Luc Teirlinck <teirllm@auburn.edu> * help-at-pt.el (help-at-pt-display-when-idle): Add autoload cookie. @@ -90,6 +94,7 @@ * term/mac-win.el (process-connection-type): Removed. Controlled now by s/darwin.h:PTY_ITERATION. +>>>>>>> 1.6921 2005-01-20 Stefan Monnier <monnier@iro.umontreal.ca> * window.el (handle-select-window): Don't switch window when we're @@ -310,6 +315,7 @@ * ebrowse.el (ebrowse-class-in-tree): Return the tail of the tree rather than the element found, thus enabling the tree to be setcar'd. +>>>>>>> 1.6903 2005-01-14 Carsten Dominik <dominik@science.uva.nl> * textmodes/org.el (org-show-following-heading): New option.