]> git.eshelyaron.com Git - emacs.git/commitdiff
Merge from origin/emacs-24
authorFabián Ezequiel Gallina <fgallina@gnu.org>
Sat, 27 Dec 2014 16:31:20 +0000 (13:31 -0300)
committerFabián Ezequiel Gallina <fgallina@gnu.org>
Sat, 27 Dec 2014 16:31:20 +0000 (13:31 -0300)
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

17 files changed:
1  2 
doc/lispref/ChangeLog
doc/lispref/control.texi
doc/lispref/os.texi
etc/ChangeLog
lisp/ChangeLog
lisp/net/tramp.el
lisp/org/ox-html.el
lisp/progmodes/python.el
lisp/textmodes/tex-mode.el
src/ChangeLog
src/composite.c
src/dispextern.h
src/nsimage.m
src/xdisp.c
test/ChangeLog
test/automated/python-tests.el
test/automated/tramp-tests.el

index 66f1d3a1785d7f52f7a1d1bf37ec2f6ef3dbea7b,83aaf6e8a3dbcab1bdb1d4c3679657d928f36094..feafee89241898bd1a8e02903ced708d8d139c24
@@@ -1,4 -1,10 +1,11 @@@
 -2014-12-24  Glenn Morris  <rgm@gnu.org>
++2014-12-27  Glenn Morris  <rgm@gnu.org>
+       * control.texi (Pattern matching case statement):
+       * os.texi (Desktop Notifications):
+       * modes.texi (Defining Minor Modes, SMIE Lexer): Markup fixes.
 -2014-12-23  Eli Zaretskii  <eliz@gnu.org>
++2014-12-27  Eli Zaretskii  <eliz@gnu.org>
 +2014-12-27  Eli Zaretskii  <eliz@gnu.org>
  
        * windows.texi (Recombining Windows): Index subject of sections.
  
index fa760c45d6ac904ee960e3b33d6de857808437af,9511f682bc81adeba22d5eca6c75462f0ce17b5c..1e9f3461d0f19ac2c5609009c32de6df1fb765e7
@@@ -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}
Simple merge
diff --cc etc/ChangeLog
index 814b94dde0891519400ca67f39dbf6e753f6e7fc,cbfe1d6fb1089db0e7f7d5aa48a6dc1a6353524d..f94db9aa571d584593f910176b0be22eadc19370
@@@ -1,61 -1,8 +1,66 @@@
 -2014-12-24  Álvar Ibeas  <ibeas@gmx.com>  (tiny change)
++2014-12-27  Álvar Ibeas  <ibeas@gmx.com>  (tiny change)
+       * tutorials/TUTORIAL.es: Improve style consistency.  Spelling fixes.
 -2014-11-19  Paul Eggert  <eggert@cs.ucla.edu>
