From: Paul Eggert Date: Tue, 3 Mar 2015 22:21:26 +0000 (-0800) Subject: Merge from origin/emacs-24 X-Git-Tag: emacs-25.0.90~2564^2~244 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=9792a944dcf08a246bf2618b2a5bee906a888069;p=emacs.git 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 --- 9792a944dcf08a246bf2618b2a5bee906a888069 diff --cc admin/ChangeLog index ec500569860,f5490013544..9a160446b35 --- a/admin/ChangeLog +++ b/admin/ChangeLog @@@ -1,4 -1,9 +1,9 @@@ -2015-02-02 Glenn Morris ++2015-03-03 Glenn Morris + + * admin.el (manual-meta-string): Use bug-gnu-emacs@gnu email address + rather than webmasters@gnu. + -2015-01-03 Glenn Morris +2015-01-28 Glenn Morris * update_autogen (commit): Prepend "# " to commit message. diff --cc lisp/ChangeLog index 3bc9b8c85ce,2d4f71f6cec..db1358cd2fe --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,117 -1,12 +1,125 @@@ -2015-02-01 Alan Mackenzie ++2015-03-03 Alan Mackenzie + + 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 +2015-03-03 Daniel Colascione + + * 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 + +2015-03-03 Stefan Monnier + + * progmodes/gud.el: Use lexical-binding (bug#19966). + + * emacs-lisp/gv.el (gv-ref): Warn about likely problematic cases. + +2015-03-03 Daniel Colascione + + * 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 + + * emacs-lisp/package.el (package-autoremove): Fix if logic. + +2015-03-03 Martin Rudalics + + * window.el (window--dump-frame): For pixel height return total + number of frame's lines. + +2015-03-03 Daniel Colascione + + * 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 + + * emacs-lisp/generator.el: New file. + + * vc/vc.el (vc-responsible-backend): Add autoload cookie for + `vc-responsible-backend'. + +2015-03-01 Michael Albinus + + * 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 + + * net/shr.el (shr-insert): Remove soft hyphens. + (shr-insert): Also remove soft hypens from non-folded text. + +2015-02-28 Eli Zaretskii + + * mail/rmailmm.el (rmail-mime-insert-html): Decode HTML payload + when the charset is only given by the HTML , and allow to + specify the encoding with "C-x RET c". + +2015-02-27 Mark Laws + + 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 + + * 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 + + * 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 Handle "#" operator properly inside macro. Fix coding bug.