Merge branch 'master' of git.sv.gnu.org:/srv/git/emacs

Conflicts:
	lisp/ChangeLog

3 files changed, 11 insertions, 4 deletions

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 6db9f206d15..e3baa30ce6a 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -2,6 +2,14 @@
 
         * vc/vc-hg.el (vc-hg-state): Disable pager.  (Bug#18940)
 
+2014-11-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * net/eww.el (eww-form-file): Fix version number.
+
+2014-11-10  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+        * net/eww.el (eww-form-file): :type isn't a valid `defface' keyword.
+
 2014-11-10  Kenjiro NAKAYAMA  <nakayamakenjiro@gmail.com>
 
         * net/eww.el(eww-form-file(defface)): New defface of file upload form.
diff --git a/lisp/gnus/mml2015.el b/lisp/gnus/mml2015.el
index 941b5ecf7c3..74290f45469 100644
--- a/lisp/gnus/mml2015.el
+++ b/lisp/gnus/mml2015.el
@@ -149,7 +149,7 @@ If set, it overrides the setting of `mml2015-sign-with-sender'."
 
 (defcustom mml2015-display-key-image t
   "If t, try to display key images."
-  :version "25.1"
+  :version "24.5"
   :group 'mime-security
   :type 'boolean)
 
diff --git a/lisp/net/eww.el b/lisp/net/eww.el
index 306d5dca507..f16ecb8c172 100644
--- a/lisp/net/eww.el
+++ b/lisp/net/eww.el
@@ -105,9 +105,8 @@ See also `eww-form-checkbox-selected-symbol'."
      :box (:line-width 2 :style released-button)
      :background "#808080" :foreground "black"))
   "Face for eww buffer buttons."
-  :version "24.4"
-  :group 'eww
-  :type "Browse")
+  :version "25.1"
+  :group 'eww)
 
 (defface eww-form-checkbox
   '((((type x w32 ns) (class color))    ; Like default mode line