From: Paul Eggert Date: Sat, 9 Apr 2011 18:42:31 +0000 (-0700) Subject: Merge from mainline. X-Git-Tag: emacs-pretest-24.0.90~104^2~275^2~356^2~18 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=762f8d96719ba3e8a0e79d8bb99fe8e119fafb3a;p=emacs.git Merge from mainline. --- 762f8d96719ba3e8a0e79d8bb99fe8e119fafb3a diff --cc ChangeLog index ea5b106a895,b1d1d65c667..b766dbed7dd --- a/ChangeLog +++ b/ChangeLog @@@ -1,7 -1,7 +1,11 @@@ - 2011-04-08 Paul Eggert ++2011-04-09 Paul Eggert + + * lib/allocator.c: New file, automatically generated by gnulib. + + 2011-04-07 Glenn Morris + + * autogen/update_autogen: Ignore comment diffs in ldefs-boot.el. + 2011-04-06 Eli Zaretskii * lib/makefile.w32-in ($(BLD)/careadlinkat.$(O), GNULIBOBJS): diff --cc lisp/ChangeLog index a526ca900a7,8d705cdaed6..62dd255cabe --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,8 -1,117 +1,122 @@@ - 2011-04-07 Paul Eggert ++2011-04-09 Paul Eggert + + Remove the doprnt implementation, as Emacs now uses vsnprintf. + * emacs-lisp/find-gc.el (find-gc-source-files): Remove doprnt.c. + + 2011-04-08 Sho Nakatani + + * doc-view.el (doc-view-fit-width-to-window) + (doc-view-fit-height-to-window, doc-view-fit-page-to-window): New + functions for fitting the shown image to the Emacs window size. + (doc-view-mode-map): Add bindings for the new functions. + + 2011-03-24 Juanma Barranquero + + * vc-annotate.el (vc-annotate-show-log-revision-at-line): + Fix typo in docstring. + + 2011-04-08 Eli Zaretskii + + * files.el (file-size-human-readable): Produce one digit after + decimal, like "ls -lh" does. + + * ls-lisp.el (ls-lisp-format-file-size): Allow for 7 characters in + the file size representation. + + * simple.el (list-processes): If async subprocesses are not + available, error out with a clear error message. + + 2011-04-08 Chong Yidong + + * help.el (help-form-show): New function, to be called from C. + Put help-form output in a buffer named differently than *Help*. + + 2011-04-08 Eli Zaretskii + + * files.el (file-size-human-readable): New function. + + * ls-lisp.el (ls-lisp-format-file-size): Use it, instead of + computing the representation inline. Don't require `cl'. + + 2011-04-08 Glenn Morris + + * man.el (Man-page-header-regexp): Solaris < 2.6 no longer supported. + + * net/browse-url.el (browse-url-firefox): + Test system-type, not system-configuration. + + * vc/log-edit.el (log-edit-empty-buffer-p): New function. + (log-edit-insert-cvs-template, log-edit-insert-cvs-rcstemplate): + Use log-edit-empty-buffer-p. (Bug#7598) + + * net/rlogin.el (rlogin-process-connection-type): Simplify. + (rlogin-mode-map): Initialize in the defvar. + (rlogin): Use ignore-errors. + + * replace.el (occur-mode-map): Some fixes for menu items. + + 2011-04-07 Aaron S. Hawley + + * play/morse.el (denato-region): Handle varying case. (Bug#8386) + + 2011-04-06 Chong Yidong + + * emacs-lisp/cconv.el (cconv--analyse-use): Ignore "ignored" when + issuing unused warnings. + + * emacs-lisp/tabulated-list.el (tabulated-list-print): Use lambda + macro directly. + + * simple.el: Lisp reimplement of list-processes. Based on an + earlier reimplementation by Leo Liu, but using tabulated-list.el. + (process-menu-mode): New major mode. + (list-processes--refresh, list-processes): + (process-menu-visit-buffer): New functions. + + * files.el (save-buffers-kill-emacs): Don't assume any return + value of list-processes, which is undocumented anyway. + + 2011-04-06 Chong Yidong + + * emacs-lisp/tabulated-list.el: New file. + + * emacs-lisp/package.el: Use Tabulated List mode. + (package-menu-mode-map): Inherit from tabulated-list-mode-map. + (package-menu-mode): Derive from tabulated-list-mode. Set up the + table format using Tabulated List mode variables. + (package--push): New macro, replacing package-list-maybe-add. + (package-menu--generate): Use package--push. Renamed from + package--generate-package-list. + (package-menu-refresh, list-packages): Use it. + (package-menu--print-info): Renamed from package-print-package. + Return insertion data instead of inserting it directly. + (package-menu-describe-package, package-menu-execute): Use + tabulated-list-get-id. + (package-menu-mark-delete, package-menu-mark-install) + (package-menu-mark-unmark, package-menu-backup-unmark) + (package-menu-mark-obsolete-for-deletion): Use + tabulated-list-put-tag. + (package--list-packages, package-menu-revert) + (package-menu-get-package, package-menu-get-version) + (package-menu-sort-by-column): Functions deleted. + (package-menu-package-list, package-menu-sort-key): Vars deleted. + (package-menu--status-predicate, package-menu--version-predicate) + (package-menu--name-predicate) + (package-menu--description-predicate): Handle arguments in the + Tabulated List format. + (package-list-packages-no-fetch): Call list-packages. + + 2011-04-06 Juanma Barranquero + + * files.el (after-find-file-from-revert-buffer): Remove variable. + (after-find-file): Dont' bind it. + (revert-buffer-in-progress-p): New variable. + (revert-buffer): Bind it. + Pass nil for `after-find-file-from-revert-buffer'. + + * saveplace.el (save-place-find-file-hook): Use new variable + `rever-buffer-in-progress-p', not `after-find-file-from-revert-buffer'. + 2011-04-06 Glenn Morris * Makefile.in (AUTOGEN_VCS): New variable. diff --cc src/ChangeLog index 68f3dbdedcb,e7ea07705af..cd1b74b75f1 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,60 -1,82 +1,135 @@@ - 2011-04-08 Paul Eggert ++2011-04-09 Paul Eggert + + * eval.c: Port to Windows vsnprintf (Bug#8435). + Include . + (SIZE_MAX): Define if the headers do not. + (verror): Do not give up if vsnprintf returns a negative count. + Instead, grow the buffer. This ports to Windows vsnprintf, which + does not conform to C99. Problem reported by Eli Zaretskii. + Also, simplify the allocation scheme, by avoiding the need for + calling realloc, and removing the ALLOCATED variable. + - 2011-04-07 Paul Eggert - + * eval.c (verror): Initial buffer size is 4000 (not 200) bytes. + + Remove the doprnt implementation, as Emacs now uses vsnprintf. + * doprnt.c: Remove. + * lisp.h (doprnt): Remove. + * Makefile.in (base_obj): Remove doprnt.o. + * deps.mk (doprnt.o): Remove. + + error: Print 32- and 64-bit integers portably (Bug#8435). + Without this change, on typical 64-bit hosts error ("...%d...", N) + was used to print both 32- and 64-bit integers N, which relied on + undefined behavior. + * lisp.h, src/m/amdx86-64.h, src/m/ia64.h, src/m/ibms390x.h (pEd): + New macro. + * lisp.h (error, verror): Mark as printf-like functions. + * eval.c (verror): Use vsnprintf, not doprnt, to do the real work. + Report overflow in size calculations when allocating printf buffer. + Do not truncate output string at its first null byte. + * xdisp.c (vmessage): Use vsnprintf, not doprnt, to do the real work. + Truncate the output at a character boundary, since vsnprintf does not + do that. + * charset.c (check_iso_charset_parameter): Convert internal + character to string before calling 'error', since %c now has the + printf meaning. + * coding.c (Fdecode_sjis_char, Fdecode_big5_char): Avoid int + overflow when computing char to be passed to 'error'. Do not + pass Lisp_Object to 'error'; pass the integer instead. + * nsfns.m (Fns_do_applescript): Use int, not long, since it's + formatted with plain %d. + + * eval.c (internal_lisp_condition_case): Don't pass spurious arg. + + * keyboard.c (access_keymap_keyremap): Print func name, not garbage. + - 2011-04-06 Paul Eggert - + * coding.c (Fdecode_sjis_char): Don't assume CODE fits in int. + + * xterm.c (x_catch_errors): Remove duplicate declaration. + + * term.c (maybe_fatal): Mark its 3rd arg as a printf format, too. + + * xdisp.c, lisp.h (message_nolog): Remove; unused. + + 2011-04-09 Chong Yidong + + * ftfont.c (get_adstyle_property, ftfont_pattern_entity): Use + unsigned char, to match FcChar8 type definition. + + * xterm.c (handle_one_xevent): + * xmenu.c (create_and_show_popup_menu): + * xselect.c (x_decline_selection_request) + (x_reply_selection_request): Avoid type-punned deref of X events. + + 2011-04-09 Eli Zaretskii + + Fix some uses of `int' instead of EMACS_INT. + * search.c (string_match_1, fast_string_match) + (fast_c_string_match_ignore_case, fast_string_match_ignore_case) + (scan_buffer, find_next_newline_no_quit) + (find_before_next_newline, search_command, Freplace_match) + (Fmatch_data): Make some `int' variables be EMACS_INT. + + * xdisp.c (display_count_lines): 3rd argument and return value now + EMACS_INT. All callers changed. + (pint2hrstr): Last argument is now EMACS_INT. + + * coding.c (detect_coding_utf_8, detect_coding_emacs_mule) + (detect_coding_iso_2022, detect_coding_sjis, detect_coding_big5) + (detect_coding_ccl, detect_coding_charset, decode_coding_utf_8) + (decode_coding_utf_16, decode_coding_emacs_mule) + (decode_coding_iso_2022, decode_coding_sjis, decode_coding_big5) + (decode_coding_ccl, decode_coding_charset) + : Declare EMACS_INT. + (decode_coding_iso_2022, decode_coding_emacs_mule) + (decode_coding_sjis, decode_coding_big5, decode_coding_charset) + : Declare EMACS_INT. + (encode_coding_utf_8, encode_coding_utf_16) + (encode_coding_emacs_mule, encode_invocation_designation) + (encode_designation_at_bol, encode_coding_iso_2022) + (encode_coding_sjis, encode_coding_big5, encode_coding_ccl) + (encode_coding_raw_text, encode_coding_charset) : + Declare EMACS_INT. + (ASSURE_DESTINATION): Declare more_bytes EMACS_INT. + (encode_invocation_designation): Last argument P_NCHARS is now + EMACS_INT. + (decode_eol): Declare pos_byte, pos, and pos_end EMACS_INT. + (produce_chars): from_nchars and to_nchars are now EMACS_INT. + + * coding.h (struct coding_system) : Declare EMACS_INT. + All users changed. + + * ccl.c (Fccl_execute_on_string): Declare some variables + EMACS_INT. + + 2011-04-08 Samuel Thibault (tiny change) + + * term.c (init_tty): Fix incorrect ifdef placement (Bug#8450). + + 2011-03-19 Christoph Scholtes + + * process.c (Fformat_network_address): Doc fix. + + 2011-04-08 T.V. Raman (tiny change) + + * xml.c (parse_region): Avoid creating spurious whiespace nodes. + + 2011-04-08 Chong Yidong + + * keyboard.c (read_char): Call Lisp function help-form-show, + instead of using internal_with_output_to_temp_buffer. + (Qhelp_form_show): New var. + (syms_of_keyboard): Use DEFSYM macro. + + * print.c (internal_with_output_to_temp_buffer): Function deleted. + + * lisp.h (internal_with_output_to_temp_buffer): Remove prototype. + + 2011-04-06 Chong Yidong + + * process.c (Flist_processes): Removed to Lisp. + (list_processes_1): Deleted. + 2011-04-06 Eli Zaretskii * msdos.c (careadlinkat, careadlinkatcwd): MS-DOS replacements.