Merge from emacs-24; up to 2012-11-15T23:31:37Z!dancol@dancol.org

[bpt/emacs.git] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 4c3f4e5..cd1cf01 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,36 @@
+2012-11-18  Glenn Morris  <rgm@gnu.org>
+
+       * image.el (insert-image, insert-sliced-image): Doc fix.
+
+2012-11-18  Chong Yidong  <cyd@gnu.org>
+
+       * emacs-lisp/syntax.el (syntax-propertize-function): Doc fix
+       (Bug#12810).
+
+2012-11-18  OKAZAKI Tetsurou  <okazaki.tetsurou@gmail.com>  (tiny change)
+
+       * vc/vc-svn.el (vc-svn-merge-news): Properly parse the merge
+       response when the target file is in a subdirectory (Bug#12757).
+
+2012-11-18  Chong Yidong  <cyd@gnu.org>
+
+       * filecache.el (file-cache-add-file-list): Doc fix (Bug#12694).
+
+2012-11-18  Glenn Morris  <rgm@gnu.org>
+
+       * woman.el (woman-non-underline-faces):
+       * emacs-lisp/cl-lib.el (face-underline-p):
+       Use set-face-underline rather than the alias set-face-underline-p.
+
+       * window.el (with-temp-buffer-window): Doc fix.
+       * subr.el (with-output-to-temp-buffer):
+       Add doc xref to with-temp-buffer-window.
+
+2012-11-18  Juanma Barranquero  <lekktu@gmail.com>
+
+       * woman.el (woman-non-underline-faces): Use `set-face-underline'.
+       * calc/calc.el (math-format-date-cache): Declare.
+
 2012-11-17  Paul Eggert  <eggert@cs.ucla.edu>
 
        * calc/calc-forms.el (math-julian-date-beginning)