Merge from origin/emacs-24

d3852a9 * admin/admin.el (manual-meta-string): Use bug-gnu-emacs.
d69e9f1 CC Mode: Stop Font Lock forcing fontification from BOL.

Conflicts:
	admin/ChangeLog
	lisp/ChangeLog

diff --cc admin/ChangeLog
index ec5005698603cb162473791f7469473fbb6dcee3,f5490013544accebe3a751b1671c84ab356855b3..9a160446b35df9a78563b8d896da56d373be3dee
--- 1/admin/ChangeLog
--- 2/admin/ChangeLog
+++ b/admin/ChangeLog
@@@ -1,4 -1,9 +1,9 @@@
 -2015-02-02  Glenn Morris  <rgm@gnu.org>
++2015-03-03  Glenn Morris  <rgm@gnu.org>
+ 
+       * admin.el (manual-meta-string): Use bug-gnu-emacs@gnu email address
+       rather than webmasters@gnu.
+ 
 -2015-01-03  Glenn Morris  <rgm@gnu.org>
 +2015-01-28  Glenn Morris  <rgm@gnu.org>
  
        * update_autogen (commit): Prepend "# " to commit message.
  

diff --cc admin/admin.el
Simple merge

diff --cc lisp/ChangeLog
index 3bc9b8c85ceaddd22579544c3b42dd8968aea4cd,2d4f71f6cecbf96a8e7ba197887a94f2696e6c2d..db1358cd2fef8468c5a1d8790fc9faea05761466
--- 1/lisp/ChangeLog
--- 2/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@@ -1,117 -1,12 +1,125 @@@
 -2015-02-01  Alan Mackenzie  <acm@muc.de>
