From: Glenn Morris Date: Sun, 12 Oct 2014 22:56:45 +0000 (-0700) Subject: Merge from emacs-24; up to 2014-07-26T11:58:24Z!schwab@linux-m68k.org X-Git-Tag: emacs-25.0.90~2635^2~679^2~69 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b1d5ab0352b6132eee4feaf9091ce7dc7a3e6a84;p=emacs.git Merge from emacs-24; up to 2014-07-26T11:58:24Z!schwab@linux-m68k.org --- b1d5ab0352b6132eee4feaf9091ce7dc7a3e6a84 diff --cc ChangeLog index 42e53b1fc76,3567ce607df..ef58145f368 --- a/ChangeLog +++ b/ChangeLog @@@ -1,25 -1,9 +1,30 @@@ -2014-10-11 Ken Brown ++2014-10-12 Ken Brown + + * configure.ac (LD_SWITCH_SYSTEM_TEMACS) [CYGWIN]: Set stack size + to 8 MB. (Bug#18438) + -2014-10-02 Paul Eggert +2014-10-12 Jan Djärv + + * configure.ac: Require OSX 10.6. Remove NSInteger test, + use nsfont for Gnustep, macfont for OSX. + +2014-10-12 Paul Eggert + + Fix putenv race conditions that can crash Emacs (Bug#8705). + * configure.ac (LOCALTIME_CACHE): Remove. + We needn't worry about SunOS 4 any more; Sun dropped support in 2003. + All uses of LOCALTIME_CACHE removed. This simplifies the fix. + (tzalloc): Add check for this function. + +2014-10-06 Jan Djärv + + * configure.ac: Add -Wno-string-plus-int for clang. + +2014-10-04 Glenn Morris + + * configure.ac: Silence warning with some old Xrandr.h. (Bug#18465) + +2014-10-03 Paul Eggert * configure.ac: Port to strict POSIX shells on non-MinGW (Bug#18612). diff --cc doc/lispref/ChangeLog index ba95d11399a,56215f8c858..8ec524cc534 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@@ -1,8 -1,10 +1,12 @@@ -2014-10-09 Glenn Morris ++2014-10-12 Glenn Morris + + * elisp.texi (DATE): Bump to October 2014. + +2014-10-09 Glenn Morris + * frames.texi (Multiple Terminals): Copyedits. -2014-10-08 Eli Zaretskii +2014-10-09 Eli Zaretskii * frames.texi (Multiple Terminals): Improve the description of X display names. Add index entries. diff --cc doc/misc/org.texi index cab8a811e6e,7c796070fb3..2af44239e8d --- a/doc/misc/org.texi +++ b/doc/misc/org.texi @@@ -1,8 -1,9 +1,9 @@@ \input texinfo @c %**start of header -@setfilename ../../info/org +@setfilename ../../info/org.info @settitle The Org Manual - @set VERSION 8.2.8 + + @set VERSION 8.2.9 @c Version and Contact Info @set MAINTAINERSITE @uref{http://orgmode.org,maintainers web page} diff --cc lisp/ChangeLog index b07a6b0d851,9ec8c94fec3..41c68d7fbee --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,53 -1,15 +1,65 @@@ + 2014-10-12 Fabián Ezequiel Gallina + + Fix import completion. (Bug#18582) + * progmodes/python.el (python-shell-completion-get-completions): + Fix import case regexp. + -2014-10-10 Stefan Monnier ++2014-10-12 Stefan Monnier + + * progmodes/bat-mode.el (bat-font-lock-keywords): Fix \\<_ typo + (bug#18622). Reported by Arni Magnusson . + * progmodes/prolog.el (prolog-electric--underscore): Same. + +2014-10-12 Michael Albinus + + * net/tramp-sh.el (tramp-get-remote-id): Check also for "gid". + +2014-10-11 Jan Djärv + + * cus-start.el (all): Add missing ns and boolean to + ns-use-fullscreen-animation. + +2014-10-11 Leo Liu + + * progmodes/cfengine.el (cfengine3-defuns, cfengine3-vartypes): + Use strings. + (cfengine3-create-imenu-index): New function. + (cfengine3-mode): Use it for `imenu-create-index-function'. + (cfengine-auto-mode): Improve and prefer cfengine3-mode when + buffer is empty. + +2014-10-11 Jan Djärv + + * cus-start.el (all): Add ns-use-fullscreen-animation. + +2014-10-11 Glenn Morris + + * calendar/diary-lib.el (diary-display-function): + Drop support for deprecated nil and list forms. + (diary-list-entries): Update for the above. + * calendar/cal-x.el (calendar-dedicate-diary): Simplify accordingly. + +2014-10-10 Leo Liu + + * window.el (temp-buffer-window-show): Make BUFFER a required arg. + (Bug#18656) + +2014-10-10 Stefan Monnier + + * select.el (gui-selection-exists-p-alist): New method. + * menu-bar.el (menu-bar-edit-menu, clipboard-yank): + * simple.el (deactivate-mark): Use it. + * term/x-win.el (gui-selection-exists-p): + * term/w32-win.el (gui-selection-exists-p): + * term/pc-win.el (gui-selection-exists-p): + * term/ns-win.el (gui-selection-exists-p): Provide a backend instance. + +2014-10-10 Glenn Morris + + * info.el (Info-fontify-maximum-menu-size): Bump to 400k. (Bug#16227) + Fix :type. Allow t to mean no limit. + (Info-fontify-node): Handle Info-fontify-maximum-menu-size = t. + 2014-10-09 Glenn Morris * frame.el (display-monitor-attributes-list): Doc tweaks. diff --cc lisp/org/ChangeLog index 5a8a9b250a1,98adf5da0e4..38e2eb7a96f --- a/lisp/org/ChangeLog +++ b/lisp/org/ChangeLog @@@ -1,4 -1,18 +1,16 @@@ + 2014-10-12 Christopher Schmidt + - * org.el (orgstruct-make-binding): Do not use loop in interpreted - code. ++ * org.el (orgstruct-make-binding): Do not use loop in interpreted code. + + 2014-10-12 Mike McLean (tiny change) + + * org-agenda.el (org-agenda-time-grid): Change docstring. + + 2014-10-12 Nicolas Goaziou + - * ox.el (org-export-async-start): Allow to use symbols as - function. ++ * ox.el (org-export-async-start): Allow to use symbols as function. + -2014-10-02 Achim Gratz +2014-10-03 Achim Gratz * ob-sh.el (org-babel-sh-initiate-session): After initiating a session, initialize the marker `comint-last-output-start' since it diff --cc lisp/progmodes/python.el index dfefe837569,a564acc3075..b230992fc98 --- a/lisp/progmodes/python.el +++ b/lisp/progmodes/python.el @@@ -2874,21 -2678,24 +2874,25 @@@ the full statement in the case of impor "24.4" "Completion string code must also autocomplete modules.") -(defcustom python-shell-completion-pdb-string-code - "';'.join(globals().keys() + locals().keys())" - "Python code used to get completions separated by semicolons for [i]pdb." - :type 'string - :group 'python) +(define-obsolete-variable-alias + 'python-shell-completion-pdb-string-code + 'python-shell-completion-string-code + "25.1" + "Completion string code must work for (i)pdb.") -(defun python-shell-completion-get-completions (process line input) - "Do completion at point for PROCESS. -LINE is used to detect the context on how to complete given INPUT." +(defun python-shell-completion-get-completions (process import input) + "Do completion at point using PROCESS for IMPORT or INPUT. +When IMPORT is non-nil takes precedence over INPUT for +completion." (with-current-buffer (process-buffer process) (let* ((prompt - (let ((prompt-boundaries (python-util-comint-last-prompt))) + ;; Get last prompt of the inferior process buffer (this + ;; intentionally avoids using `comint-last-prompt' because + ;; of incompatibilities with Emacs 24.x). + (save-excursion (buffer-substring-no-properties - (car prompt-boundaries) (cdr prompt-boundaries)))) + (line-beginning-position) ;End of prompt. + (re-search-backward "^")))) (completion-code ;; Check whether a prompt matches a pdb string, an import ;; statement or just the standard prompt and use the diff --cc src/ChangeLog index b47fb4c9d0f,19c553ff7a1..add43dc4b07 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,177 -1,14 +1,187 @@@ -2014-10-10 Paul Eggert ++2014-10-12 Paul Eggert + + Fix port to Debian GNU/kFreeBSD 7 (wheezy) (Bug#18666). + * process.c (accept4) [!HAVE_ACCEPT4]: New macro. + -2014-10-09 Stefan Monnier ++2014-10-12 Stefan Monnier + + * frame.c (Fmouse_pixel_position): Call Vmouse_position_function + (bug#18638). + -2014-10-08 K. Handa +2014-10-12 Paul Eggert + + * editfns.c (dump_tz_string): No longer const. + It might be modified. + + * nsmenu.m (clear): Assume OS X 10.6 or later. + +2014-10-12 Jan Djärv + + * unexmacosx.c: Remove include ppc/reloc.h. + (unrelocate, copy_dysymtab): Remove PPC code. + (rebase_reloc_address): Remove, only used for PPC: + + * nsterm.m: Always include macfont.h on COCOA. + (ns_update_auto_hide_menu_bar, ns_draw_fringe_bitmap) + (ns_dumpglyphs_image, ns_check_menu_open) + (applicationDidFinishLaunching) + (antialiasThresholdDidChange:) + (keyDown:, toggleFullScreen:, setPosition:portion:whole:): Remove + checks for OSX <= 10.5/10.6. + (changeFont:): Use macfont on COCOA, nsfont on GNUSTEP. + (syms_of_nsterm): Call syms_of_macfont on COCOA, syms_of_nsfont on + GNUSTEP. + + * nsterm.h (MAC_OS_X_VERSION_10_4, MAC_OS_X_VERSION_10_5): Remove. + (NS_HAVE_NSINTEGER): Remove block. + Remove >= OSX 10.6 tests. + + * nsmenu.m (NSMenuDidBeginTrackingNotification): Remove. + (x_activate_menubar, trackingNotification:): Remove check for + OSX >= 10.5. + (menuNeedsUpdate:): Remove check for OSX < 10.5. + + * nsimage.m (allocInitFromFile:): Remove code for OSX < 10.6. + + * nsfns.m: Always include macfont.h on COCOA. + (ns_filename_from_panel, ns_directory_from_panel) + (Fx_create_frame, Fns_popup_font_panel, ns_run_file_dialog) + (Fns_read_file_name, Fns_list_services): Remove code for OSX < 10.6 + + * macfont.m: Remove >= 1050 check. + (macfont_create_family_with_symbol) + (macfont_get_glyph_for_character) + (mac_font_get_glyphs_for_variants) + (mac_ctfont_create_available_families, syms_of_macfont): Remove + code for OSX < 10.6. + (mac_font_family_group, mac_font_family_compare): Remove, only used + for OSX < 10.6. + + * macfont.h (MAC_FONT_FORMAT_ATTRIBUTE, MAC_FONT_FORMAT_BITMAP) + (mac_font_copy_non_synthetic_table): Remove versions for OSX < 10.6 + + * Makefile.in: Replace nsfont.o macfont.o with ns_fontfile in + comment. + +2014-10-12 Paul Eggert + + Fix putenv race conditions with undefined behavior (Bug#8705). + Do all putenv calls before Emacs creates any threads. + Use a safer way to modify the TZ environment variable in the + presence of multiple threads. For further thread-safety, + prefer localtime_r and gmtime_r to localtime and gmtime, + and prefer struct tm's tm_gmtoff (if available) to calling + both localtime_r and gmtime_r. + * dbusbind.c (Fdbus__init_bus): Move xputenv call from here ... + (init_dbusbind): ... to this new function. + * emacs.c (main) [HAVE_DBUS]: Call it before creating threads. + * xterm.c (x_term_init): Move xputenv call from here ... + (init_xterm): ... to this new function. + * emacs.c (main) [USE_GTK]: Call it before creating threads. + * editfns.c (HAVE_TM_GMTOFF): Default to false. + (dump_tz_string): New constant. + (init_editfns): Use it. This centralizes the dump_tz stuff. + Call set_time_zone_rule here, so that its xputenv is done + before Emacs goes multithreaded. + (mktime_z) [!HAVE_TZALLOC]: New function, which is typically + thread-safe enough for Emacs. + (format_time_string, Fdecode_time, Fcurrent_time_string) + (Fcurrent_time_zone): + Prefer localtime_r and gmtime_r, which are more thread-safe, to + localtime and gmtime. Remove now-unnecessary calls to block_input. + (tm_gmtoff): New static function. + (Fdecode_time, Fcurrent_time_zone): Use it. + (Fencode_time): Use mktime_z, for better thread-safety. + (set_time_zone_rule): Now static. Rewrite to be mostly thread-safe, + i.e., not quite thread-safe but good enough for Emacs typical usage. + Do not reclaim storage that is in the environment; let it leak. + Always call tzset, since localtime_r does not. + * emacs.c (dump_tz, Fdump_emacs) [HAVE_TZSET]: Remove dump_tz stuff. + This is now done in init_editfns. + * systime.h (mktime_z, timezone_t, tzalloc, tzfree) [!HAVE_TZALLOC]: + New macros and declarations, for platforms lacking tzalloc & friends. + +2014-10-09 Paul Eggert + + * lisp.h (USE_STACK_STRING): Now true only if USE_STACK CONS. + On x86 platforms this works around GCC bug 63495 + , + and more generally should fix a portability problem in Emacs. + Problem reported by Stefan Monnier in: + http://lists.gnu.org/archive/html/emacs-devel/2014-10/msg00261.html + +2014-10-08 Leo Liu + + Enhance terpri to allow conditionally output a newline. (Bug#18652) + * keymap.c (describe_vector_princ): + * keyboard.c (Fcommand_error_default_function): Adapt to change to + Fterpri. + + * print.c (printchar_stdout_last): Declare. + (printchar): Record the last char written to stdout. + (Fterpri): Add optional argument ENSURE. + +2014-10-08 Eli Zaretskii + + * w32inevt.c (maybe_generate_resize_event): Pass non-zero as the + DELAY argument to change_frame_size, so that the frame size + changes, if any are needed, are delayed until the next redisplay. + This is to avoid a too early QUIT inside change_frame_size, when + it calls Lisp in frame_windows_min_size, in case one of the events + we've read sets the quit-flag. (Bug#18649) + + * w32fns.c (check_x_display_info): Accept terminal objects as + argument, to follow what xfns.c does. + +2014-10-07 Glenn Morris + + * Makefile.in ($(srcdir)/macuvs.h) + ($(lispsource)/international/charprop.el): Add explicit FORCE. + +2014-10-07 Eli Zaretskii + + * decompress.c (init_zlib_functions): Move the message about zlib + being unavailable from here... + (Fzlib_decompress_region): ...to here. (Bug#18650) + +2014-10-07 Dmitry Antipov + + * font.c (Ffont_get_glyphs): Use validate_subarray and fix + the case where an optional string is used. Adjust docstring. + +2014-10-06 Stefan Monnier + + * lisp.mk (lisp): Remove w32-common-fns.elc. + +2014-10-05 Paul Eggert + + * keyboard.c (Qleft, Qright): Remove duplicate definitions (Bug#9927). + These were already defined in buffer.c, and the duplicate + definitions cause problems on platforms like 'gcc -fno-common'. + Reported by Peter Dyballa in: http://bugs.gnu.org/9927#137 + +2014-10-05 Jan Djärv + + * nsterm.m (updateFrameSize:): Only call update_frame_tool_bar + if toolbar is visible. + + * nsfont.m (nsfont_draw): Use CGFloat for GNUstep newer than + 0.23 (Bug#18030). + + * nsterm.m (syms_of_nsterm): ns-use-fullscreen-animation is new. + (toggleFullScreen:): Use ns-use-fullscreen-animation for animate. + (ns_select, ns_read_socket): Use unwind_protect to decrease + apploopnr (Bug#18345). + (ns_draw_window_cursor): Adjust y for hbar cursor only if smaller than + line height (Bug#17977). + + * macfont.m: Fix indentation and import changes from macport 24.3.94. + (macfont_closest_traits_index): New function. + (macfont_closest_traits_index_p): Rename from + macfont_closest_traits_index. + (macfont_list): Use macfont_closest_traits_index_p. + +2014-10-05 K. Handa * coding.c (detect_coding_iso_2022): Set coding->rejected correctly when an invalid escape sequence is found (Bug#18610). diff --cc src/frame.c index d0527bf2a9c,e894d218df7..a3139173655 --- a/src/frame.c +++ b/src/frame.c @@@ -1867,45 -1601,13 +1868,49 @@@ and nil for X and Y. */ } XSETFRAME (lispy_dummy, f); - return Fcons (lispy_dummy, Fcons (x, y)); + retval = Fcons (lispy_dummy, Fcons (x, y)); + GCPRO1 (retval); + if (!NILP (Vmouse_position_function)) + retval = call1 (Vmouse_position_function, retval); + RETURN_UNGCPRO (retval); } +#ifdef HAVE_WINDOW_SYSTEM + +/* On frame F, convert character coordinates X and Y to pixel + coordinates *PIX_X and *PIX_Y. */ + +static void +frame_char_to_pixel_position (struct frame *f, int x, int y, + int *pix_x, int *pix_y) +{ + *pix_x = FRAME_COL_TO_PIXEL_X (f, x) + FRAME_COLUMN_WIDTH (f) / 2; + *pix_y = FRAME_LINE_TO_PIXEL_Y (f, y) + FRAME_LINE_HEIGHT (f) / 2; + + if (*pix_x < 0) + *pix_x = 0; + if (*pix_x > FRAME_PIXEL_WIDTH (f)) + *pix_x = FRAME_PIXEL_WIDTH (f); + + if (*pix_y < 0) + *pix_y = 0; + if (*pix_y > FRAME_PIXEL_HEIGHT (f)) + *pix_y = FRAME_PIXEL_HEIGHT (f); +} + +/* On frame F, reposition mouse pointer to character coordinates X and Y. */ + +static void +frame_set_mouse_position (struct frame *f, int x, int y) +{ + int pix_x, pix_y; + + frame_char_to_pixel_position (f, x, y, &pix_x, &pix_y); + frame_set_mouse_pixel_position (f, pix_x, pix_y); +} + +#endif /* HAVE_WINDOW_SYSTEM */ + DEFUN ("set-mouse-position", Fset_mouse_position, Sset_mouse_position, 3, 3, 0, doc: /* Move the mouse pointer to the center of character cell (X,Y) in FRAME. Coordinates are relative to the frame, not a window,