=== modified file 'etc/NEWS'
--- etc/NEWS	2013-12-22 23:19:42 +0000
+++ etc/NEWS	2013-12-23 01:36:17 +0000
@@ -23,6 +23,9 @@
 
 * Installation Changes in Emacs 24.4
 
+---
+** Emacs now detects and uses GnuTLS v3 features
+
 ** Emacs can now be compiled with ACL support.
 This happens by default if a suitable support library is found at
 build time, like libacl on GNU/Linux.  To prevent this, use the
@@ -91,6 +94,12 @@
 * Changes in Emacs 24.4
 
 +++
+** Emacs can now reject invalid SSL/TLS certificates, as determined by
+GnuTLS The new variable `gnutls-verify-error' can be customized.  It
+is off for now, but will be turned to reject invalid certificates by
+default in the future.
+
++++
 ** Emacs now supports menus on text-mode terminals.
 If the terminal supports a mouse, clicking on the menu bar, or on
 sensitive portions of the mode line or header line, will drop down the
@@ -393,6 +402,14 @@
 
 *** CUA's rectangles can now be used via `cua-rectangle-mark-mode'.
 
+** CFEngine mode
+
+*** CFEngine mode has completion and ElDoc support
+
+*** CFEngine mode can parse the current syntax from cf-promises
+
+*** CFEngine mode has Flycheck support for on-the-fly syntax checking
+
 ** Delete Selection mode can now be used without `transient-mark-mode'.
 
 ** Desktop
@@ -561,6 +578,17 @@
 *** `describe-package' buffer uses the `:url' extra property to
 display a `Homepage' header, if it's present.
 
++++
+*** `describe-package' buffer uses the `:keywords extra property to
+display keyword buttons.  Clicking them shows the list of packages
+that have that keyword.
+
++++
+*** the list of packages now shows the archive
+
++++
+*** the list of packages can now be filtered by a keyword
+
 ** Prolog mode
 
 *** `prolog-use-smie' has been removed, along with the non-SMIE

=== modified file 'lisp/progmodes/cfengine.el'
--- lisp/progmodes/cfengine.el	2013-12-16 15:49:25 +0000
+++ lisp/progmodes/cfengine.el	2013-12-23 01:01:31 +0000
@@ -1322,9 +1322,6 @@
           nil nil nil beginning-of-defun))
   (setq-local prettify-symbols-alist cfengine3--prettify-symbols-alist)
 
-  ;; `compile-command' is almost never a `make' call with CFEngine so
-  ;; we override it
-  (when cfengine-cf-promises
     (set (make-local-variable 'compile-command)
          (concat cfengine-cf-promises
                  " -f "