merge master

2 files changed, 9 insertions, 0 deletions

diff --git a/etc/ChangeLog b/etc/ChangeLog
index 681858e5977..7b64dfb9153 100644
--- a/etc/ChangeLog
+++ b/etc/ChangeLog
@@ -1,3 +1,7 @@
+2015-01-16  Artur Malabarba  <bruce.connor.am@gmail.com>
+
+        * NEWS: Document installing packages from directories.
+
 2015-01-15  Eli Zaretskii  <eliz@gnu.org>
 
         * NEWS: Mention 'set-binary-mode'.
diff --git a/etc/NEWS b/etc/NEWS
index 0bfd3fd2a2d..be283bbc1c3 100644
--- a/etc/NEWS
+++ b/etc/NEWS
@@ -56,6 +56,10 @@ so if you want to use it, you can always take a copy from an older Emacs.
 
 * Changes in Emacs 25.1
 
+** `package-install-from-buffer' and `package-install-file' work on directories.
+This follows the same rules as installing from a .tar file, except the
+-pkg file is optional.
+
 ** New function `custom-prompt-customize-unsaved-options' checks for
 unsaved customizations and prompts user to customize (if found).
 
@@ -198,6 +202,7 @@ the old behavior -- *shell* buffer displays in current window -- use
 
 
 ** EIEIO
+*** The `:protection' slot option is not obeyed any more.
 *** The <class>-list-p and <class>-child-p functions are declared obsolete.
 *** The <class> variables are declared obsolete.
 *** The <initarg> variables are declared obsolete.