++2014-12-27  Paul Eggert  <eggert@cs.ucla.edu>
 +2014-12-25  Karl Fogel  <kfogel@red-bean.com>
 +
 +      * 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 <bruce.connor.am@gmail.com>
 +
 +      * NEWS: Mention `let-alist.
 +
 +2014-12-14  Alan Mackenzie  <acm@muc.de>
 +
 +      * NEWS: Add entry for fast-but-imprecise-scrolling.
 +
 +2014-12-14  Cameron Desautels  <camdez@gmail.com>
 +
 +      * NEWS: Mention `custom-prompt-customize-unsaved-options'.
 +
 +      * TODO: Remove its entry.
 +
 +2014-12-13  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      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  <larsi@gnus.org>
 +
 +      * NEWS: Mention directory-name-p.
 +
 +2014-12-09  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 +
 +      * NEWS: Mention directory-files-recursively.
 +
 +2014-12-08  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 +
 +      * NEWS: Mention the new eww `S' command.
 +
 +2014-12-05  Stephen Leake  <stephen_leake@stephe-leake.org>
 +
 +      * CONTRIBUTE: Move to ../.
 +
 +2014-12-05  Lars Magne Ingebrigtsen  <larsi@gnus.org>
 +
 +      * NEWS: Add some doc markers to the eww stuff.
 +
 +2014-12-04  Eli Zaretskii  <eliz@gnu.org>
 +
 +      * NEWS: Mention 'buffer-substring-with-bidi-context'.
 +
 +2014-12-02  Eli Zaretskii  <eliz@gnu.org>
 +
 +      * NEWS: Mention 'bidi-find-overridden-directionality'.
 +
 +2014-11-29  Paul Eggert  <eggert@cs.ucla.edu>
  
        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 61e2e425ccdc647644aa27a4c160dbb1ed5a1a6a,cf866fa9d525b737bc0b4b2d0ce28b4e4925efac..2e1f9e612ebce3dc2f587d1855929194a4421b85
@@@ -1,4 -1,39 +1,40 @@@
 -2014-12-24  Michael Albinus  <michael.albinus@gmx.de>
+ 2014-12-27  Eli Zaretskii  <eliz@gnu.org>
+       * 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  <fgallina@gnu.org>
+       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  <fgallina@gnu.org>
+       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  <fgallina@gnu.org>
+       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-27  Michael Albinus  <michael.albinus@gmx.de>
 +2014-12-27  Michael Albinus  <michael.albinus@gmx.de>
  
        * 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.
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc src/ChangeLog
index b58714353c14b37e3021fecc9e8bfdeeb1e7073c,2df83082fbd13faeac8fbd8669a49801b319e6e1..2d9408bf468b5fac1286398b5586db037eac9ef1
@@@ -1,63 -1,35 +1,84 @@@
 -2014-12-25  Eli Zaretskii  <eliz@gnu.org>
++2014-12-27  Eli Zaretskii  <eliz@gnu.org>
+       * xdisp.c (set_iterator_to_next) <GET_FROM_STRING>: Limit search in
+       composition_compute_stop_pos to the number of characters in the
+       string.  (Bug#19435)
+       <GET_FROM_BUFFER, GET_FROM_STRING>: 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) <end_charpos>: Improve commentary.
 -2014-12-24  Jan Djärv  <jan.h.d@swipnet.se>
++2014-12-27  Jan Djärv  <jan.h.d@swipnet.se>
+       * 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  <jan.h.d@swipnet.se>
  
 -2014-12-24  Jan Djärv  <jan.h.d@swipnet.se>
 +      * 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  <monnier@iro.umontreal.ca>
  
 -      * 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) <Vafter_change_functions>: fix docstring.
 +
 +2014-12-27  Eli Zaretskii  <eliz@gnu.org>
 +
 +      * gnutls.c (gnutls_init): Fix deprecation warning from GCC.
 +
 +2014-12-26  Paul Eggert  <eggert@cs.ucla.edu>
 +
 +      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  <eliz@gnu.org>
 +
 +      * 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  <eggert@cs.ucla.edu>
 +
 +      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  <didier@didierverna.net> (tiny change).
 +
 +      * nsselect.m (Fns_selection_owner_p): Return a Lisp boolean, not a
 +      C one (Bug#19396).
  
  2014-12-22  Jan Djärv  <jan.h.d@swipnet.se>
  
diff --cc src/composite.c
Simple merge
Simple merge
diff --cc src/nsimage.m
Simple merge
diff --cc src/xdisp.c
Simple merge
diff --cc test/ChangeLog
index e7b8fec0ec9ab68704e07236da8b96ee304ba998,101e9d9caa72707f15cfbcdbd42a413fda93c2f6..1652a024b35e949ce101db6243ece0e839cb035d
@@@ -1,10 -1,30 +1,30 @@@
 -2014-12-25  Michael Albinus  <michael.albinus@gmx.de>
+ 2014-12-27  Fabián Ezequiel Gallina  <fgallina@gnu.org>
+       * 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-22  Fabián Ezequiel Gallina  <fgallina@gnu.org>
++2014-12-27  Michael Albinus  <michael.albinus@gmx.de>
+       * automated/tramp-tests.el (tramp-test17-insert-directory): Do not
+       expect a given order of "." and "..".
 +2014-12-27  Fabián Ezequiel Gallina  <fgallina@gnu.org>
  
        * automated/python-tests.el (python-indent-electric-colon-2)
        (python-indent-electric-colon-3): New tests.
  
- 2014-12-27  João Távora  <joaotavora@gmail.com>
 -2014-12-14  João Távora  <joaotavora@gmail.com>
 +2014-12-27  João Távora  <joaotavora@gmail.com>
  
        * automated/electric-tests.el (autowrapping-7): Tests for
        tex-mode.
        * 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  <fgallina@gnu.org>
 -2014-11-22  Fabián Ezequiel Gallina  <fgallina@gnu.org>
 +2014-12-26  Fabián Ezequiel Gallina  <fgallina@gnu.org>
 +
 +      * 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  <bruce.connor.am@gmail.com>
 +
 +      * automated/let-alist.el: require `cl-lib'
 +      New tests for accessing alists inside alists.
 +
 +2014-12-18  Artur Malabarba  <bruce.connor.am@gmail.com>
 +
 +      * automated/let-alist.el: New file.
 +
 +2014-12-16  Nicolas Petton <petton.nicolas@gmail.com>
 +
 +      * automated/seq-tests.el: New file.
 +
 +2014-12-16  Glenn Morris  <rgm@gnu.org>
 +
 +      * 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  <michael.albinus@gmx.de>
 +
 +      * 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  <michael.albinus@gmx.de>
 +
 +      * automated/vc-tests.el (vc-test--register): Check, that the file
 +      still exists after register and unregister operations.
 +
 +2014-12-06  Michael Albinus  <michael.albinus@gmx.de>
 +
 +      * automated/vc-tests.el: New file.
 +
 +2014-12-03  Michael Albinus  <michael.albinus@gmx.de>
 +
 +      * automated/tramp-tests.el (tramp-test29-vc-registered):
 +      Fallback for changed `vc-register' argument list.
 +
 +2014-12-03  Glenn Morris  <rgm@gnu.org>
 +
 +      * automated/tramp-tests.el (tramp-test29-vc-registered):
 +      Update for recent incompatible change in vc-register.
 +
 +2014-11-29  Fabián Ezequiel Gallina  <fgallina@gnu.org>
  
        * automated/python-tests.el
        (python-shell-calculate-process-environment-4)
Simple merge
Simple merge