Fix last commit.

[bpt/emacs.git] / lisp / ChangeLog

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 37e0989..08591ac 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,37 @@
+2014-04-12  Matthias Dahl  <matthias.dahl@binary-island.eu>
+
+       * faces.el (make-face): Remove deprecated optional argument. The
+       conditional application of X resources is handled directly by
+       make-face-x-resource-internal since Emacs 24.4.
+       (make-empty-face): Don't pass optional argument to make-face.
+
+2014-04-11  Glenn Morris  <rgm@gnu.org>
+
+       * Makefile.in (EMACSDATA, EMACSDOC, EMACSPATH): Unexport.  (Bug#16429)
+
+2014-04-11  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       Ediff's overlay priorities cause more trouble than they solve.
+       * vc/ediff-init.el (ediff-shadow-overlay-priority): Remove variable.
+       (ediff-highest-priority): Remove function (bug#17234).
+       * vc/ediff-util.el (ediff-highlight-diff-in-one-buffer):
+       * vc/ediff-diff.el (ediff-set-diff-overlays-in-one-buffer)
+       (ediff-set-fine-diff-properties-in-one-buffer): Don't mess with
+       overlay priorities.
+
+2014-04-11  Feng Li  <fengli@gmail.com>  (tiny change)
+
+       * progmodes/pascal.el (pascal-font-lock-keywords): Fix incorrect format
+       entry; use symbol boundaries to avoid mis-matches.
+
+2014-04-11  Michael Albinus  <michael.albinus@gmx.de>
+
+       * net/tramp.el (tramp-file-name-handler)
+       (tramp-completion-file-name-handler): Avoid recursive loading.
+
+       * net/tramp-sh.el (tramp-make-copy-program-file-name):
+       Quote result also locally.
+
 2014-04-11  Stefan Monnier  <monnier@iro.umontreal.ca>
 
        * emulation/cua-base.el (<toplevel>, cua--pre-command-handler-1):
@@ -1186,7 +1220,7 @@
 
 2014-03-04  Michal Nazarewicz  <mina86@mina86.com>
 
-       * binding.el: Add comment describing why C-d binds to `delete-char'.
+       * bindings.el: Add comment describing why C-d binds to `delete-char'.
        * simple.el (delete-forward-char): Mark as interactive-only.
 
 2014-03-03  Juanma Barranquero  <lekktu@gmail.com>
@@ -2243,7 +2277,7 @@
        * ielm.el (ielm-mode-hook):
        * emacs-lisp/lisp-mode.el (emacs-lisp-mode-hook)
        (lisp-interaction-mode-hook):
-       * progmodes/cfengine.e (cfengine3-documentation-function):
+       * progmodes/cfengine.el (cfengine3-documentation-function):
        Replace obsolete alias `turn-on-eldoc-mode' with `eldoc-mode'.
 
 2014-01-30  Stefan Monnier  <monnier@iro.umontreal.ca>