From: Glenn Morris Date: Mon, 21 Jul 2014 06:03:08 +0000 (-0400) Subject: Merge from emacs-24; up to 2014-06-25T10:17:41Z!rgm@gnu.org X-Git-Tag: emacs-25.0.90~2636^3~56 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=190644a0115a592f237b5f7c91f0f96e82edb864;p=emacs.git Merge from emacs-24; up to 2014-06-25T10:17:41Z!rgm@gnu.org --- 190644a0115a592f237b5f7c91f0f96e82edb864 diff --cc doc/emacs/ChangeLog index a9c4995d49b,3a4f67bf4b2..a1d2688470d --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@@ -1,4 -1,8 +1,8 @@@ + 2014-07-21 Glenn Morris + + * emacs.texi (Intro): Workaround makeinfo 4 @acronym bug. (Bug#18040) + -2014-07-03 Juri Linkov +2014-07-09 Juri Linkov * search.texi (Regexp Search): Update lax space matching that is not active in regexp search by default now. (Bug#17901) diff --cc lisp/ChangeLog index 5ed7d6918d3,6c6e7543c29..1c557c91602 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,35 -1,75 +1,99 @@@ + 2014-07-21 Glenn Morris + + * progmodes/hideif.el (hide-ifdef-mode-submap): + Also substitute read-only-mode. + * bindings.el (mode-line-toggle-read-only): + * bs.el (bs-toggle-readonly): + * buff-menu.el (Buffer-menu-toggle-read-only): + * dired.el (dired-toggle-read-only): + * files.el (view-read-only, find-file-read-only) + (find-file-read-only-other-window) + (find-file-read-only-other-frame): + * progmodes/hideif.el (hide-ifdef-toggle-outside-read-only): + Doc fixes re toggle-read-only. + -2014-07-20 Fabián Ezequiel Gallina ++2014-07-21 Fabián Ezequiel Gallina + + * progmodes/python.el: Add comment about pipe buffering and + solutions for missing/delayed output in inferior Python shells. + (Bug#17304) + -2014-07-20 Fabián Ezequiel Gallina - + * progmodes/python.el (python-mode): Don't set + mode-require-final-newline. (Bug#17990) + -2014-07-20 Fabián Ezequiel Gallina - + Make python.el work with IPython automatically. (Bug#15510) + * progmodes/python.el: + (python-shell-completion-setup-code): New value supporting iPython. + (python-shell-completion-string-code): New value supporting iPython. + (python-shell-completion-get-completions): Use them. + (python-shell-completion-module-string-code): Make obsolete. + (python-shell-prompt-input-regexps) + (python-shell-prompt-output-regexps): Add safeguard for ipdb. + (python-shell-output-filter): Fix comment typo. + -2014-07-19 Fabián Ezequiel Gallina - + Fix Python shell prompts detection for remote hosts. + * progmodes/python.el (python-shell-prompt-detect): Replace + call-process with process-file and make it more robust. + -2014-07-17 Fabián Ezequiel Gallina - + Autodetect Python shell prompts. (Bug#17370) + * progmodes/python.el: + (python-shell-interpreter-interactive-arg) + (python-shell-prompt-detect-enabled) + (python-shell-prompt-detect-failure-warning) + (python-shell-prompt-input-regexps) + (python-shell-prompt-output-regexps): New vars. + (python-shell-prompt-calculated-input-regexp) + (python-shell-prompt-calculated-output-regexp): New vars. + (python-shell-get-process-name) + (python-shell-internal-get-process-name) + (python-shell-output-filter) + (python-shell-completion-get-completions): Use them. + (python-shell-prompt-detect) + (python-shell-prompt-validate-regexps): New functions. + (python-shell-prompt-set-calculated-regexps): New function. + (inferior-python-mode): Use it. Also honor overriden + python-shell-interpreter and python-shell-interpreter-args. + (python-shell-make-comint): Honor overriden + python-shell-interpreter and python-shell-interpreter-args. + (python-shell-get-or-create-process): Make it testable by allowing + to call run-python non-interactively. + (python-util-valid-regexp-p): New function. + (python-shell-prompt-regexp, python-shell-prompt-block-regexp) + (python-shell-prompt-output-regexp) + (python-shell-prompt-pdb-regexp): Use it as defcustom :safe. + +2014-07-21 Stefan Monnier + + * emacs-lisp/smie.el (smie-config--guess-1): Split from + smie-config--guess. + (smie-config--guess): Use it. + + * emacs-lisp/edebug.el: Use nadvice. + (edebug-original-read): Remove. + (edebug--read): Rename from edebug-read and add `orig' arg. + (edebug-uninstall-read-eval-functions) + (edebug-install-read-eval-functions): Use nadvice. + (edebug-read-sexp, edebug-read-storing-offsets, edebug-read-symbol) + (edebug-read-and-maybe-wrap-form1, edebug-instrument-callee) + (edebug-read-string, edebug-read-function): Use just `read'. + (edebug-original-debug-on-entry): Remove. + (edebug--debug-on-entry): Rename from edebug-debug-on-entry and add + `orig' arg. + (debug-on-entry): Override with nadvice. + + * mouse.el (tear-off-window): Rename from mouse-tear-off-window since + it also makes sense to bind it to a non-mouse event. + + * vc/vc-bzr.el (vc-bzr-shelve): Make it operate on fileset. + +2014-07-19 Stefan Monnier + + * xt-mouse.el (xterm-mouse-event): Don't assume last-click is non-nil + (bug#18015). + + * rect.el (rectangle--string-preview): Don't assume there + a non-nil default (bug#17984). + 2014-07-16 Glenn Morris * desktop.el (after-init-hook): Disable startup frame restoration diff --cc lisp/progmodes/python.el index 1187636c663,86970b8a0c7..89ef12d49eb --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@@ -2070,9 -2305,14 +2304,13 @@@ be asked for their values. (global-proc-name (python-shell-get-process-name nil)) (global-proc-buffer-name (format "*%s*" global-proc-name)) (dedicated-running (comint-check-proc dedicated-proc-buffer-name)) - (global-running (comint-check-proc global-proc-buffer-name)) - (current-prefix-arg 16)) + (global-running (comint-check-proc global-proc-buffer-name))) (when (and (not dedicated-running) (not global-running)) - (if (call-interactively 'run-python) + (if (if (not cmd) + ;; XXX: Refactor code such that calling `run-python' + ;; interactively is not needed anymore. + (call-interactively 'run-python) + (run-python cmd dedicated show)) (setq dedicated-running t) (setq global-running t))) ;; Always prefer dedicated diff --cc src/ChangeLog index d4f6321faf7,f39526f4f4b..25732ac9f5d --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,69 -1,40 +1,103 @@@ -2014-07-20 Jan Djärv ++2014-07-21 Jan Djärv + + * nsterm.m (applicationDidFinishLaunching:): Call + antialiasThresholdDidChange, register for antialias changes (Bug#17534). + (antialiasThresholdDidChange:): New method for EmacsApp. + + * nsterm.h (EmacsApp): Add antialiasThresholdDidChange. + + * macfont.m (macfont_update_antialias_threshold): Remove static. + + * macfont.h (macfont_update_antialias_threshold): Declare. + -2014-07-17 Eli Zaretskii ++2014-07-21 Eli Zaretskii + + * w32select.c (setup_windows_coding_system): Apply + CODING_ANNOTATION_MASK to the common_flags member of struct + coding_system. Reported by martin rudalics . + + * w16select.c (Fw16_get_clipboard_data): Apply + CODING_ANNOTATION_MASK to the common_flags member of struct + coding_system. + + * xdisp.c (init_iterator): Initialize it->stop_charpos to the + buffer position where we are to start the iteration. + (handle_invisible_prop): Record in it->stop_charpos the position + where the invisible text ends. (Bug#18035) + (hscroll_window_tree): Don't try hscrolling windows whose cursor + row has zero buffer position as their start position. Reported by + martin rudalics . + -2014-07-16 Eli Zaretskii - + * xdisp.c (move_it_vertically_backward, move_it_by_lines): Prevent + infinite looping in redisplay when display lines don't have enough + space to display even a single character. (Bug#18036) + -2014-07-13 Eli Zaretskii +2014-07-20 Dmitry Antipov + + * frame.h (struct frame) [USE_X_TOOLKIT]: New member shell_position. + * xfns.c (x_window): Use it to allow xfree later. + (x_encode_text): Drop 3rd arg; unused. Tweak comment and adjust users + where appropriate. Use bool for booleans and remove redundant checks. + (Fx_backspace_delete_keys_p): Use XkbFreeKeyboard; explain why. + * xterm.c (x_free_frame_resources): Free shell_position. + +2014-07-19 K. Handa + + * xfaces.c (realize_x_face): Call font_load_for_lface with no + mandatory font spec (Bug#17973). + +2014-07-19 Stefan Monnier + + * font.c (font_score): Return the worst score if the size of + ENTITY is wrong by more than a factor 2 (Bug#17973). + +2014-07-18 Dmitry Antipov + + * frame.c (frame_unspecified_color): New function + refactored out from ... + (Fframe_parameters, Fframe_parameter): ... adjusted users. + (x_fullscreen_adjust, set_frame_param): Move Windows-specific + function to ... + * w32term.c (x_fullscreen_adjust, set_frame_param): ... static here. + * frame.h (x_fullscreen_adjust) [HAVE_NTGUI]: + * lisp.h (set_frame_param): Remove prototype. + * xterm.c (x_display_pixel_width, x_display_pixel_height): Now ... + * xterm.h (x_display_pixel_width, x_display_pixel_height): ... + inlined from here. + + Prefer 'x_display_info *' to 'Display *' in X selection code. + This helps to avoid unneeded calls to x_display_info_for_display. + * xterm.h (struct selection_input_event): Record 'x_display_info *' + instead of 'Display *'. + (SELECTION_EVENT_DPYINFO): New macro. + (SELECTION_EVENT_DISPLAY): Now inline function to prohibit using + it as an lvalue. Mention this in comment. + * xterm.c (handle_one_xevent): Use SELECTION_EVENT_DPYINFO. + * xselect.c (x_get_window_property_as_lisp_data, x_atom_to_symbol) + (selection_data_to_lisp_data, receive_incremental_selection): + Convert to use 'x_display_info *'. Adjust users where appropriate. + (lisp_data_to_selection_data): Likewise. Also pass 'struct + selection data *' as last arg to not return values in args. + (unexpect_property_change): Use common removal technique. + +2014-07-17 Dmitry Antipov + + * print.c (print_preprocess): Adjust to match changed + sub char-table structure and avoid crash (Bug#18038). + + * data.c (wrong_choice): Not static any more. + * lisp.h (wrong_choice): Add prototype. + * frame.h (struct frame) [USE_X_TOOLKIT || HAVE_NTGUI]: + Declare namebuf as such. Tweak comment. + [USE_GTK]: Likewise for tool_bar_position. + (fset_tool_bar_position) [USE_GTK]: Ditto. + (FRAME_TOOL_BAR_POSITION): New macro. + * frame.c (x_report_frame_params): + * gtkutil.c (update_frame_tool_bar): + * xfns.c (Fx_create_frame): Use it. + (x_set_tool_bar_position): Add meaningful diagnostic messages. + +2014-07-16 Eli Zaretskii * xdisp.c (decode_mode_spec): Call file-remote-p on the current buffer's default-directory only if it is a string. (Bug#17986) diff --cc test/ChangeLog index dca2f7e14fe,451fa91548f..c66ea1c739f --- a/test/ChangeLog +++ b/test/ChangeLog @@@ -1,18 -1,55 +1,52 @@@ -2014-07-20 Fabián Ezequiel Gallina ++2014-07-21 Fabián Ezequiel Gallina + + * automated/python-tests.el: + (python-util-clone-local-variables-1): Fix test. + -2014-07-17 Fabián Ezequiel Gallina - + * automated/python-tests.el (python-shell-make-comint-1): + (python-shell-make-comint-2): Fix indentation. + (python-shell-make-comint-3) + (python-shell-make-comint-4): New tests. + (python-shell-get-or-create-process-1): Fix test. + (python-shell-get-or-create-process-2) + (python-shell-get-or-create-process-3): New tests. + (python-shell-internal-get-or-create-process-1): Fix test. + (python-shell-prompt-detect-1): New test. + (python-shell-prompt-detect-2): New test. (Bug#17370) + (python-shell-prompt-detect-3) + (python-shell-prompt-detect-4) + (python-shell-prompt-detect-5) + (python-shell-prompt-detect-6) + (python-shell-prompt-validate-regexps-1) + (python-shell-prompt-validate-regexps-2) + (python-shell-prompt-validate-regexps-3) + (python-shell-prompt-validate-regexps-4) + (python-shell-prompt-validate-regexps-5) + (python-shell-prompt-validate-regexps-6) + (python-shell-prompt-validate-regexps-7) + (python-shell-prompt-set-calculated-regexps-1) + (python-shell-prompt-set-calculated-regexps-2) + (python-shell-prompt-set-calculated-regexps-3) + (python-shell-prompt-set-calculated-regexps-4) + (python-shell-prompt-set-calculated-regexps-5) + (python-shell-prompt-set-calculated-regexps-6) + (python-util-valid-regexp-p-1): New tests. + -2014-07-09 Fabián Ezequiel Gallina +2014-07-21 Stefan Monnier + + * automated/advice-tests.el (advice-test-call-interactively): Make sure + the function's definition is fully restored at the end. - * automated/python-tests.el - (python-indent-block-enders-1) +2014-07-12 Fabián Ezequiel Gallina + + * automated/python-tests.el (python-indent-block-enders-1) (python-indent-block-enders-2): Fix tests. - (python-indent-block-enders-3) - (python-indent-block-enders-4) - (python-indent-block-enders-5) - (python-indent-dedenters-1) + (python-indent-block-enders-3, python-indent-block-enders-4) + (python-indent-block-enders-5, python-indent-dedenters-1) (python-indent-dedenters-2): Remove tests. - (python-indent-dedenters-1) - (python-indent-dedenters-2) - (python-indent-dedenters-3) - (python-indent-dedenters-4) - (python-indent-dedenters-5) - (python-indent-dedenters-6) + (python-indent-dedenters-1, python-indent-dedenters-2) + (python-indent-dedenters-3, python-indent-dedenters-4) + (python-indent-dedenters-5, python-indent-dedenters-6) (python-indent-dedenters-7) (python-info-dedenter-opening-block-position-1) (python-info-dedenter-opening-block-position-2) @@@ -33,32 -70,13 +67,32 @@@ (python-info-dedenter-statement-p-4) (python-info-dedenter-statement-p-5): New tests. -2014-07-01 Fabián Ezequiel Gallina +2014-07-08 Stefan Monnier + + * indent/perl.perl: Add indentation pattern for hash-table entries. + +2014-07-04 Michael Albinus + + * automated/dbus-tests.el (dbus-test02-register-service-session) + (dbus-test02-register-service-system): Fix docstring. + (dbus-test02-register-service-own-bus) + (dbus-test03-peer-interface): New tests. + +2014-07-03 Fabián Ezequiel Gallina - * automated/python-tests.el - (python-tests-self-insert): New function. + * automated/python-tests.el (python-tests-self-insert): New function. (python-triple-quote-pairing): Use it. - (python-util-forward-comment-1): New test. (Bug#17658) + (python-parens-electric-indent-1): New test. (Bug#17658) +2014-06-30 Fabián Ezequiel Gallina + + * automated/subr-x-tests.el: New file. + +2014-06-29 Michael Albinus + + * automated/tramp-tests.el (tramp--instrument-test-case): + Print debug buffer in any case. + 2014-06-28 Leo Liu * automated/calc-tests.el: New file and add tests for math-bignum.