From: Kenichi Handa Date: Thu, 2 Dec 2010 00:44:25 +0000 (+0900) Subject: merge emacs-23 X-Git-Tag: emacs-pretest-23.2.91~44 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=423a637bdbb746e112c5584e259bf28c5402901d;p=emacs.git merge emacs-23 --- 423a637bdbb746e112c5584e259bf28c5402901d diff --cc lisp/ChangeLog index c09e7a7a441,12a1db25e0e..4588f02dbb9 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,12 -1,32 +1,42 @@@ - 2010-11-29 Kenichi Handa ++2010-12-01 Kenichi Handa + + * mail/rmailmm.el (rmail-mime-parse): Call rmail-mime-process + within condition-case. + (rmail-show-mime): Don't use condition-case. + (rmail-search-mime-message): New function. + (rmail-search-mime-message-function): Set to + rmail-search-mime-message. + + 2010-12-01 Leo + + * ido.el (ido-common-initilization): New function. (bug#3274) + (ido-mode): Use it. + (ido-completing-read): Call it. + + 2010-11-27 Chong Yidong + + * log-edit.el (log-edit-font-lock-keywords): Don't try matching + stand-alone lines, since that is handled by log-edit-match-to-eoh + (Bug#6465). + + 2010-11-27 Eduard Wiebe + + * dired.el (dired-get-filename): Replace backslashes with slashes + in file names on MS-Windows, needed by `locate'. (Bug#7308) + * locate.el (locate-default-make-command-line): Don't consider + drive letter and root directory part of + `directory-listing-before-filename-regexp'. (Bug#7308) + (locate-post-command-hook, locate-post-command-hook): New defcustoms. + + 2010-11-26 Stefan Monnier + + * emacs-lisp/smie.el (smie-prec2->grammar): Simplify handling + of :smie-open/close-alist. + (smie-next-sexp): Make it accept a "start token" as argument. + (smie-indent-keyword): Be careful not to misidentify tokens that span + more than one line, as empty lines. Add argument `token'. ++>>>>>>> MERGE-SOURCE + 2010-11-26 Kenichi Handa * mail/rmailmm.el (rmail-mime-insert-multipart): For unsupported