From: Glenn Morris Date: Mon, 11 Aug 2014 00:59:34 +0000 (-0700) Subject: Merge from emacs-24; up to 2014-06-28T23:35:17Z!rgm@gnu.org X-Git-Tag: emacs-25.0.90~2635^2~679^2~485 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=c7367d2de3343e56171c4fe6d439a3ed5f40d06c;p=emacs.git Merge from emacs-24; up to 2014-06-28T23:35:17Z!rgm@gnu.org --- c7367d2de3343e56171c4fe6d439a3ed5f40d06c diff --cc ChangeLog index 3511f0434aa,6864b7043e1..069b3545e0f --- a/ChangeLog +++ b/ChangeLog @@@ -1,65 -1,17 +1,78 @@@ -2014-08-10 Paul Eggert ++2014-08-11 Paul Eggert + + Don't prevent random file systems from being unmounted (Bug#18232). + This fix relies on having the 'fchdir' function, and on having + "." be searchable (or at least readable, on platforms lacking O_SEARCH), + but that's good enough to handle the vast majority of cases and the + remaining folks can just live with the annoyance of file systems + that occasionally can't be unmounted. + * configure.ac (fchdir): New function to check for. + * lib/save-cwd.c: Copy from gnulib, except omit the part that + allocates memory, since that can cause problems in Emacs. + * lib/save-cwd.h: Copy from gnulib. + -2014-07-11 Paul Eggert +2014-08-10 Eli Zaretskii + + * config.bat: Fix some confusing wording. + +2014-08-09 Eli Zaretskii + + * config.bat: Fix EOL format in lines modified by last commit. + +2014-08-09 Reuben Thomas + + * make-dist (files): Remove msdos/is_exec.c and sigaction.c. + * config.bat: Require DJGPP 2.02 or later. + +2014-08-09 Paul Eggert + + Merge from gnulib, incorporating: + 2014-08-07 getdtablesize: fall back on sysconf (_SC_OPEN_MAX) + 2014-08-05 sys_select: fix FD_ZERO problem on Solaris 10 + * lib/getdtablesize.c, lib/sys_select.in.h: Update from gnulib. + +2014-08-07 Reuben Thomas + + * README: ``MSDOG'' becomes ``MS-DOS''. + +2014-08-04 Paul Eggert + + Merge from gnulib, incorporating: + 2014-08-04 extern-inline: port to FreeBSD, DragonFly + * lib/gnulib.mk: Regenerate (comment change only). + * m4/extern-inline.m4: Update from gnulib. + +2014-08-02 Paul Eggert + + * configure.ac (HAVE_TIMERFD): Also check for TFD_NONBLOCK, + since the code is using TFD_NONBLOCK now. + +2014-07-31 Paul Eggert + + Simplify timerfd configuration and fix some minor glitches. + * configure.ac (HAVE_TIMERFD): Define only if TFD_CLOEXEC works, + since the code leaked file descriptors to children when !TFD_CLOEXEC. + (HAVE_TIMERFD_CLOEXEC): Remove; no longer used. + * m4/clock_time.m4 (gl_CLOCK_TIME): Don't check for clock_getres. + This reverts the previous change to this file, so it matches + gnulib again. + +2014-07-28 Dmitry Antipov + + * configure.ac (toplevel): Check whether GNU/Linux-specific + timerfd functions and macros are available. + * m4/clock_time.m4 (gl_CLOCK_TIME): Check for clock_getres as well. + +2014-07-13 Paul Eggert + + Improve behavior of 'bzr up; cd src; make -k'. + * Makefile.in (ACLOCAL_INPUTS): Add all m4/*.m4 files. + +2014-07-12 Paul Eggert + + Merge from gnulib, incorporating: + 2014-06-27 mktime: merge #if/#ifdef usage from glibc + * lib/mktime.c: Update from gnulib. * Makefile.in (install-arch-indep): Avoid readdir race (Bug#17971). diff --cc configure.ac index 7e101aa9fc9,04925d59d22..3e49527e0f1 --- a/configure.ac +++ b/configure.ac @@@ -3545,19 -3507,18 +3545,19 @@@ case "$mail_lock" i esac AC_SUBST(BLESSMAIL_TARGET) - +OLD_LIBS=$LIBS +LIBS="$LIB_PTHREAD $LIB_MATH $LIBS" - AC_CHECK_FUNCS(accept4 gethostname \ + AC_CHECK_FUNCS(accept4 fchdir gethostname \ getrusage get_current_dir_name \ -lrand48 \ +lrand48 random rint \ select getpagesize setlocale \ getrlimit setrlimit shutdown getaddrinfo \ -strsignal setitimer \ +pthread_sigmask strsignal setitimer \ sendto recvfrom getsockname getpeername getifaddrs freeifaddrs \ -gai_strerror getline getdelim sync \ +gai_strerror sync \ getpwent endpwent getgrent endgrent \ -touchlock \ cfmakeraw cfsetspeed copysign __executable_start log2) +LIBS=$OLD_LIBS dnl No need to check for aligned_alloc and posix_memalign if using dnl gmalloc.o, as it supplies them. Don't use these functions on diff --cc lisp/ChangeLog index ab1fad7bc34,ba8dac2c4e9..daf9f28d8fc --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,169 -1,45 +1,207 @@@ + 2014-08-11 Glenn Morris + + * files.el (basic-save-buffer-2): Revert 2013-01-31 change, which + chose coding system for writing before backing up, since it causes + a more serious problem than the one it solves. (Closes Bug#18141, + reopens Bug#13522.) + -2014-08-10 Martin Rudalics ++2014-08-11 Martin Rudalics + - * window.el (window-total-size): Make doc-string more - self-contained. - -2014-08-09 Martin Rudalics ++ * window.el (window-total-size): Make doc-string more self-contained. + + * window.el (display-buffer-below-selected): Restore original + behavior if buffer is already displayed in the window below the + selected one (Bug#18181). + -2014-08-08 Stefan Monnier ++2014-08-11 Stefan Monnier + + * mouse.el (mouse--down-1-maybe-follows-link): Don't convert the down + event (bug#18212). + -2014-08-08 Eli Zaretskii ++2014-08-11 Eli Zaretskii + + * info.el (info): Doc fix. + -2014-08-07 Stefan Monnier ++2014-08-11 Stefan Monnier + + * info.el (Info-mode-map): Override a global down-mouse-2 binding + (bug#18212). + -2014-08-05 Eli Zaretskii ++2014-08-11 Eli Zaretskii + + * simple.el (default-line-height): A floating-point value of + line-spacing means a fraction of the default frame font's height, + not of the font currently used by the 'default' face. + Truncate the pixel value, like the display engine does. + (window-screen-lines): Use window-inside-pixel-edges for + determining the window height in pixels. (Bug#18195) + -2014-07-29 Eli Zaretskii +2014-08-11 Grégoire Jadi + + * leim/quail/latin-post.el: Transform " __" into " _". (Bug#18023) + +2014-08-10 Ulf Jasper + + Enumerate evaluated sexp diary entries (Bug#7911). + * calendar/icalendar.el (icalendar-export-sexp-enumerate-all) + (icalendar-export-sexp-enumeration-days): New. + (icalendar-export-region): Now `icalendar--convert-to-ical' + returns a cons cell or a list of cons cells. + (icalendar--convert-to-ical): Take care of + `icalendar-export-sexp-enumerate-all'. Return (a list of) cons cells. + (icalendar--convert-ordinary-to-ical) + (icalendar--convert-weekly-to-ical, icalendar--convert-yearly-to-ical) + (icalendar--convert-block-to-ical, icalendar--convert-block-to-ical) + (icalendar--convert-float-to-ical, icalendar--convert-cyclic-to-ical) + (icalendar--convert-anniversary-to-ical): Return cons cell. + (icalendar--convert-sexp-to-ical): Enumerate evaluated sexp + entries. Return (list of) cons cells. + +2014-08-09 Juri Linkov + + * vc/vc-annotate.el (vc-annotate-background-mode): Add :set + to reevaluate `vc-annotate-color-map'. (Bug#18189) + +2014-08-09 Alan Mackenzie + + * progmodes/cc-fonts.el (c-font-lock-declarators): Remove check + for top-level that can cause unacceptable slow-down in scrolling. + See email Subject: Huge {...} blocks in C/C++ again, from Dmitry + Antipov from 2013-10-14 in emacs-devel. + +2014-08-08 Rüdiger Sonderfeld + + * ibuffer.el (ibuffer-mode-map): Use toggle button for + `ibuffer-auto-mode' menu entry. + (ibuffer-mode-hook): Add `ibuffer-auto-mode' customization option. + +2014-08-08 Matthias Meulien + + * progmodes/prog-mode.el (prog-mode-hook): Make customizable. + (Bug#16394) + +2014-08-07 Martin Rudalics + + * window.el (window--min-size-1): Explicitly set WINDOW arg in + calls of window-min-pixel-height and window-min-pixel-width. + +2014-08-07 Reuben Thomas + + * progmodes/ada-mode.el: + * net/tramp.el (tramp-handle-file-symlink-p): + * net/tramp-ftp.el (tramp-ftp-file-name-handler): Remove a comment + about VMS, which we no longer support. + * progmodes/ada-xref.el (ada-xref-current): Remove mention of VMS, + and fix a FIXME, using convert-standard-filename in place of + removed ada-convert-file-name. + +2014-08-07 Eli Zaretskii + + * files.el (auto-mode-alist): Remove support for VMS from a + pattern. + +2014-08-07 Reuben Thomas + + Refer to MS-DOS using the same name everywhere. + + * arc-mode.el: Fix a couple of ``MS-DOG''s missed in the previous + commit. + * file-mode.el: ditto. + +2014-08-07 Reuben Thomas + + Refer to MS-DOS using the same name everywhere. + + * arc-mode.el: ``MS-DOG'', ``MSDOG'' and ``msdog'' become + ``MS-DOS''. + * frame.el: ditto. + +2014-08-07 Michael Albinus + + * net/tramp-sh.el (tramp-do-copy-or-rename-file-out-of-band): + Use cached "remote-copy-args" value, if available. (Bug#18199) + +2014-08-07 Leo Liu + + * help.el (temp-buffer-setup-hook,temp-buffer-show-hook): Revert + change on 2014-03-22. + +2014-08-06 Ulf Jasper + + * calendar/icalendar.el (icalendar--diarytime-to-isotime) + (icalendar--convert-ordinary-to-ical): Allow for missing minutes + (Bug#13750). + + +2014-08-05 Lars Magne Ingebrigtsen + + * image-mode.el (image-toggle-display-image): Always rescale images + to not be bigger than the current window. + +2014-08-05 Eric Brown (tiny change) + + * net/eww.el (eww-bookmarks-directory): New variable. + (eww-write-bookmarks): Use it. + (eww-read-bookmarks): Ditto. + +2014-08-05 Lars Magne Ingebrigtsen + + * net/shr.el (shr-copy-url): Also copy the image URL. + +2014-08-05 Michael Albinus + + * net/tramp-cache.el (tramp-flush-file-function): Suppress function + also for Tramp working buffers. + +2014-08-04 Fabián Ezequiel Gallina + + * progmodes/python.el: Fix completions inside (i)pdb. + (python-shell-completion-pdb-string-code): Make obsolete. + (python-shell-completion-get-completions): Use + python-shell-completion-string-code resending setup code + continuously for (i)pdb. + +2014-08-04 Paul Eggert + + * rect.el (rectangle--default-line-number-format): Rename + from misspelled rectange--default-line-number-format (Bug#18045). + All uses changed. + +2014-08-03 Paul Eggert + + Don't mishandle year-9999 dates (Bug#18176). + * calendar/parse-time.el (parse-time-rules): + Allow years up to most-positive-fixnum. + * calendar/time-date.el (date-to-time): + Pass "Specified time is not representable" errors through. + +2014-08-02 Fabián Ezequiel Gallina + + * progmodes/python.el: Completion code cleanups. + (python-shell-completion-get-completions): Detect and send import + statements directly to completion function. + (python-shell-completion-at-point): Simplify prompt calculation + and import vs input completion logic. + +2014-08-02 Alan Mackenzie + + Fix confusion in C++ file caused by comma in "= {1,2},". Bug + #17756. + * progmodes/cc-engine.el (c-beginning-of-statement-1): In checking + for a statement boundary marked by "}", check there's no "=" + before the "{". + (c-guess-basic-syntax CASE 9B): Call c-beginning-of-statement with + non-nil `comma-delim' argument. + * progmodes/cc-fonts.el (c-font-lock-declarators): Parse an + initializer expression more accurately. + + Correct loop termination condition in c-syntactic-skip-backward. + * progmodes/cc-engine.el (c-syntactic-skip-backward): Correct for + the situation where, after moving back out of a literal, + skip-chars-backward doesn't move further, yet checks have still to + be done. + +2014-08-01 Eli Zaretskii * tutorial.el (tutorial--display-changes): Accept punctuation characters before the key binding. (Bug#18146) @@@ -461,10 -134,14 +499,10 @@@ (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. + * 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) diff --cc src/ChangeLog index 0bc8a712112,92d90accc60..aa2f95907eb --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,111 -1,48 +1,141 @@@ + 2014-08-11 Glenn Morris + + * fileio.c: Revert 2013-01-31 change, which chose coding system for + writing before backing up, since it causes a more serious problem + than the one it solves. (Closes Bug#18141, reopens Bug#13522.) + (choose_write_coding_system): No longer callable from Lisp. + Move last piece back here from Fwrite_region. + (Fwrite_region, syms_of_fileio): Update for above changes. + -2014-08-09 Martin Rudalics - - * window.c (Fwindow_new_total, Fwindow_new_normal) - (Fwindow_new_pixel, Fset_window_new_pixel) - (Fset_window_new_total, Fset_window_new_normal): Second attempt - to fix the doc-strings of these functions. See: - http://lists.gnu.org/archive/html/bug-gnu-emacs/2014-08/msg00287.html - -2014-08-08 Martin Rudalics ++2014-08-11 Martin Rudalics + + * window.c (Fwindow_valid_p): Fix doc-string (Bug#18194). + (Fwindow_new_total, Fwindow_normal_size, Fwindow_new_normal) + (Fwindow_new_pixel, Fset_window_new_pixel) + (Fset_window_new_total, Fset_window_new_normal) + (Fwindow_resize_apply): Fix doc-strings (see Bug#18112). ++ See also: ++ http://lists.gnu.org/archive/html/bug-gnu-emacs/2014-08/msg00287.html + -2014-08-07 Eli Zaretskii ++2014-08-11 Eli Zaretskii + + * fontset.c (Finternal_char_font): Recompute basic faces if the + frame's face cache was cleared. (Bug#18162) + -2014-08-05 Dmitry Antipov ++2014-08-11 Dmitry Antipov + + Fix bug with uninitialized undo list of an indirect buffer (Bug#18180). + * buffer.c (Fmake_indirect_buffer): Initialize undo list with the + base buffer's undo list. + -2014-08-03 Dmitry Antipov - - Fix bug with an attempt to select uninitialized frame (Bug#18161). - * xfns.c (Fx_create_frame): Move call to change_frame_size to - a section where Lisp evaluation is disabled. This way a pointer - to uninitialized frame is not accessible from Lisp, which becomes - critical if following call to x_figure_window_size throws an error. - -2014-08-02 Paul Eggert +2014-08-10 Reuben Thomas + + Fix a couple of recent inadvertent breaks of the MSDOS port. + * msdos.c: include required menu.h + * term.c: set correct menu_show_hook on MSDOS. + +2014-08-10 Martin Rudalics + + Fix handling of menu bar line on TTY frames (Bug#18136) + (Bug#18196). + * dispnew.c (handle_window_change_signal): + * keyboard.c (Fsuspend_emacs): Call change_frame_size with + frame's menu bar lines subtracted from height. + * frame.c (frame_inhibit_resize): Inhibit resizing of TTY + frames. + (adjust_frame_size): Count in menu bar when setting FrameRows. + (make_terminal_frame): When setting up the frame's lines and + text height don't count in the menu bar. + (Fmake_terminal_frame): Call adjust_frame_size with menu bar + lines subtracted from height. + (do_switch_frame): Set tty's FrameRows to number of total lines + of frame. + (Fframe_pixel_height, Fframe_pixel_width): If no window system + is used, return total number of lines and columns. + * menu.c (emulate_dialog_with_menu): Use FRAME_TOTAL_LINES instead + of FRAME_LINES. + * term.c (OUTPUT, tty_set_terminal_modes) + (tty_set_terminal_window, tty_set_scroll_region) + (tty_clear_to_end, tty_write_glyphs, tty_write_glyphs_with_face) + (tty_ins_del_lines, tty_menu_display, tty_menu_activate): Use + FRAME_TOTAL_LINES instead of FRAME_LINES. + (Fresume_tty): Use FRAME_TOTAL_LINES instead of FRAME_LINES. + Call change_frame_size with frame's menu bar lines subtracted + from height. + * w32console.c (w32con_clear_to_end, w32con_clear_frame) + (w32con_ins_del_lines): Use FRAME_TOTAL_LINES instead of + FRAME_LINES. + +2014-08-09 Reuben Thomas + + * alloc.c (Fmemory_info): Remove a stray brace. + * process.c: Fix a comment typo. + * msdos.c: + * dosfns.c (init_dosfns): Remove support for DJGPP < 2.02. + +2014-08-09 Jan Djärv + + * widgetprv.h (EmacsFramePart): Remove font. + + * widget.c (DEFAULT_FACE_FONT, EmacsFrameSetValues, setup_frame_gcs) + (resources, setup_frame_cursor_bits): Remove unused variables and + functions, esp. wrt. font (Bug#18227). + +2014-08-07 Paul Eggert + + * xterm.c (x_delete_terminal): Plug file descriptor leak (Bug#17691). + +2014-08-07 Reuben Thomas + + Refer to MS-DOS using the same name everywhere. + + * editfns.c: Fix a couple of ``MS-DOG''s missed in the previous + commit. + * xfaces.c: ditto. + +2014-08-05 Martin Rudalics + + * w32term.c (w32_redeem_scroll_bar): + * xterm.c (XTredeem_scroll_bar): Revert part of last change by + not redeeming scroll bars that have been turned off. + +2014-08-05 Dmitry Antipov + + * keyboard.c (safe_run_hooks): Follow the convenient style to bind + inhibit-quit to t and pass 2 args to safe_run_hook_funcall. See + . + (safe_run_hook_funcall): Adjust accordingly. + +2014-08-04 Martin Rudalics + + * frame.h (FRAME_HAS_HORIZONTAL_SCROLL_BARS): Condition + correctly according to toolkit used. + * frame.c (make_initial_frame, make_terminal_frame) + (x_set_horizontal_scroll_bars, x_set_scroll_bar_height) + (Vdefault_frame_horizontal_scroll_bars): Correctly condition + assignments according to presence of toolkit scrollbars. + * window.h (WINDOW_HAS_HORIZONTAL_SCROLL_BAR): Condition + correctly according to toolkit used. + * window.c (set_window_scroll_bars): Set horizontal scroll bar + only if toolkit supports it. + * w32term.c (w32_redeem_scroll_bar): Always redeem scroll bar if + present. + * xterm.c (x_scroll_bar_create): Initialize horizontal slot for + non-toolkit builds. + (XTredeem_scroll_bar): Always redeem scroll bar if present. + +2014-08-04 Dmitry Antipov + + * keyboard.c (safe_run_hook_funcall): Avoid consing around + Vinhibit_quit and prefer internal_condition_case_n to pass args. + (safe_run_hooks_error, safe_run_hooks_1): Adjust accordingly. + (safe_run_hooks): Remove comment which is not relevant any more. + +2014-08-03 Paul Eggert + + Don't let big frames overrun the stack. + * dispnew.c (mirrored_line_dance, mirror_line_dance, scrolling): + Use SAFE_NALLOCA, not alloca. Fix bug with clang + directory_files_internal + GC (Bug#16986). * dired.c (directory_files_internal): Use a volatile variable diff --cc src/fileio.c index f0bd75b170e,261928dd821..d9c7397c2de --- a/src/fileio.c +++ b/src/fileio.c @@@ -4803,15 -4802,11 +4796,10 @@@ write_region (Lisp_Object start, Lisp_O We used to make this choice before calling build_annotations, but that leads to problems when a write-annotate-function takes care of unsavable chars (as was the case with X-Symbol). */ - Vlast_coding_system_used = - Fchoose_write_coding_system (start, end, filename, - append, visit, lockname); - - setup_coding_system (Vlast_coding_system_used, &coding); - - if (!STRINGP (start) && !NILP (BVAR (current_buffer, selective_display))) - coding.mode |= CODING_MODE_SELECTIVE_DISPLAY; + Vlast_coding_system_used + = choose_write_coding_system (start, end, filename, + append, visit, lockname, &coding); -#ifdef CLASH_DETECTION if (open_and_close_file && !auto_saving) { lock_file (lockname); diff --cc test/ChangeLog index 5cae39dba87,d5c5e58f09c..2de81475e88 --- a/test/ChangeLog +++ b/test/ChangeLog @@@ -1,21 -1,12 +1,27 @@@ + 2014-08-11 Glenn Morris + + * automated/data/files-bug18141.el.gz: New file. + * automated/files.el (files-test-bug-18141-file): + New variable and test. (Bug#18141) + +2014-08-10 Ulf Jasper + + Enumerate evaluated sexp diary entries (Bug#7911). + * automated/icalendar-tests.el (icalendar--convert-anniversary-to-ical) + (icalendar--convert-cyclic-to-ical, icalendar--convert-block-to-ical) + (icalendar--convert-yearly-to-ical, icalendar--convert-weekly-to-ical) + (icalendar--convert-ordinary-to-ical): Returns cons cell now. + (icalendar--convert-to-ical, icalendar--convert-sexp-to-ical): + New tests. + 2014-08-07 Glenn Morris - * automated/Makefile.in (check-tar): Remove, no longer needed. + * automated/Makefile.in (check-tar): Remove, hydra recipe does it now. + +2014-08-06 Ulf Jasper + + * automated/icalendar-tests.el (icalendar--convert-ordinary-to-ical) + (icalendar--diarytime-to-isotime): More testcases (Bug#13750). 2014-08-03 Glenn Morris