++2015-03-03  Alan Mackenzie  <acm@muc.de>
+ 
+       CC Mode: Stop Font Lock forcing fontification from BOL.  Fixes
+       debbugs#19669.
+ 
+       * progmodes/cc-mode.el (c-font-lock-init): Setq
+       font-lock-extend-region-functions to nil.
+ 
 -2015-01-31  Alan Mackenzie  <acm@muc.de>
 +2015-03-03  Daniel Colascione  <dancol@dancol.org>
 +
 +      * emacs-lisp/generator.el: Make globals conform to elisp
 +      style throughout.  Use more efficient font-lock patterns.
 +      (cps-inhibit-atomic-optimization): Rename from
 +      `cps-disable-atomic-optimization'.
 +      (cps--gensym): New macro; replaces `cl-gensym' throughout.
 +      (cps-generate-evaluator): Move the `iter-yield' local macro
 +      definition here
 +      (iter-defun, iter-lambda): from here.
 +
 +      (iter-defun): Use `macroexp-parse-body'.
 +
 +2015-03-03  Daniel Colascione  <dancol@dancol.org>
 +
 +2015-03-03  Stefan Monnier  <monnier@iro.umontreal.ca>
 +
 +      * progmodes/gud.el: Use lexical-binding (bug#19966).
 +
 +      * emacs-lisp/gv.el (gv-ref): Warn about likely problematic cases.
 +
 +2015-03-03  Daniel Colascione  <dancol@dancol.org>
 +
 +      * emacs-lisp/generator.el: Make globals conform to elisp
 +      style throughout.  Use more efficient font-lock patterns.
 +      (cps-inhibit-atomic-optimization): Rename from
 +      `cps-disable-atomic-optimization'.
 +      (cps--gensym): New macro; replaces `cl-gensym' throughout.
 +      (cps-generate-evaluator): Move the `iter-yield' local macro
 +      definition here...
 +      (iter-defun, iter-lambda): ...from here.
 +
 +2015-03-03  Artur Malabarba  <bruce.connor.am@gmail.com>
 +
 +      * emacs-lisp/package.el (package-autoremove): Fix if logic.
 +
 +2015-03-03  Martin Rudalics  <rudalics@gmx.at>
 +
 +      * window.el (window--dump-frame): For pixel height return total
 +      number of frame's lines.
 +
 +2015-03-03  Daniel Colascione  <dancol@dancol.org>
 +
 +      * emacs-lisp/cl-macs.el (cl-iter-defun): Add cl-iter-defun.
 +
 +      * emacs-lisp/generator.el (iter-defun): Correctly propagate
 +      docstrings and declarations to underlying function.
 +
 +2015-03-02  Daniel Colascione  <dancol@dancol.org>
 +
 +      * emacs-lisp/generator.el: New file.
 +
 +      * vc/vc.el (vc-responsible-backend): Add autoload cookie for
 +      `vc-responsible-backend'.
 +
 +2015-03-01  Michael Albinus  <michael.albinus@gmx.de>
 +
 +      * vc/vc-hooks.el (vc-state, vc-working-revision):
 +      Use `vc-responsible-backend' in order to support unregistered files.
 +
 +      * vc/vc-rcs.el (vc-rcs-unregister): Support unregistered files.
 +
 +      * vc/vc-rcs.el (vc-rcs-fetch-master-state):
 +      * vc/vc-sccs.el (vc-sccs-working-revision): Handle undefined
 +      master name.
 +
 +      * vc/vc-src.el (vc-src-working-revision): Do not return an empty string.
 +
 +2015-03-01  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 +
 +      * net/shr.el (shr-insert): Remove soft hyphens.
 +      (shr-insert): Also remove soft hypens from non-folded text.
 +
 +2015-02-28  Eli Zaretskii  <eliz@gnu.org>
 +
 +      * mail/rmailmm.el (rmail-mime-insert-html): Decode HTML payload
 +      when the charset is only given by the HTML <head>, and allow to
 +      specify the encoding with "C-x RET c".
 +
 +2015-02-27  Mark Laws  <mdl@60hz.org>
 +
 +      Support daemon mode on MS-Windows (bug#19688)
 +      * server.el (server-process-filter): Force GUI frames on
 +      MS-Windows in daemon mode, even if a TTY frame was requested.
 +
 +      * frameset.el (frameset-keep-original-display-p): Don't assume
 +      windows-nt cannot be in daemon mode.
 +
 +      * frame.el (window-system-for-display): Don't assume windows-nt
 +      cannot be in daemon mode.
 +
 +2015-02-26  Ivan Shmakov  <ivan@siamics.net>
 +
 +      * faces.el (face-list-p): Split from face-at-point.
 +      (face-at-point): Use it.
 +      * facemenu.el (facemenu-add-face): Likewise.  (Bug#19912)
 +
 +2015-02-26  Oscar Fuentes  <ofv@wanadoo.es>
 +
 +      * vc/vc.el (vc-annotate-switches): New defcustom.
 +      * vc/vc-bzr.el (vc-bzr-annotate-switches): New defcustom.
 +      (vc-bzr-annotate-command): Use vc-switches.
 +      * vc/vc-cvs.el (vc-cvs-annotate-switches): New defcustom.
 +      (vc-cvs-annotate-command): Use vc-switches.
 +      * vc/vc-git.el (vc-git-annotate-switches): New defcustom.
 +      (vc-git-annotate-command): Use vc-switches.
 +      * vc/vc-hg.el (vc-hg-annotate-switches): New defcustom.
 +      (vc-hg-annotate-command): Use vc-switches.
 +      * vc/vc-mtn.el (vc-mtn-annotate-switches): New defcustom.
 +      (vc-mtn-annotate-command): Use vc-switches.
 +      * vc/vc-svn.el (vc-svn-annotate-switches): New defcustom.
 +      (vc-svn-annotate-command): Use vc-switches.
 +
 +2015-02-26  Alan Mackenzie  <acm@muc.de>
  
        Handle "#" operator properly inside macro.  Fix coding bug.
  

diff --cc lisp/progmodes/cc-mode.el
Simple merge