GitLab

* lib/stddef.in.h: Update from gnulib, incorporating:
2015-04-02 stddef: port to pre-C11 GCC on x86

* progmodes/cc-mode.el (c-common-init): bind
\(before\|after\)-change-functions to nil around invocations of
c-get-state-before-change-functions and
c-before-font-lock-functions to prevent recursive invocations.
(c-neutralize-syntax-in-and-mark-CPP): On c-beginning-of-macro,
check that point has actually moved back.
(c-fl-decl-start): Check whether c-beginning-of-decl-1 has
actually found a boundary (as contrasted with hitting a search
limit).

cc-mode.el (c-font-lock-init): Setq font-lock-extend-region-functions to
nil.

Fixes: debbugs:19736

* lisp/progmodes/python.el (python-shell-completion-setup-code):
Cleaner setup; import rlcompleter as last resource.

(package-menu--list-to-prompt): New function.
(package-menu--prompt-transaction-p): Use "Upgrade" to make the
package-menu-execute prompt less verbose.

(package-menu--new-package-list)
(package-menu--old-archive-contents): No longer local.

 src/w32proc.c (w32_executable_type): Look for the DLL name in the
 correct section.  This avoids segfaults with some executables.

Most install/delete logic is now in
`package-menu--perform-transaction', and this function is called
asynchronously if `package-menu-async' is non-nil.

* htmlfontify.el (hfy-optimizations): Rename from hfy-optimisations,
with an obsolete alias.  All uses changed.

* rtree.el (rtree-normalize-range): Rename from rtree-normalise-range.
All uses changed.  Add an alias for obsolete usages.

* lisp/progmodes/python.el (python-docstring-at-p): Remove function.
(python-info-assignment-statement-p): New function.
(python-info-assignment-continuation-line-p): Use it.
(python-info-docstring-p): New function.
(python-font-lock-syntactic-face-function)
(python-fill-string): Use it.

* test/automated/python-tests.el (python-info-assignment-statement-p-1)
(python-info-assignment-statement-p-2)
(python-info-assignment-statement-p-3, python-info-docstring-p-1)
(python-info-docstring-p-2, python-info-docstring-p-3)
(python-info-docstring-p-4, python-info-docstring-p-5)
(python-info-docstring-p-6): New tests.

 lisp/ses.el (ses-sym-rowcol): Move up, before the first use, to avoid
 byte-compiler warnings.

* jit-lock.el (jit-lock-after-change): Widen the buffer only
whilst putting the 'fontified text properties.

Also expunge eudc-c[ad]+r.

* subr.el (internal--compiler-macro-cXXr): "New" function, copied
from cl--compiler-macro-cXXr.
(caar, cadr, cdar, cddr): Change from defsubsts to defuns with
the above compiler-macro.

* net/eudc.el (eudc-cadr, eudc-cdar, eudc-caar, eudc-cdaar): Remove.

* emacs-lisp/cl.el (Top level dolist doing defaliases): Remove
caaar, etc., from list of new alias functions.

* emacs-lisp/cl-lib.el (cl-caaar, etc): Rename to caaar, etc.
(gen-cXXr--rawname, gen-cXXr-all-cl-aliases): New function/macro
which generate obsolete cl- aliases for caaar, etc.  Invoke them.

* desktop.el:
* edmacro.el:
* emacs-lisp/cl-macs.el:
* frameset.el:
* ibuffer.el:
* mail/footnote.el:
* net/dbus.el:
* net/eudc-export.el:
* net/eudc.el:
* net/eudcb-ph.el:
* net/rcirc.el:
* net/secrets.el:
* play/5x5.el:
* play/decipher.el:
* play/hanoi.el:
* progmodes/hideif.el:
* ses.el: Replace cl-caaar, eudc-cadr, etc. with caaar and cadr, etc.

Conflicts:
	lisp/ChangeLog

       indicate start and finish in the echo area.

       * mail/rmail.el (rmail-epa-decrypt): Disregard <pre> before armor.
       Ignore more kinds of whitespace in mime headers.
       Modify the decrypted mime part's mime type so it will be displayed
       by default when visiting this message again.

       * net/browse-url.el (browse-url-firefox-program): Prefer IceCat, doc.
       (browse-url-firefox-arguments)
       (browse-url-firefox-startup-arguments): Doc fix.

* files.el (file-truename): Add NaCl to the exception list ms-dos uses.

21d4bf6c * admin/make-tarball.txt: Copyedits.
f3b70a79 ; ChangeLog fix
07432a8c Revert "CC Mode: Stop Font Lock forcing fontification from BOL."

Conflicts:
	lisp/ChangeLog

The following commit was skipped:

0ad5fe01 * etc/AUTHORS: Update the AUTHORS file

dd3f5678 Fix tramp-tests.el

Conflicts:
	test/ChangeLog

The following commit was skipped:

1b70aa63 Fix bug#20233, do not merge with master

* net/tramp-cache.el (tramp-flush-directory-property): Quote directory
name when used in regexp.

Fixes: debbugs:16737

* src/xselect.c (x_reply_selection_request)
(receive_incremental_selection): Call set_property_change_object
inside block_input.
(wait_for_property_change): Move set property_change_reply(_object)
outside of this function.
(set_property_change_object): New function.

jit-lock.el (jit-lock-after-change): Widen the buffer before
putting 'fontified text properties.