From: Kenichi Handa Date: Sat, 29 Jun 2013 03:31:15 +0000 (+0900) Subject: merge trunk X-Git-Tag: emacs-24.3.90~173^2^2~42^2~45^2~387^2~1992 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=2ed909207ee7afb93284d113526071e83fc1a5c1;p=emacs.git merge trunk --- 2ed909207ee7afb93284d113526071e83fc1a5c1 diff --cc lisp/ChangeLog index 7c36b240175,e8342f7d508..826f270d8f8 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,20 -1,250 +1,267 @@@ +2013-06-28 Kenichi Handa + + * international/mule.el (define-coding-system): New coding system + properties :inhibit-null-byte-detection, + :inhibit-iso-escape-detection, and :prefer-utf-8. + (set-buffer-file-coding-system): If :charset-list property of + CODING-SYSTEM is `emacs', do not check if CODING-SYSTEM is + appropriate for setting. + + * international/mule-cmds.el (select-safe-coding-system): If + DEFAULT-CODING-SYSTEM is prefer-utf-8 and the buffer contains + multibyte characters, return utf-8 (or one of it's siblings). + + * international/mule-conf.el (prefer-utf-8): New coding system. + (file-coding-system-alist): Use prefer-utf-8 as default for Elisp + files. + + 2013-06-28 Ivan Kanis + + * net/shr.el (shr-render-region): New function. + + * net/eww.el: Autoload `eww-browse-url'. + + 2013-06-27 Dmitry Gutov + + * emacs-lisp/package-x.el (package-upload-buffer-internal): Adapt + to `package-desc-version' being a list. Use + `package--ac-desc-version' to retrieve version from a package + archive element. + + 2013-06-27 Juanma Barranquero + + New experimental feature to save&restore window and frame setup. + * desktop.el (desktop-save-windows): New defcustom. + (desktop--saved-states): New var. + (desktop--excluded-frame-parameters): New defconst. + (desktop--filter-frame-parms, desktop--find-frame-in-display) + (desktop--restore-windows, desktop--save-windows): New functions. + (desktop-save): Call `desktop--save-windows'. + (desktop-read): Call `desktop--restore-windows'. + + 2013-06-27 Lars Magne Ingebrigtsen + + * net/shr.el (add-face-text-property): Removed compat definition. + + 2013-06-27 Stephen Berman + + * info.el (Info-try-follow-nearest-node): Move search for footnote + above search for node name to prevent missing a footnote (bug#14717). + + 2013-06-27 Stephen Berman + + * obsolete/otodo-mode.el: Add obsolescence info to file header. + + 2013-06-27 Leo Liu + + * net/eww.el (eww-read-bookmarks): Check file size. + + 2013-06-26 Stefan Monnier + + * emacs-lisp/nadvice.el (advice--defalias-fset): Move advice back to + advice--pending if newdef is nil or an autoload (bug#13820). + (advice-mapc): New function. + + 2013-06-26 Lars Magne Ingebrigtsen + + * net/eww.el (eww-mode): Undo isn't necessary in eww buffers, + probably. + (eww-mode-map): Add a menu bar. + (eww-add-bookmark): New command. + (eww-bookmark-mode): New mode and commands. + (eww-add-bookmark): Remove newlines from the title. + (eww-bookmark-browse): Don't bug out if it's the only window. + + 2013-06-26 Glenn Morris + + * htmlfontify.el (hfy-triplet): Handle unspecified-fg, bg. + (hfy-size): Handle ttys. (Bug#14668) + + * info-xref.el: Update for Texinfo 5 change in *note format. + (info-xref-node-re, info-xref-note-re): New constants. + (info-xref-check-buffer): Use info-xref-note-re. + + 2013-06-26 Stefan Monnier + + * simple.el (set-variable): Use read-from-minibuffer (bug#14710). + + * emacs-lisp/package.el (package--add-to-archive-contents): Add missing + nil terminate the loop (bug#14718). + + 2013-06-25 Lars Magne Ingebrigtsen + + * net/eww.el: Rework history traversal. When going forward/back, + put these actions into the history, too, so that they can be + replayed. + (eww-render): Move the history reset to the correct buffer. + + 2013-06-25 Juri Linkov + + * files-x.el (modify-dir-local-variable): Change the header comment + in the file with directory local variables. (Bug#14692) + + * files-x.el (read-file-local-variable-value): Add `default'. + (Bug#14710) + + 2013-06-25 Lars Magne Ingebrigtsen + + * net/eww.el (eww-make-unique-file-name): Create a unique file + name before saving to entering `y' accidentally asynchronously. + + 2013-06-25 Ivan Kanis + + * net/eww.el (eww-download): New command and keystroke. + + 2013-06-25 Lars Magne Ingebrigtsen + + * net/eww.el (eww-copy-page-url): Change name of command. + + * net/shr.el (shr-map): Change `shr-copy-url' from `u' to `w' to + be more consistent with Info and dired. + + * net/eww.el (eww-mode-map): Ditto. + + 2013-06-25 Stefan Monnier + + * emacs-lisp/package.el: Use lexical-binding. Include obsolete + packages from archives. + (package-archive-contents): Change format; include obsolete packages. + (package-desc): Use `dir' to mark builtin packages. + (package--from-builtin): Set the `dir' field to `builtin'. + (generated-autoload-file, version-control): Declare. + (package-compute-transaction): Change first arg and return value to be + lists of package-descs. Adjust to new package-archive-contents format. + (package--add-to-archive-contents): Adjust to new + package-archive-contents format. + (package-download-transaction): Arg is now a list of package-descs. + (package-install): If `pkg' is a package name, pass it as + a requirement, so it is subject to the usual (e.g. disabled) checks. + (describe-package): Accept package-desc as well. + (describe-package-1): Describe a specific package-desc. Add links to + other package-descs for the same package name. + (package-menu-describe-package): Pass the actual package-desc. + (package-menu-mode): Add to tabulated-list-revert-hook so revert-buffer + works correctly. + (package-desc-status): New function. + (package-menu--refresh): New function, extracted + from package-menu--generate. + (package-menu--generate): Use it. + (package-delete): Update package-alist. + (package-menu-execute): Don't call package-initialize. + + * progmodes/idlw-toolbar.el, progmodes/idlw-shell.el, + progmodes/idlw-help.el, progmodes/idlw-complete-structtag.el, + progmodes/ebnf-yac.el, progmodes/ebnf-otz.el, progmodes/ebnf-iso.el, + progmodes/ebnf-ebx.el, progmodes/ebnf-dtd.el, progmodes/ebnf-bnf.el, + progmodes/ebnf-abn.el, emacs-lisp/package-x.el, emacs-lisp/cl-seq.el, + emacs-lisp/cl-macs.el: Neuter the "Version:" header. + + 2013-06-25 Martin Rudalics + + * window.el (window--state-get-1): Workaround for bug#14527. + http://lists.gnu.org/archive/html/emacs-devel/2013-06/msg00941.html + + 2013-06-25 Lars Magne Ingebrigtsen + + * net/eww.el (eww-back-url): Implement the history by stashing all + the data into a list. + (eww-forward-url): Allow going forward in the history, too. + + 2013-06-25 Stefan Monnier + + * files-x.el (read-file-local-variable-value): Use read-from-minibuffer + for values and use read--expression for expressions (bug#14710). + (read-file-local-variable): Avoid setq. + (read-file-local-variable-mode): Use minor-mode-list. + + 2013-06-25 Rüdiger Sonderfeld + + * lisp/textmodes/bibtex.el (bibtex-generate-url-list): Add support + for DOI URLs. + + 2013-06-25 Rüdiger Sonderfeld + + * lisp/textmodes/bibtex.el (bibtex-mode, bibtex-set-dialect): + Update imenu-support when dialect changes. + + 2013-06-25 Leo Liu + + * ido.el (ido-read-internal): Allow forward slash on windows. + + 2013-06-24 Lars Magne Ingebrigtsen + + * net/eww.el (eww): Start of strings is \\`, not ^. + + 2013-06-24 Ivan Kanis + + * net/shr.el (shr-browse-url): Fix interactive spec. + + * net/eww.el (eww): Add a trailing slash to domain names. + + 2013-06-24 Juanma Barranquero + + * faces.el (face-spec-recalc): Revert part of 2013-06-23T20:29:18Z!lekktu@gmail.com (bug#14705). + + 2013-06-24 Lars Magne Ingebrigtsen + + * net/shr.el (shr-browse-url): Use an external browser if given a + prefix. + + * net/eww.el (eww-external-browser): Move to shr. + + 2013-06-24 Ivan Kanis + + * net/eww.el (eww): Work more correctly for file: URLs. + (eww-detect-charset): Allow quoted charsets. + (eww-yank-page-url): New command and keystroke. + + 2013-06-24 Daiki Ueno + + * epg.el (epg-make-context): Check if PROTOCOL is valid; embed the + file name of gpg executable. + (epg-context-program): New function. + (epg-context-home-directory): New function. + (epg-context-set-program): New function. + (epg-context-set-home-directory): New function. + (epg--start): Use `epg-context-program' instead of + 'epg-gpg-program'. + (epg--list-keys-1): Likewise. + + 2013-06-24 Leo Liu + + * ido.el (ido-read-internal): Fix bug#14620. + + 2013-06-23 Juanma Barranquero + + * faces.el (face-documentation): Simplify. + (read-face-attribute, tty-find-type, x-resolve-font-name): + Use `string-match-p'. + (list-faces-display): Use `string-match-p'. Simplify. + (face-spec-recalc): Check face to avoid face alias loops. + (read-color): Use `string-match-p' and non-capturing parenthesis. + + 2013-06-23 Lars Magne Ingebrigtsen + + * net/shr.el (shr-rescale-image): Use the new + :max-width/:max-height functionality. + + 2013-06-23 Ivan Kanis + + * net/eww.el (eww-search-prefix): New variable. + (eww): Use it. + (eww-external-browser): New variable. + (eww-mode-map): New keystroke. + (eww-browse-with-external-browser): New command. + + * net/eww.el: Bind `C-c C-c' to "submit" in all form keymaps. + + 2013-06-23 Juanma Barranquero + + * emacs-lisp/tabulated-list.el (tabulated-list-init-header): + Don't skip aligning the next header field when padding is 0; + otherwise, field width is not respected unless the title is as + wide as the field. + 2013-06-22 Stefan Monnier * emacs-lisp/package.el (package-el-version): Remove. diff --cc src/ChangeLog index 9c5bb381bfe,e404cdbdb9f..b279f42e6b6 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,22 -1,96 +1,115 @@@ +2013-06-28 Kenichi Handa + + * coding.h (define_coding_undecided_arg_index): New enum. + (coding_attr_index): New members + coding_attr_undecided_inhibit_null_byte_detection, + coding_attr_undecided_inhibit_iso_escape_detection, + coding_attr_undecided_prefer_utf_8. + (undecided_spec): New struct. + (struct coding_system): New member `undecied' of the member + `spec'. + + * coding.c (setup_coding_system): Handle CODING->spec.undecided. + (detect_coding): Likewise. + (detect_coding_system): Likewise. + (Fdefine_coding_system_internal): New coding system properties + :inhibit-null-byte-detection, :inhibit-iso-escape-detection, and + :prefer-utf-8. + (syms_of_coding): Adjusted for coding_arg_undecided_max. + + 2013-06-28 Paul Eggert + + * image.c (x_from_xcolors): Remove unused local. + + 2013-06-28 YAMAMOTO Mitsuharu + + Defer image data transfer between X client and server until actual + display happens. + + * dispextern.h (struct image) [HAVE_X_WINDOWS]: New members `ximg' + and `mask_img'. + + * image.c (Destroy_Image): Remove. + (x_clear_image_1): New arg `flags' instead of 3 bools `pixmap_p', + `mask_p', and `colors_p'. All uses changed. + (x_clear_image_1) [HAVE_X_WINDOWS]: Destroy `ximg' and `mask_img'. + (CLEAR_IMAGE_PIXMAP, CLEAR_IMAGE_MASK, CLEAR_IMAGE_COLORS): New + macros for `flags' arg to x_clear_image_1. + (postprocess_image, xpm_load_image, x_build_heuristic_mask) + (png_load_body): Use x_clear_image_1 instead of Free_Pixmap. + (ZPixmap, XGetImage) [HAVE_NS]: Remove. + (image_get_x_image_or_dc, image_unget_x_image_or_dc) + (image_get_x_image, image_unget_x_image): New functions or macros. + (image_background, image_background_transparent, x_to_xcolors) + (x_build_heuristic_mask): Use image_get_x_image_or_dc instead of + XGetImage or CreateCompatibleDC. Use image_unget_x_image_or_dc + instead of Destroy_Image. + (image_create_x_image_and_pixmap, image_put_x_image): New functions. + (xpm_load_image, x_from_xcolors, x_build_heuristic_mask, pbm_load) + (png_load_body, jpeg_load_body, tiff_load, gif_load) + (imagemagick_load_image, svg_load_image): Use them instead of + x_create_x_image_and_pixmap, and x_put_x_image followed by + x_destroy_x_image, respectively. + (xpm_load) [HAVE_XPM && !HAVE_NTGUI]: Use XpmReadFileToImage and + XpmCreateImageFromBuffer instead of XpmReadFileToPixmap and + XpmCreatePixmapFromBuffer. Create pixmaps. Fill background and + background_transparent fields. + (image_sync_to_pixmaps) [HAVE_X_WINDOWS]: New function. + (prepare_image_for_display, x_disable_image) [HAVE_X_WINDOWS]: Use it. + + 2013-06-27 Paul Eggert + + Do not tickle glib SIGCHLD handling if Cygwin (Bug#14569). + This mostly consists of undoing recent changes. + * callproc.c (Fcall_process): + * process.c (create_process): + Do not worry about catching SIGCHLD here, undoing previous change. + * nsterm.m (ns_term_init): Re-catch SIGCHLD, undoing previous change. + * process.c, process.h (catch_child_signal): + No longer extern if !NS_IMPL_GNUSTEP, undoing 06-22 change. + * process.c (catch_child_handler): Don't worry about being called + lazily and do not assume caller has blocked SIGCHLD, undoing + previous change. Move first-time stuff back to + init_process_emacs, undoing 06-22 change. If CYGWIN, do not + tickle glib, as that causes Cygwin bootstrap to fail. Do not + set lib_child_handler if it's already initialized, which may + help avoid problems on GNUStep. + + 2013-06-23 Paul Eggert + + A more-conservative workaround for Cygwin SIGCHLD issues (Bug#14569). + * callproc.c (Fcall_process): + * process.c (create_process): + Make sure SIGCHLD is caught before we fork, + since Emacs startup no arranges to catch SIGCHLD. + * process.c (lib_child_handler): Initialize to null, not to + dummy_handler. + (catch_child_signal): Allow self to be called lazily. + Do nothing if it's already been called. + Assume caller has blocked SIGCHLD (all callers do now). + * emacs.c (main): Do not catch SIGCHLD here; defer it until + just before it's really needed. + * nsterm.m (ns_term_init): No need to re-catch SIGCHLD here, + since it hasn't been caught yet. + + 2013-06-23 Lars Magne Ingebrigtsen + + * image.c (compute_image_size): New function to implement + :max-width and :max-height. + (imagemagick_load_image): Use it. + + 2013-06-23 Paul Eggert + + Try to avoid malloc SEGVs on Cygwin (Bug#14569). + * callproc.c, process.h (block_child_signal, unblock_child_signal): + Now extern. + * emacs.c (main): Catch SIGCHLD just before initializing gfilenotify. + * process.c (catch_child_signal): Block SIGCHLD while futzing with + the SIGCHLD handler, since the code is not atomic and (due to glib) + signals may be arriving now. + * sysdep.c (init_signals): Do not catch child signals here; + 'main' now does that later, at a safer time. + 2013-06-22 Paul Eggert Clean up SIGCHLD handling a bit (Bug#14569). diff --cc test/ChangeLog index 4bc099e02ad,b884c43b858..9ccb1f4bc89 --- a/test/ChangeLog +++ b/test/ChangeLog @@@ -1,13 -1,43 +1,53 @@@ +2013-06-28 Kenichi Handa + + * automated/decoder-tests.el (decoder-tests-gen-file): New arg FILE. + (decoder-tests-ao-gen-file): Renamed from decoder-tests-filename. + Callers changed. + (decoder-tests-filename): New function. + (decoder-tests-prefer-utf-8-read) + (decoder-tests-prefer-utf-8-write): New function. + (ert-test-decoder-prefer-utf-8): New test. + + 2013-06-27 Dmitry Gutov + + * automated/package-x-test.el: Change the commentary. + (package-x-test--single-archive-entry-1-3) + (package-x-test--single-archive-entry-1-4): Fix the tests, by + using the appropriate data structure. + + 2013-06-27 Daniel Hackney + + * automated/Makefile.in (setwins): Include the 'data' subdirectory. + + * automated/package-x-test.el: New file. + + * automated/package-test.el: New file. + + * automated/data/package: New directory, with test examples. + + 2013-06-27 Glenn Morris + + * automated/python-tests.el (python-tests-with-temp-file): + Clean up after ourself. + + * automated/undo-tests.el (undo-test3): Remove test that seems to + do nothing that the previous one doesn't, except leave a tempfile. + + 2013-06-26 Glenn Morris + + * automated/info-xref.el: New file. + + 2013-06-25 Glenn Morris + + * automated/occur-tests.el (occur-test-create): New function. + Use it to create separate tests for each element, so we run them + all rather than stopping at the first error. + + 2013-06-24 Glenn Morris + + * automated/occur-tests.el (occur-tests): + Update for 2013-05-29 change to occur header line. + 2013-06-21 Eduard Wiebe Test suite for flymake.