Merge from mainline.

1 files changed, 164 insertions, 2 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 702f283a9ff..5613793edff 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,166 @@
+2010-02-20  Eli Zaretskii  <eliz@gnu.org>
+
+        * subr.el (remove-yank-excluded-properties): Explain in a comment
+        why `category' property is removed.
+
+2010-02-19  Chong Yidong  <cyd@stupidchicken.com>
+
+        * isearch.el (isearch-update-post-hook, isearch-update): Revert
+        2010-02-17 change.
+
+2010-02-19  Ulf Jasper  <ulf.jasper@web.de>
+
+        * calendar/icalendar.el (icalendar--convert-ordinary-to-ical)
+        (icalendar--convert-weekly-to-ical)
+        (icalendar--convert-yearly-to-ical)
+        (icalendar--convert-block-to-ical)
+        (icalendar--convert-cyclic-to-ical)
+        (icalendar--convert-anniversary-to-ical): Take care of time
+        specifications where hour has 1-digit only (Bug#5549).
+
+2010-02-19  Nick Roberts  <nickrob@snap.net.nz>
+
+        * progmodes/gdb-ui.el (gdb-assembler-handler): Accommodate change
+        of disassemble output in GDB 7.1.
+
+2010-02-19  Glenn Morris  <rgm@gnu.org>
+
+        * progmodes/f90.el (f90-electric-insert): Give it a delete-selection
+        property.  (Bug#5593)
+
+2010-02-18  Sam Steingold  <sds@gnu.org>
+
+        * vc-cvs.el (vc-cvs-merge-news): Yet another fix of message parsing.
+
+2010-02-18  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        Use abbreviated file names in bookmarks (bug#5591).
+        * bookmark.el (bookmark-maybe-load-default-file): Remove redundant
+        calls to expand-file-name.
+        (bookmark-relocate): Use abbreviated file names in bookmarks.
+        (bookmark-load): Use abbreviated file names in messages.
+
+2010-02-18  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-handle-directory-files): When FULL, do not
+        expand "." and "..".  Reported by Thierry Volpiatto
+        <thierry.volpiatto@gmail.com>.
+
+2010-02-18  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-handle-insert-file-contents): Set always the
+        permissions of the temporary file to "0600".  In case the remote
+        file has no read permissions for the owner, there might be
+        problems otherwise.  Reported by Ole Laursen <olau@iola.dk>.
+
+22010-02-18  Glenn Morris  <rgm@gnu.org>
+
+        * emacs-lisp/authors.el (authors-renamed-files-alist):
+        Add entries for INSTALL.CVS.
+
+2010-02-17  Mark A. Hershberger  <mah@everybody.org>
+
+        * vc-bzr.el: fix typo in Known Bugs section.
+
+        * isearch.el (isearch-update-post-hook): New hook
+        (isearch-update): Use the new hook.
+
+2010-02-16  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-do-copy-or-rename-file-out-of-band):
+        Fix errors in copying directories.
+        (tramp-handle-add-name-to-file, tramp-handle-copy-directory)
+        (tramp-do-copy-or-rename-file, tramp-handle-delete-directory)
+        (tramp-handle-delete-file)
+        (tramp-handle-dired-recursive-delete-directory)
+        (tramp-handle-write-region): Flush also the cache for the upper
+        directory.
+
+2010-02-16  Chong Yidong  <cyd@stupidchicken.com>
+
+        * simple.el (save-interprogram-paste-before-kill): Doc fix.
+
+        * cus-edit.el (hardware): Doc fix.
+
+        * man.el (man): Add to external custom group.
+
+        * delim-col.el (columns): Move to wp custom group.
+
+        * doc-view.el (doc-view): Add to data custom group.
+
+        * cedet/data-debug.el (data-debug): Move to extensions group.
+
+        * cedet/ede.el (ede):
+        * cedet/srecode.el (srecode):
+        * cedet/semantic.el (semantic): Put in tools and extensions group.
+
+        * nxml/nxml-mode.el (nxml-faces): Remove from font-lock-faces group.
+
+        * textmodes/flyspell.el (flyspell-word): Obey the offset specified
+        by ispell-parse-output (Bug#5575).
+
+2010-02-16  Kenichi Handa  <handa@m17n.org>
+
+        * international/ja-dic-cnv.el (iso-2022-7bit-short): Delete it.
+        (skkdic-convert-okuri-ari): Ignore lines starting with '>'.
+        (skkdic-convert): Use `euc-japan' coding system for writing.
+
+2010-02-16  Glenn Morris  <rgm@gnu.org>
+
+        * textmodes/tex-mode.el (tex-bibtex-file): Expand the result of
+        tex-main-file before using it.  (Bug#5562)
+
+2010-02-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * emacs-lisp/advice.el (ad-compile-function): Suppress byte-compiler
+        warnings, since it is annoying for the user to see them each time he
+        runs the code.
+
+2010-02-15  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp.el (tramp-process-actions, tramp-read-passwd):
+        * net/tramp-gvfs.el (tramp-gvfs-maybe-open-connection): Use VEC
+        instead of PROC for caching "first-password-request".  Otherwise,
+        new processes would not profit from passwords already entered.
+
+        * net/tramp-cache.el (tramp-dump-connection-properties):
+        Don't save "first-password-request" property.
+
+2010-02-14  Juanma Barranquero  <lekktu@gmail.com>
+
+        * outline.el (outline-head-from-level):
+        * simple.el (with-wrapper-hook):
+        * cedet/ede.el (ede-run-target, project-delete-target)
+        (project-dist-files, ede-name, ede-documentation, ede-parent-project)
+        (ede-adebug-project, ede-adebug-project-parent)
+        (ede-adebug-project-root):
+        * emacs-lisp/elint.el (elint-extra-errors, elint-current-buffer)
+        (elint-defun, elint-buffer-env, elint-top-form-logged)
+        (elint-unbound-variable):
+        * textmodes/reftex-toc.el (reftex-toc-newhead-from-alist):
+        Fix typos in docstrings.
+
+2010-02-14  Michael Albinus  <michael.albinus@gmx.de>
+
+        * files.el (insert-directory): When WILDCARD-REGEXP and
+        FULL-DIRECTORY-P are nil, insert the file entry instead of the
+        whole directory.  (Bug#5551)
+
+        * net/ange-ftp.el (ange-ftp-insert-directory): Insert "  " for
+        dired's alignment sanity.  (Bug#5516)
+
+2010-02-14  Juri Linkov  <juri@jurta.org>
+
+        * man.el (Man-fontify-manpage, Man-cleanup-manpage):
+        Remove remaining ^H with their preceding chars.  (Bug#5566)
+
+2010-02-13  Glenn Morris  <rgm@gnu.org>
+
+        * simple.el (transpose-subr): Give it a doc-string.
+
+        * textmodes/paragraphs.el (transpose-paragraphs, transpose-sentences):
+        Doc fixes.
+
 2010-02-12  Juri Linkov  <juri@jurta.org>
 
         * arc-mode.el (archive-unique-fname): Make directories for nested
@@ -48,8 +211,7 @@
 2010-02-08  Jose E. Marchesi  <jemarch@gnu.org>
 
         * progmodes/ada-mode.el (ada-in-numeric-literal-p): New function.
-        (ada-adjust-case): Don't adjust case in hexadecimal number
-        literals.
+        (ada-adjust-case): Don't adjust case in hexadecimal number literals.
 
 2010-02-08  Kenichi Handa  <handa@m17n.org>