From: Fabián Ezequiel Gallina Date: Sat, 27 Dec 2014 16:31:20 +0000 (-0300) Subject: Merge from origin/emacs-24 X-Git-Tag: emacs-25.0.90~2631^2~15^2~13 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=35e1f9d9fcbaab51808e05f514e63927f959ae51;p=emacs.git Merge from origin/emacs-24 a5f38fa Fix ChangeLog typo c6400e1 Fix composition of characters from Syriac and Arabis scripts. 7e9dfde python.el: Fix message when sending region. 800260c python.el: Cleanup temp files even with eval errors. ed65b91 Fix for previous commit 2dd5163 python.el: Handle file encoding for shell. 7aa506e Spelling fixes 4cd6d77 * automated/tramp-tests.el (tramp-test17-insert-directory): Do not expect a given order of "." and "..". a41d07b Fix rendering of composed caharacters on the mode line. (Bug#19435) b70977c Small doc markup fixes 73c050c * doc/lispref/modes.texi (Defining Minor Modes, SMIE Lexer): Markup fixes. 1783e6c ChangeLog fix c741b1b TUTORIAL.es: Improve style consistency f89efea TUTORIAL.es: spelling fixes 0d48826 Avoid compiler warning. Conflicts: doc/lispref/ChangeLog doc/lispref/control.texi etc/ChangeLog lisp/ChangeLog src/ChangeLog test/ChangeLog --- 35e1f9d9fcbaab51808e05f514e63927f959ae51 diff --cc doc/lispref/ChangeLog index 66f1d3a1785,83aaf6e8a3d..feafee89241 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@@ -1,4 -1,10 +1,11 @@@ -2014-12-24 Glenn Morris ++2014-12-27 Glenn Morris + + * control.texi (Pattern matching case statement): + * os.texi (Desktop Notifications): + * modes.texi (Defining Minor Modes, SMIE Lexer): Markup fixes. + -2014-12-23 Eli Zaretskii ++2014-12-27 Eli Zaretskii +2014-12-27 Eli Zaretskii * windows.texi (Recombining Windows): Index subject of sections. diff --cc doc/lispref/control.texi index fa760c45d6a,9511f682bc8..1e9f3461d0f --- a/doc/lispref/control.texi +++ b/doc/lispref/control.texi @@@ -370,12 -370,8 +370,12 @@@ that location More specifically, a Q-pattern can take the following forms: @table @code @item (@var{qpattern1} . @var{qpattern2}) - This pattern matches any cons cell whose @code{car} matches @var{QPATTERN1} and - whose @code{cdr} matches @var{PATTERN2}. + This pattern matches any cons cell whose @code{car} matches @var{qpattern1} and + whose @code{cdr} matches @var{pattern2}. +@item [@var{qpattern1} @var{qpattern2} @dots{} @var{qpatternm}] +This pattern matches a vector of length @var{M} whose 0..(@var{M}-1)th +elements match @var{qpattern1}, @var{qpattern2} @dots{} @var{qpatternm}, +respectively. @item @var{atom} This pattern matches any atom @code{equal} to @var{atom}. @item ,@var{upattern} diff --cc etc/ChangeLog index 814b94dde08,cbfe1d6fb10..f94db9aa571 --- a/etc/ChangeLog +++ b/etc/ChangeLog @@@ -1,61 -1,8 +1,66 @@@ -2014-12-24 Álvar Ibeas (tiny change) ++2014-12-27 Álvar Ibeas (tiny change) + + * tutorials/TUTORIAL.es: Improve style consistency. Spelling fixes. + -2014-11-19 Paul Eggert ++2014-12-27 Paul Eggert +2014-12-25 Karl Fogel + + * NEWS: Mention new buffer display behavior for `shell'. + This follows up to Sam Steingold's change of 2014-12-23 + in ../lisp/shell.el, in git commit e55a467ec0f758c311d3. + +2014-12-15 Artur Malabarba + + * NEWS: Mention `let-alist. + +2014-12-14 Alan Mackenzie + + * NEWS: Add entry for fast-but-imprecise-scrolling. + +2014-12-14 Cameron Desautels + + * NEWS: Mention `custom-prompt-customize-unsaved-options'. + + * TODO: Remove its entry. + +2014-12-13 Paul Eggert + + Convert Czech and Slovakian refcards to UTF-8 + * 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: + Convert from iso-latin-2 to utf-8. Remove no-longer-necessary + coding comments and "\input utf8off" directives. + +2014-12-13 Lars Magne Ingebrigtsen + + * NEWS: Mention directory-name-p. + +2014-12-09 Lars Magne Ingebrigtsen + + * NEWS: Mention directory-files-recursively. + +2014-12-08 Lars Magne Ingebrigtsen + + * NEWS: Mention the new eww `S' command. + +2014-12-05 Stephen Leake + + * CONTRIBUTE: Move to ../. + +2014-12-05 Lars Magne Ingebrigtsen + + * NEWS: Add some doc markers to the eww stuff. + +2014-12-04 Eli Zaretskii + + * NEWS: Mention 'buffer-substring-with-bidi-context'. + +2014-12-02 Eli Zaretskii + + * NEWS: Mention 'bidi-find-overridden-directionality'. + +2014-11-29 Paul Eggert Lessen focus on ChangeLog files, as opposed to change log entries. * CONTRIBUTE: Give advice about git commit messages and how diff --cc lisp/ChangeLog index 61e2e425ccd,cf866fa9d52..2e1f9e612eb --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,4 -1,39 +1,40 @@@ + 2014-12-27 Eli Zaretskii + + * language/misc-lang.el (composition-function-table): Add Syriac + characters and also ZWJ/ZWNJ. See + http://lists.gnu.org/archive/html/help-gnu-emacs/2014-12/msg00248.html + for the details. + + 2014-12-27 Fabián Ezequiel Gallina + + python.el: Fix message when sending region. + + * progmodes/python.el (python-shell-send-region): Rename argument + send-main from nomain. Fix message. + (python-shell-send-buffer): Rename argument send-main from arg. + + 2014-12-27 Fabián Ezequiel Gallina + + python.el: Cleanup temp files even with eval errors. + + * progmodes/python.el (python-shell-send-file): Make file-name + mandatory. Fix temp file removal in the majority of cases. + + 2014-12-27 Fabián Ezequiel Gallina + + python.el: Handle file encoding for shell. + + * progmodes/python.el (python-rx-constituents): Add coding-cookie. + (python-shell--save-temp-file): Write file with proper encoding. + (python-shell-buffer-substring): Add coding cookie for detected + encoding to generated content. Fix blank lines when removing + if-name-main block. + (python-shell-send-file): Handle file encoding. + (python-info-encoding-from-cookie) + (python-info-encoding): New functions. + -2014-12-24 Michael Albinus ++2014-12-27 Michael Albinus +2014-12-27 Michael Albinus * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): Use `tramp-rsh-end-of-line', it ought to be more robust. diff --cc src/ChangeLog index b58714353c1,2df83082fbd..2d9408bf468 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,63 -1,35 +1,84 @@@ -2014-12-25 Eli Zaretskii ++2014-12-27 Eli Zaretskii + + * xdisp.c (set_iterator_to_next) : Limit search in + composition_compute_stop_pos to the number of characters in the + string. (Bug#19435) + : Simplify code. + + * composite.c (composition_compute_stop_pos): If no composition + was found in a string before ENDPOS, and ENDPOS is the string end, + no need to back up to a safe point. + + * dispextern.h (struct it) : Improve commentary. + -2014-12-24 Jan Djärv ++2014-12-27 Jan Djärv + + * nsimage.m (allocInitFromFile:): Initialize bmRep. + (dealloc): Release bmRep. + (setPixmapData): Make bmRep local so class member is not + set (Bug#19133). + (setPixmapData): Rename local variable bmRep to avoid compiler + warning. +2014-12-27 Jan Djärv -2014-12-24 Jan Djärv + * xterm.c (do_ewmh_fullscreen): Don't remove maximized_horz/vert + when going to fullscreen (Bug#0x180004f). - * nsterm.h (EmacsImage): Remove imageListNext, refCount, reference, - imageListSetNext, imageListNext. +2014-12-27 Stefan Monnier - * nsimage.m (ImageList, imageListNext, imageListSetNext:) - (reference): Remove. - (allocInitFromFile:): Remove searching ImageList and calling - reference (Bug#18918). - (dealloc): Remove handling if ImageList. + * buffer.c (syms_of_buffer) : fix docstring. + +2014-12-27 Eli Zaretskii + + * gnutls.c (gnutls_init): Fix deprecation warning from GCC. + +2014-12-26 Paul Eggert + + Use bool for boolean in xselect.c, xsettings.c + * xselect.c (x_get_local_selection, struct selection_data) + (x_selection_request_lisp_error, struct prop_location) + (x_handle_selection_request, x_convert_selection) + (waiting_for_other_props_on_window, expect_property_change) + (wait_for_property_change, x_handle_property_notify) + (x_get_foreign_selection, x_get_window_property) + (receive_incremental_selection) + (x_get_window_property_as_lisp_data) + (lisp_data_to_selection_data, Fx_get_selection_internal) + (x_send_client_event): + * xselect.c, xterm.h (x_handle_dnd_message): + * xsettings.c (dpyinfo_valid, parse_settings, read_settings) + (apply_xft_settings, read_and_apply_settings) + (xft_settings_event, init_gsettings, init_xsettings) + (syms_of_xsettings): + Use bool for boolean. + * xselect.c (x_get_window_property): Omit last arg, which was an + unused boolean. + * xsettings.c (apply_xft_settings): Remove 2nd arg, which was + always true. All callers changed. + +2014-12-26 Eli Zaretskii + + * w32proc.c (sys_spawnve, get_lcid_callback): Use strcpy instead + of strcat. + + * w32menu.c (add_menu_item): Use stpcpy instead of strcat. + + * w32.c (sys_readdir, stat_worker, symlink): Use strcpy instead of + strcat. + +2014-12-26 Paul Eggert + + Use bool for boolean in xsmfns.c + * xsmfns.c, xterm.h (x_session_have_connection): + * xsmfns.c (doing_interact, smc_interact_CB, Fhandle_save_session): + Use bool for boolean. + (x_session_initialize, Fhandle_save_session): + Prefer NILP (x) to EQ (x, Qnil). + +2014-12-23 Didier Verna (tiny change). + + * nsselect.m (Fns_selection_owner_p): Return a Lisp boolean, not a + C one (Bug#19396). 2014-12-22 Jan Djärv diff --cc test/ChangeLog index e7b8fec0ec9,101e9d9caa7..1652a024b35 --- a/test/ChangeLog +++ b/test/ChangeLog @@@ -1,10 -1,30 +1,30 @@@ + 2014-12-27 Fabián Ezequiel Gallina + + * automated/python-tests.el (python-shell-buffer-substring-1) + (python-shell-buffer-substring-2, python-shell-buffer-substring-3) + (python-shell-buffer-substring-4, python-shell-buffer-substring-5) + (python-shell-buffer-substring-6, python-shell-buffer-substring-7) + (python-shell-buffer-substring-8) + (python-info-encoding-from-cookie-1) + (python-info-encoding-from-cookie-2) + (python-info-encoding-from-cookie-3) + (python-info-encoding-from-cookie-4) + (python-info-encoding-from-cookie-5) + (python-info-encoding-from-cookie-6) + (python-info-encoding-from-cookie-7, python-info-encoding-1) + (python-info-encoding-2): New tests. + -2014-12-25 Michael Albinus ++2014-12-27 Michael Albinus + + * automated/tramp-tests.el (tramp-test17-insert-directory): Do not + expect a given order of "." and "..". + -2014-12-22 Fabián Ezequiel Gallina +2014-12-27 Fabián Ezequiel Gallina * automated/python-tests.el (python-indent-electric-colon-2) (python-indent-electric-colon-3): New tests. - 2014-12-27 João Távora -2014-12-14 João Távora +2014-12-27 João Távora * automated/electric-tests.el (autowrapping-7): Tests for tex-mode. @@@ -14,74 -34,7 +34,73 @@@ * automated/flymake/warnpred/test.pl: Tweak format, since the previous one seems to have stopped giving a warning with perl 5.20.1. - 2014-12-27 Fabián Ezequiel Gallina -2014-11-22 Fabián Ezequiel Gallina +2014-12-26 Fabián Ezequiel Gallina + + * automated/python-tests.el (python-shell-get-process-name-1) + (python-shell-internal-get-process-name-1): Cleanup. + (python-shell-get-process-name-2) + (python-shell-internal-get-process-name-2): New tests. + (python-shell-calculate-command-1) + (python-shell-calculate-process-environment-3) + (python-shell-calculate-exec-path-2, python-shell-make-comint-1) + (python-shell-make-comint-2, python-shell-make-comint-4) + (python-shell-get-process-1, python-util-clone-local-variables-1): + Replace obsolete function and variable references with current. + +2014-12-19 Artur Malabarba + + * automated/let-alist.el: require `cl-lib' + New tests for accessing alists inside alists. + +2014-12-18 Artur Malabarba + + * automated/let-alist.el: New file. + +2014-12-16 Nicolas Petton + + * automated/seq-tests.el: New file. + +2014-12-16 Glenn Morris + + * automated/data/flymake/Makefile (check-syntax): + Prevent colorized gcc output from confusing flymake. + + * automated/flymake-tests.el (flymake-tests-data-directory): + Change from flymake/warnpred to more standard data/flymake. + * automated/flymake/warnpred/: Rename to automated/data/flymake/. + +2014-12-11 Michael Albinus + + * automated/vc-tests.el (vc-test--revision-granularity-function): + New defun. + (vc-test--create-repo-function): Rename from + `vc-test--create-repo-if-not-supported'. Adapt all callees. + (vc-test--create-repo): Check also for revision-granularity. + (vc-test--unregister-function): Additional argument FILE. Adapt + all callees. + (vc-test--working-revision): New defun. + (vc-test-*-working-revision): New tests. + +2014-12-10 Michael Albinus + + * automated/vc-tests.el (vc-test--register): Check, that the file + still exists after register and unregister operations. + +2014-12-06 Michael Albinus + + * automated/vc-tests.el: New file. + +2014-12-03 Michael Albinus + + * automated/tramp-tests.el (tramp-test29-vc-registered): + Fallback for changed `vc-register' argument list. + +2014-12-03 Glenn Morris + + * automated/tramp-tests.el (tramp-test29-vc-registered): + Update for recent incompatible change in vc-register. + +2014-11-29 Fabián Ezequiel Gallina * automated/python-tests.el (python-shell-calculate-process-environment-4)