Merge from emacs-24; up to 2014-04-16T15:28:26Z!monnier@iro.umontreal.ca

1 files changed, 60 insertions, 0 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 233a72e79df..f740e7f23df 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,63 @@
+2014-04-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * progmodes/perl-mode.el (perl-calculate-indent): Don't auto-indent in
+        here-documents (bug#17262).
+
+2014-04-16  Eli Zaretskii  <eliz@gnu.org>
+
+        * term/pc-win.el (x-list-fonts, x-get-selection-value):
+        Provide doc strings, as required by snarf-documentation.
+
+2014-04-16  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * ps-def.el (ps-generate-postscript-with-faces1): Use the new `sorted'
+        arg of overlays-at.  Use `invisible-p'.
+
+        * obsolete/lucid.el (extent-at):
+        * htmlfontify.el (hfy-overlay-props-at): Use the new `sorted' arg of
+        overlays-at.
+        (hfy-fontify-buffer): Remove unused var `orig-ovls'.
+
+2014-04-16  João Távora  <joaotavora@gmail.com>
+
+        * net/shr.el (shr-expand-url): Use `expand-file-name' for relative
+        links.  (Bug#17217).
+
+2014-04-16  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
+
+        * vc/ediff-diff.el (ediff-set-fine-diff-properties-in-one-buffer):
+        Use mapc to loop over a vector.  (Bug#17257).
+
+2014-04-16  Michael Albinus  <michael.albinus@gmx.de>
+
+        * net/tramp-sh.el (tramp-sh-handle-file-truename): Revert previous
+        patch, there are new problems with file names containing spaces.
+        Get rid of backticks.  (Bug#17238)
+
+2014-04-16  João Távora  <joaotavora@gmail.com>
+
+        * elec-pair.el (electric-pair--syntax-ppss): Simplify and fix
+        possible bug.
+
+2014-04-16  Eli Zaretskii  <eliz@gnu.org>
+
+        * frame.el (blink-cursor-blinks, blink-cursor-blinks-done): Doc fixes.
+        (blink-cursor-mode): Mention customization variables and the
+        effect of 'blink-cursor-blinks'.
+
+2014-04-16  Barry O'Reilly  <gundaetiapo@gmail.com>
+
+        * simple.el (undo): Prevent insertion of identity mapping into
+        undo-equiv-table so as undo-only does not inf loop in the presence
+        of consecutive nils in undo list.
+
+2014-04-16  Matthias Dahl  <matthias.dahl@binary-island.eu>
+
+        * faces.el (make-face): Deprecate optional argument as it is no
+        longer needed/used since the conditional X resources handling
+        has been pushed down to make-face-x-resource-internal itself.
+        (make-empty-face): Don't pass optional argument to make-face.
+
 2014-04-16  Karl Fogel  <kfogel@red-bean.com>
 
         * savehist.el (savehist-save): Remove workaround for a read-passwd