From: Glenn Morris Date: Wed, 9 Jul 2014 02:04:12 +0000 (-0700) Subject: Merge from emacs-24; up to 2014-06-19T14:03:45Z!monnier@iro.umontreal.ca X-Git-Tag: emacs-25.0.90~2636^2~53 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=5613a6f6d52bca0018c5777aba67a99f51016a35;p=emacs.git Merge from emacs-24; up to 2014-06-19T14:03:45Z!monnier@iro.umontreal.ca --- 5613a6f6d52bca0018c5777aba67a99f51016a35 diff --cc doc/emacs/ChangeLog index 76d692ae9a6,e2a6b627a19..a9c4995d49b --- a/doc/emacs/ChangeLog +++ b/doc/emacs/ChangeLog @@@ -1,4 -1,9 +1,9 @@@ -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) + -2014-06-29 Glenn Morris +2014-07-03 Glenn Morris * help.texi (Misc Help): * trouble.texi (Checklist): "Online" help doesn't mean what it diff --cc doc/lispref/ChangeLog index cc372b006ed,a3353c66f71..c15bbebbe59 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@@ -1,4 -1,9 +1,9 @@@ -2014-07-08 Stefan Monnier ++2014-07-09 Stefan Monnier + + * debugging.texi (Function Debugging, Debugger Commands): + Update debug-on-entry w.r.t behavior after redefinitions (bug#17902). + -2014-06-29 Glenn Morris +2014-07-03 Glenn Morris * help.texi (Help Functions): "Online" help doesn't mean what it used to any more. diff --cc doc/misc/ChangeLog index 6726007c6d8,84dea26ca32..44c2272a63d --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@@ -1,8 -1,10 +1,14 @@@ -2014-07-04 Stephen Berman ++2014-07-09 Stephen Berman + + * todo-mode.texi (Levels of Organization): Comment out statement + that Emacs recognizes todo files by their extension, since this + feature has been removed due to bug#17482. + -2014-06-29 Glenn Morris +2014-07-03 Michael Albinus + + * trampver.texi: Update release number. + +2014-07-03 Glenn Morris * info.texi, mh-e.texi: "Online help" doesn't mean what it used to any more. diff --cc doc/misc/todo-mode.texi index 2b119f516f2,092137268f7..bb2aea21ac2 --- a/doc/misc/todo-mode.texi +++ b/doc/misc/todo-mode.texi @@@ -158,11 -158,10 +158,10 @@@ you want All todo files reside in a single directory, whose location is specified by the user option @code{todo-directory}. This directory may also contain other types of Todo files, which are discussed later - (@pxref{Todo Archive Mode} and @ref{Todo Filtered Items Mode}). Emacs - recognizes Todo files by their extension, so when you visit the files - the buffer is in the appropriate mode and the current category is - correctly displayed. - -(@pxref{Todo Archive Mode} and @ref{Todo Filtered Items Mode}). ++(@pxref{Todo Archive Mode} and @ref{Todo Filtered Items Mode}). + @c Emacs recognizes Todo files by their extension, so when you visit + @c the files the buffer is in the appropriate mode and the current + @c category is correctly displayed. When you use a Todo mode command to create a todo file, the extension @samp{.todo} is automatically added to the base name you choose (as a rule, this name is also used for the other types of Todo files, which diff --cc etc/TODO index 4c7955c9797,192136b0c29..7aaed300091 --- a/etc/TODO +++ b/etc/TODO @@@ -309,14 -307,9 +307,15 @@@ familiar with GNUstep and Objective C * Other features we would like: +** A more modern printing interface. One that pops up a dialog that lets +you choose printer, page style, etc. +Integration with the Gtk print dialog is apparently difficult. See eg: +http://lists.gnu.org/archive/html/emacs-devel/2009-03/msg00501.html +http://lists.gnu.org/archive/html/emacs-devel/2009-04/msg00034.html + ** Allow frames(terminals) created by emacsclient to inherit their environment from the emacsclient process. + ** Remove the default toggling behavior of minor modes when called from elisp rather than interactively. This a trivial one-liner in easy-mode.el. diff --cc lisp/ChangeLog index 0158ce91aea,0333e366beb..f50993e2131 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,114 -1,71 +1,177 @@@ -2014-07-08 Stefan Monnier ++2014-07-09 Stefan Monnier + + * progmodes/sh-script.el (sh-smie-sh-rules): Don't align with a && in + the middle of a line (bug#17896). + -2014-07-08 Juri Linkov ++2014-07-09 Juri Linkov + + * startup.el (command-line): Append displaying the warning about + the errors in the init file to the end of `after-init-hook'. + (Bug#17927) + -2014-07-08 Juri Linkov - - * faces.el (face-name): Return input arg `face' as is ++ * faces.el (face-name): Return input arg `face' as-is + when it's not a symbol. + (x-resolve-font-name): Don't check if the face is a symbol. + (Bug#17956) + -2014-07-08 Juri Linkov - + * facemenu.el (list-colors-print): In help-echo format use %.2f + instead of %d because now HSV values are floating-point components + between 0.0 and 1.0. + -2014-07-06 Glenn Morris ++2014-07-09 Glenn Morris + + * emulation/cua-rect.el (cua--activate-rectangle): + Avoid setting cua--rectangle to nil. (Bug#17877) + -2014-07-06 Stephen Berman ++2014-07-09 Stephen Berman + + * calendar/todo-mode.el: Fix wrong-type-argument error when + marking multiple consecutive items. + (todo-toggle-mark-item): Don't try to mark the empty lines at the + end of the todo and done items sections. Note in doc string that + items marked by passing a numeric prefix argument can include the + last todo and first done items. + (todo-mark-category): Don't try to mark the empty line between the + todo and done items sections. + -2014-07-05 Stefan Monnier ++2014-07-09 Stefan Monnier + + * emacs-lisp/edebug.el (edebug-eval-defun): Print result using + proper Lisp quoting (bug#17934). + + * progmodes/ruby-mode.el (ruby-mode-variables): Don't meddle with + require-final-newline since prog-mode already took care of it (bug#17947). + -2014-07-04 Stephen Berman ++2014-07-09 Stephen Berman + + * calendar/todo-mode.el: Fix two bugs. Shorten Commentary and + refer to the Todo mode Info manual. Update the comment on + requiring cl-lib. + (todo-find-filtered-items-file): Add todo-prefix overlays. + (todo-filter-items): Reorder a let-bound variable to avoid a + wrong-type-argument error on canceling the file choice dialog. + -2014-07-04 Stefan Monnier ++2014-07-09 Stefan Monnier + + * progmodes/octave.el (inferior-octave-mode): + Set comint-input-ring-size to a number (bug#17912). + -2014-07-03 Juri Linkov ++2014-07-09 Juri Linkov + + * desktop.el (desktop-minor-mode-table): Add `defining-kbd-macro' + and `isearch-mode' associated with nil. (Bug#17849) + -2014-07-02 Juri Linkov +2014-07-08 Stefan Monnier + + * linum.el (linum--face-height): New function (bug#17813). + (linum-update-window): Use it to adjust margin to linum's width. + + * leim/quail/sisheng.el (sisheng-list): Don't bother with-case-table. + * eshell/em-smart.el (eshell-smart-scroll-window): Use + with-selected-window. + + * xt-mouse.el (xterm-mouse-translate-1): Intern drag event (bug#17894). + Remove also pointless window&mark manipulation. + + * progmodes/perl-mode.el: Use syntax-ppss; fix one indentation case. + (perl-indent-line): Use syntax-ppss to detect we're in a doc-section. + (perl-continuation-line-p): Don't skip over anything else than labels. + Return the previous char. + (perl-calculate-indent): Use syntax-ppss instead of parse-start + and update callers accordingly. For continuation lines, check the + the case of array hashes. + (perl-backward-to-noncomment): Make it non-interactive. + (perl-backward-to-start-of-continued-exp): Rewrite. + +2014-07-08 Sam Steingold + + * progmodes/inf-lisp.el (lisp-eval-paragraph, lisp-eval-form-and-next): + New user commands. + +2014-07-08 Juri Linkov + + * vc/vc-annotate.el (vc-annotate-background-mode): New defcustom. + (vc-annotate-color-map): Use less saturated colors (20%) for + background-mode. + (vc-annotate-very-old-color): Add default value for background-mode. + (vc-annotate-background): Set default value to nil since now text on + the default backgrounds should be legible in light and dark modes. + (vc-annotate-lines): Use `vc-annotate-background-mode'. Doc fix. + (Bug#17808) + +2014-07-08 Juri Linkov + + * simple.el (transpose-chars): Don't move point into read-only area. + (Bug#17829) + +2014-07-08 Juri Linkov + + * window.el (with-displayed-buffer-window): New macro. + (with-temp-buffer-window, with-current-buffer-window): + Use `macroexp-let2' to evaluate and bind variables + in the same order as macro arguments. + (display-buffer--action-function-custom-type): + Add `display-buffer-below-selected' and `display-buffer-at-bottom'. + + * minibuffer.el (minibuffer-completion-help): Replace + `with-output-to-temp-buffer' with `with-displayed-buffer-window' + with actions that display *Completions* at-bottom when called + from the minibuffer, or below-selected in a normal buffer. + Associate `window-height' with `fit-window-to-buffer'. + Let-bind `pop-up-windows' to nil. + + * dired.el (dired-mark-pop-up): Use `with-displayed-buffer-window' + instead of `with-current-buffer-window'. (Bug#17809) + +2014-07-07 Luke Lee + + * progmodes/hideif.el (hide-ifdef-env): Change to global. + (hide-ifdef-env-backup): New variable. + (hide-ifdef-expand-reinclusion-protection, hide-ifdef-header-regexp): + New customizable variables. + (hif-clear-all-ifdef-defined): New defun. + (hif-merge-ifdef-region, hide-ifdef-region-internal, hide-ifdef-region) + (hif-show-ifdef-region): Merge hidden regions to prevent continuous "...". + (hif-tokenize): Fix for MS-DOS/Win EOL style. + (hif-endif-to-ifdef, hif-make-range, hif-find-range, hif-possibly-hide): + Fix bug to hide the correct #elif region(s). + (hif-range-elif): New defun. + (hif-recurse-level): New var. + (hif-evaluate-region, hif-evaluate-macro): New defun. + (hide-ifdef-guts): Prevent reinclusion protected C/C++ headers from + fully hidden. + (hide-ifdef-define, hide-ifdefs, hide-ifdef-block, show-ifdef-block): + Better interaction. + +2014-07-04 Michael Albinus + + * net/dbus.el (dbus-peer-handler): New defun. + (dbus-register-service): Register it. (Bug#17858) + (dbus-managed-objects-handler): Fix docstring. + +2014-07-04 Phil Sainty (tiny change) + + * emacs-lisp/lisp.el (narrow-to-defun-include-comments): New var. + (narrow-to-defun): New arg include-comments, defaulting to it + (bug#16328). + +2014-07-03 Stefan Monnier + + * rect.el (rectangle--highlight-for-redisplay): Don't pass `orig' with + different calling convention to rectangle--unhighlight-for-redisplay. + +2014-07-03 Michael Albinus + + * net/tramp.el (tramp-call-process): Handle error strings. + + * net/tramp-adb.el (tramp-adb-sh-fix-ls-output): Use `bolp'. + + * net/tramp-sh.el (tramp-sh-handle-set-visited-file-modtime) + (tramp-sh-handle-verify-visited-file-modtime): Use `point-at-eol'. + + * net/trampver.el: Update release number. + +2014-07-03 Juri Linkov * desktop.el (desktop-save): Rename arg `auto-save' to `only-if-changed'. Doc fix. (Bug#17873) diff --cc src/ChangeLog index 4c4ca3a5e00,d2f1999b546..ba56edda715 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,106 -1,51 +1,140 @@@ -2014-07-08 Eli Zaretskii ++2014-07-09 Eli Zaretskii + + * xdisp.c (move_it_to): Adjust calculation of line_start_x to what + x_produce_glyphs does when it generates a stretch glyph that + represents a TAB. (Bug#17969) + -2014-07-05 Eli Zaretskii - + * xdisp.c (pos_visible_p): If CHARPOS is at beginning of window, + and there is a display property at that position, don't call + move_it_to to move to a position before window start. (Bug#17942) + Fix condition for finding CHARPOS by the first call to move_it_to. + (Bug#17944) + -2014-07-05 Stefan Monnier ++2014-07-09 Stefan Monnier + + * syntax.c (find_defun_start): Try the cache even + if !open_paren_in_column_0_is_defun_start. + (back_comment): If find_defun_start was pessimistic, use the + scan_sexps_forward result to improve the cache (bug#16526). + -2014-07-04 Daniel Colascione - - Backport from trunk. - * xfns.c (create_frame_xic): Pass XNStatusAttributes to XCreateIC - only if xic_style calls for it. This change allows Emacs to work - with ibus. Also, don't leak resources if create_frame_xic fails, - and stop caching xic_style across different displays (Bug#17928). - (supported_xim_styles): Make const. - (best_xim_style): Remove first parameter: it's always just - supported_xim_styles. Change to look at supported_xim_styles directly. - -2014-07-04 Eli Zaretskii ++2014-07-09 Eli Zaretskii + + * xdisp.c (redisplay_window): If redisplay of a window ends up + with point in a partially visible line at end of the window, make + sure the amended position of point actually has smaller Y + coordinate; if not, give up and scroll the display. (Bug#17905) + + * window.c (window_scroll_pixel_based): When point ends up at the + last fully visible line, don't let move_it_to stop at the left + edge of the line and dupe us into thinking point is inside the + scroll margin. + + * w32.c (network_interface_info): Make sure the argument is a + Lisp string. + -2014-07-01 Eli Zaretskii +2014-07-08 Paul Eggert + + * process.c (read_and_dispose_of_process_output): Fix typo + in previous patch: we want nonnegative fds, not nonzero fds. + +2014-07-08 Dmitry Antipov + + * chartab.c (char_table_translate): Move to... + * character.h (char_table_translate): ... inline function here. + Avoid Faref and assume that args are always valid. This helps to + speedup search, which is especially important for a huge buffers. + * lisp.h (char_table_translate): Remove prototype. + + * nsfont.m (nsfont_close): Free glyphs and metrics arrays as well. + * font.c (font_build_object) [HAVE_XFT || HAVE_FREETYPE || HAVE_NS]: + New function, with an intention to avoid code duplication between + a few font drivers. + * font.h (font_build_object) [HAVE_XFT || HAVE_FREETYPE || HAVE_NS]: + Add prototype. + * ftfont.c (ftfont_open): + * macfont.m (macfont_open): + * xftfont.c (xftfont_open): Use it. + +2014-07-08 Paul Eggert + + * process.c: Add sanity checks for file descriptors (Bug#17844). + (wait_reading_process_output, Fprocess_filter_multibyte_p): + Check that infd is nonnegative before using it as an fd. + (read_and_dispose_of_process_output, Fprocess_send_eof): + Likewise, for outfd. + (wait_reading_process_output): Omit unnecessary check of infd. + +2014-07-07 Paul Eggert + + Minor fixups related to usage of the 'long' type. + * gnutls.c (emacs_gnutls_handshake): + * xfaces.c (dump_realized_face): + Work even if 'long' is narrower than 'void *'. + * termcap.c (scan_file): + * xselect.c (x_decline_selection_request) + (x_reply_selection_request, x_get_window_property): + * xterm.c (x_set_frame_alpha): + Remove unnecessary 'L' suffixes of integer constants. + * xfns.c (hack_wm_protocols): + * xselect.c (x_fill_property_data): + * xterm.c (x_set_offset, x_set_window_size_1, x_make_frame_invisible): + Remove unnecessary casts to 'long'. + (set_machine_and_pid_properties): Don't assume pid_t fits in 32 bits. + + Minor ImageMagick safety fixes. + * image.c (imagemagick_compute_animated_image): + Remove useless assignment to local. Avoid problems if dest_width is 0. + (imagemagick_load_image): Use int for pixel counts that can't + exceed INT_MAX. Avoid problem if PixelGetNextIteratorRow returns + a row width greater than the image width (or greater than LONG_MAX!). + +2014-07-04 K. Handa + + * coding.c (MIN_CHARBUF_SIZE): Delete it. + (MAX_CHARBUF_EXTRA_SIZE): New macro. + (ALLOC_CONVERSION_WORK_AREA): Use MAX_CHARBUF_EXTRA_SIZE. + +2014-07-04 Dmitry Antipov + + * font.h (struct font_driver): Remove get_outline and free_outline; + not used by any font driver. + * ftfont.c (ftfont_driver): + * macfont.m (macfont_driver): + * nsfont.m (nsfont_driver): + * w32font.c (w32font_driver): + * w32uniscribe.c (uniscribe_font_driver): + * xfont.c (xfont_driver): Related users changed. + * xselect.c (x_get_window_property): Use convenient xmalloc. + Call to xfree only if some data was really allocated. + +2014-07-03 Dmitry Antipov + + On MS-Windows, display busy cursor on all GUI frames. + This is similar to what we have on X. Quickly tested by Dani Moncayo. + * w32fns.c (toplevel): Remove hourglass_hwnd; no longer used. + (w32_show_hourglass, w32_hide_hourglass, w32_note_current_window): + Likewise. + (hide_hourglass, show_hourglass): Redesign to match X counterparts. + * xdisp.c (start_hourglass): Remove Windows-specific bits. + +2014-07-03 Dmitry Antipov + + Use convenient alists to manage per-frame font driver-specific data. + * frame.h (struct frame): Rename font_data_list to... + [HAVE_XFT || HAVE_FREETYPE]: ... font_data, which is a Lisp_Object now. + * font.h (struct font_data_list): Remove; no longer need a special + data type. + (font_put_frame_data, font_get_frame_data) [HAVE_XFT || HAVE_FREETYPE]: + Adjust prototypes. + * font.c (font_put_frame_data, font_get_frame_data) + [HAVE_XFT || HAVE_FREETYPE]: Prefer alist functions to ad-hoc list + management. + * xftfont.c (xftfont_get_xft_draw, xftfont_end_for_frame): + Related users changed. + * ftxfont.c (ftxfont_get_gcs, ftxfont_end_for_frame): Likewise. + Prefer convenient xmalloc and xfree. + +2014-07-03 Eli Zaretskii * dispnew.c (prepare_desired_row): Accept 2 additional arguments: the window whose glyph row is being prepared and a flag whether it