From: Glenn Morris Date: Fri, 11 Apr 2014 06:43:20 +0000 (-0700) Subject: Merge from emacs-24; up to 2014-04-04T23:31:02Z!joaotavora@gmail.com X-Git-Url: https://git.hcoop.net/bpt/emacs.git/commitdiff_plain/536aa4668198bf4851356a8e3a57b7f8969014c3 Merge from emacs-24; up to 2014-04-04T23:31:02Z!joaotavora@gmail.com --- 536aa4668198bf4851356a8e3a57b7f8969014c3 diff --cc ChangeLog index dfa5d2ac96,4dca366c75..bd710bd283 --- a/ChangeLog +++ b/ChangeLog @@@ -1,4 -1,14 +1,14 @@@ + 2014-04-11 Glenn Morris + + * make-dist: Do not distribute generated admin/grammars/Makefile. + Do distribute lib-src/update-game-score.exe.manifest. + -2014-04-09 Ken Brown ++2014-04-11 Ken Brown + + * configure.ac (EMACS_MANIFEST): Revert last change (but leave + UPDATE_MANIFEST empty). + -2014-04-03 Ken Brown +2014-04-07 Ken Brown * configure.ac (EMACS_MANIFEST, UPDATE_MANIFEST): Leave these variables empty on Cygwin. (Bug#17176) diff --cc etc/ChangeLog index 7cd423e340,aa53b5b999..38693a70f1 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@@ -1,17 -1,10 +1,24 @@@ + 2014-04-11 Glenn Morris + + * refcards/cs-dired-ref.tex, refcards/cs-refcard.tex: + * refcards/cs-survival.tex, refcards/sk-dired-ref.tex: + * refcards/sk-refcard.tex, refcards/sk-survival.tex: + Input "utf8off", which seems to be needed. + +2014-04-01 Michael Albinus + + * NEWS: `url-handler-mode' passes operations to Tramp for some + protocols. + +2014-03-28 Tassilo Horn + + * themes/tsdh-light-theme.el (tsdh-light): Add gnus-group-* faces. + +2014-03-22 Glenn Morris + + * CENSORSHIP, GNU, LINUX-GNU, THE-GNU-PROJECT, WHY-FREE: Replace + contents with pointers to www.gnu.org or emacs.info, mark obsolete. + 2014-03-14 Rüdiger Sonderfeld * tutorials/TUTORIAL.de: Adapt to recent changes in TUTORIAL. diff --cc lisp/ChangeLog index 37e0989382,94cfda082e..f0e3d17613 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,40 -1,26 +1,63 @@@ -2014-04-10 Stefan Monnier ++2014-04-11 Stefan Monnier + + Ediff's overlay priorities cause more trouble than they solve. + * vc/ediff-init.el (ediff-shadow-overlay-priority): Remove variable. + (ediff-highest-priority): Remove function (bug#17234). + * vc/ediff-util.el (ediff-highlight-diff-in-one-buffer): + * vc/ediff-diff.el (ediff-set-diff-overlays-in-one-buffer) + (ediff-set-fine-diff-properties-in-one-buffer): Don't mess with + overlay priorities. + -2014-04-10 Feng Li (tiny change) ++2014-04-11 Feng Li (tiny change) + + * progmodes/pascal.el (pascal-font-lock-keywords): Fix incorrect format + entry; use symbol boundaries to avoid mis-matches. + -2014-04-10 Michael Albinus ++2014-04-11 Michael Albinus + + * net/tramp.el (tramp-file-name-handler) + (tramp-completion-file-name-handler): Avoid recursive loading. + + * net/tramp-sh.el (tramp-make-copy-program-file-name): + Quote result also locally. + +2014-04-11 Stefan Monnier + + * emulation/cua-base.el (, cua--pre-command-handler-1): + Remove left-over code. + + * newcomment.el (comment-indent-new-line): Sink code where it's used. + Reuse the previous comment's indentation unconditionally if it's on its + own line. + +2014-04-09 Daniel Colascione + + * emacs-lisp/lisp.el (backward-up-list): Add `escape-strings', + `no-syntax-crossing' arguments. Forward to `up-list'. + (up-list): Add `escape-strings', `no-syntax-crossing' arguments. + Implement logic for escaping from strings. Use narrowing to deal + with corner cases. + +2014-04-09 Leo Liu + + * net/rcirc.el (rcirc-connection-info): New variable. + (rcirc-connect): Use it to store connection info. + (rcirc-buffer-process): Avoid get-buffer-process which returns nil + for killed process. + (rcirc-cmd-reconnect): New command. (Bug#17045) + (rcirc-mode, set-rcirc-encode-coding-system) + (set-rcirc-decode-coding-system, rcirc-connect): Use setq-local. + +2014-04-09 Daniel Colascione + + * emacs-lisp/cl-indent.el: Add comment claiming + facility is also good for elisp. + (lisp-indent-find-method): New function. + (common-lisp-indent-function): Recognize cl-loop. + (common-lisp-indent-function-1): Recognize cl constructs; use + `lisp-indent-find-method' instead of `get' directly. + (if): Use else-body style for elisp. + 2014-04-09 Dmitry Gutov * progmodes/ruby-mode.el (ruby-font-lock-keywords): Highlight more diff --cc make-dist index 16b90de239,aed5b17c0e..34fb358ee7 --- a/make-dist +++ b/make-dist @@@ -383,9 -383,10 +383,10 @@@ echo "Making links to \`lib' echo "Making links to \`lib-src'" (cd lib-src ln [a-zA-Z]*.[ch] ../${tempdir}/lib-src - ln ChangeLog Makefile.in README testfile ../${tempdir}/lib-src + ln ChangeLog Makefile.in README ../${tempdir}/lib-src ln grep-changelog rcs2log ../${tempdir}/lib-src - ln makefile.w32-in ../${tempdir}/lib-src) + ln makefile.w32-in ../${tempdir}/lib-src + ln update-game-score.exe.manifest ../${tempdir}/lib-src) echo "Making links to \`m4'" (cd m4 diff --cc nt/ChangeLog index 215eaae15e,38e5512043..8a8dcb14ab --- a/nt/ChangeLog +++ b/nt/ChangeLog @@@ -1,4 -1,8 +1,8 @@@ -2014-04-09 Ken Brown ++2014-04-11 Ken Brown + + * emacs.rc: Revert last change. + -2014-04-03 Ken Brown +2014-04-07 Ken Brown * emacs.rc: Don't use manifest on Cygwin. (Bug#17176) diff --cc src/ChangeLog index 69bfc4ca07,9d59ab1c97..927b001034 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,26 -1,11 +1,34 @@@ + 2014-04-11 Glenn Morris + + * keyboard.c (Fopen_dribble_file): Make file private. (Bug#17187) + -2014-04-09 Ken Brown ++2014-04-11 Ken Brown + + * Makefile.in (EMACS_MANIFEST): Revert last change. + +2014-04-10 Daniel Colascione + + * puresize.h (BASE_PURESIZE): Increase. + +2014-04-09 Stefan Monnier + + * keyboard.c (syms_of_keyboard): Make deactivate-mark buffer-local. + + * insdel.c (prepare_to_modify_buffer_1): Cancel lock-file checks and + region handling (and don't call signal_before_change) if + inhibit_modification_hooks is set. + (signal_before_change): Don't check inhibit_modification_hooks any more. + +2014-04-08 Daniel Colascione + + * alloc.c (sweep_symbols, mark_object): Assert that symbol + function cells contain valid lisp objects. (Modified version of + patch from Dmitry). + + * alloc.c (detect_suspicious_free): Split actual stack capturing + out into new function for easier breakpoint setting. + (note_suspicious_free): New function. + 2014-04-07 Stefan Monnier * lisp.h (struct Lisp_Symbol): New bitfield `pinned'. diff --cc test/ChangeLog index ebba4f01e9,8f203f68d5..7f56fc4c6c --- a/test/ChangeLog +++ b/test/ChangeLog @@@ -1,7 -1,9 +1,13 @@@ -2014-04-10 Paul Eggert ++2014-04-11 Paul Eggert + + * automated/electric-tests.el: Fix spelling error in test name. + (whitespace-skipping-for-quotes-not-outside): + Rename from whitespace-skipping-for-quotes-not-ouside. + +2014-04-09 Daniel Colascione + + * automated/syntax-tests.el: New file. + 2014-04-09 Glenn Morris * automated/python-tests.el (python-triple-quote-pairing):