aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Remove configure's --without-sync-input option.Paul Eggert2012-09-1624-544/+113
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When auditing signal-handling in preparation for cleaning it up, I found that SYNC_INPUT has race conditions and would be a real pain to fix. Since it's an undocumented and deprecated configure-time option, now seems like a good time to remove it. Also see <http://bugs.gnu.org/11080#16>. * configure.ac (SYNC_INPUT, BROKEN_SA_RESTART): Remove. * admin/CPP-DEFINES (BROKEN_SA_RESTART, SA_RESTART): Remove. * etc/TODO (Make SYNC_INPUT the default): Remove, as the code now behaves as if SYNC_INPUT is always true. * src/alloc.c (_bytes_used, __malloc_extra_blocks, _malloc_internal) (_free_internal) [!DOUG_LEA_MALLOC]: Remove decls. (alloc_mutex) [!SYSTEM_MALLOC && !SYNC_INPUT && HAVE_PTHREAD]: (malloc_hysteresis): (check_depth) [XMALLOC_OVERRUN_CHECK]: (MALLOC_BLOCK_INPUT, MALLOC_UNBLOCK_INPUT): (__malloc_hook, __realloc_hook, __free_hook, BYTES_USED) (dont_register_blocks, bytes_used_when_reconsidered) (bytes_used_when_full, emacs_blocked_free, emacs_blocked_malloc) (emacs_blocked_realloc, reset_malloc_hooks, uninterrupt_malloc): [!SYSTEM_MALLOC && !SYNC_INPUT]: Remove. All uses removed. (MALLOC_BLOCK_INPUT, MALLOC_UNBLOCK_INPUT): Use a different implementation, one that depends on whether the new macro XMALLOC_BLOCK_INPUT_CHECK is defined, not on whether SYNC_INPUT is defined. * src/atimer.c (run_timers, handle_alarm_signal): * src/keyboard.c (pending_signal, poll_for_input_1, poll_for_input) (handle_async_input, process_pending_signals) (handle_input_available_signal, init_keyboard): * src/nsterm.m (ns_read_socket): * src/process.c (wait_reading_process_output): * src/regex.c (immediate_quit, IMMEDIATE_QUIT_CHECK): * src/sysdep.c (emacs_sigaction_init) [SA_RESTART]: (emacs_write): * src/xterm.c (XTread_socket): Assume SYNC_INPUT. * src/conf_post.h (SA_RESTART) [IRIX6_5]: Do not #undef. * src/eval.c (handling_signal): Remove. All uses removed. * src/lisp.h (ELSE_PENDING_SIGNALS): Remove. All uses replaced with the SYNC_INPUT version. (reset_malloc_hooks, uninterrupt_malloc, handling_signal): Remove decls. * src/sysdep.c, src/syssignal.h (main_thread) [FORWARD_SIGNAL_TO_MAIN_THREAD]: Now static. Fixes: debbugs:12450
* * font.c (Ffont_shape_gstring): Remove unused local.Paul Eggert2012-09-162-1/+5
|
* * src/Makefile.in (clean): No longer run nextstep's clean.Glenn Morris2012-09-162-1/+2
|
* (distclean): Remove unnecessary directory deletion.Glenn Morris2012-09-161-1/+0
|
* Add missing nextstep file from previous change.Glenn Morris2012-09-162-2/+2
|
* Increase compartmentalization of Nextstep builds rules,Glenn Morris2012-09-1615-104/+151
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | and store Emacs version number in fewer versioned files. * configure.ac (ns_appsrc): Use relative names. (ns_frag): Remove. (Info-gnustep.plist, Emacs.desktop, Info.plist, InfoPlist.strings) (nextstep/Makefile): Generate these nextstep files. (SUBDIR_MAKEFILES): Add nextstep. * Makefile.in (clean, distclean, bootstrap-clean): Add nextstep. * make-dist (nextstep/templates): Add directory. (nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj): Remove. (nextstep/Cocoa/Emacs.base/Contents) (nextstep/GNUstep/Emacs.base/Resources): Update contents. * .bzrignore: Add some nextstep files. * admin/admin.el (set-version): No more need to set nextstep versions. (set-copyright): Update for moved nextstep files. * nextstep/Makefile.in: New file. * nextstep/templates: New directory. * nextstep/templates/Emacs.desktop.in, nextstep/templates/Info-gnustep.plist.in: * nextstep/templates/Info.plist.in, nextstep/templates/InfoPlist.strings.in: Move here from various Cocoa/, GNUstep/ locations. Let configure set the version number. * nextstep/Cocoa/Emacs.base/Contents/Info.plist: * nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj/InfoPlist.strings: * nextstep/GNUstep/Emacs.base/Resources/Info-gnustep.plist: * nextstep/GNUstep/Emacs.base/Resources/Emacs.desktop: Move to templates/. * nextstep/Cocoa/Emacs.base/Contents/Resources/English.lproj: Remove directory. * src/Makefile.in (ns_appdir, ns_appbindir, ns_appsrc): Remove variables. (ns_frag): Remove. (ns-app): Move here from ns.mk, and simplify. (clean): Simplify nextstep entry. * src/ns.mk: Remove file.
* Fix marker usage in align-areas.Chong Yidong2012-09-172-1/+7
| | | | | | | * align.el (align-areas): Call the indication function with positions instead of markers for arguments. Fixes: debbugs:12343
* merge trunkKenichi Handa2012-09-172-16/+9
|\
| * * files.el (parse-colon-path): Use split-string.Chong Yidong2012-09-162-16/+9
| | | | | | | | Fixes: debbugs:12351
* | font.c (Ffont_shape_gstring): Fix previous change; GLYPHs may not covert the ↵Kenichi Handa2012-09-172-8/+10
|/ | | | last few charactes.
* merge trunkKenichi Handa2012-09-16124-292/+431
|\
| * Window parameter functions again accept any window as argument (Bug#12452).Martin Rudalics2012-09-162-4/+9
| | | | | | | | | | * window.c (Fwindow_parameter, Fset_window_parameter): Accept any window as argument (Bug#12452).
| * Try to fix crashes introduced by 2012-09-10T21:01:[email protected].Jan Djärv2012-09-163-32/+46
| | | | | | | | | | | | | | | | | | | | * nsfns.m (Fx_open_connection): Move initialization of ns_*_types to ns_term_init to avoid memory leak. * nsterm.m (ns_update_begin): Initialize bp after lcokFocus, use explicit retain/release. (ns_term_init): Only allow one display. Initialize outerpool and ns_*_types.
| * Mark display-buffer-function as obsolete.Chong Yidong2012-09-163-0/+5
| | | | | | | | | | | | * lisp/window.el (display-buffer-function): Mark as obsolete. Fixes: debbugs:12166
| * * window.el (special-display-popup-frame): Doc fix.Chong Yidong2012-09-162-2/+4
| | | | | | | | Fixes: debbugs:8853
| * Alter last change to be compatible with Emacs 23.Chong Yidong2012-09-162-7/+19
| | | | | | | | | | | | | | | | | | * lisp/progmodes/compile.el (compilation-parse-errors): Accept list values similar to font-lock-keywords. Suggested by Oleksandr Manzyuk. (compilation-error-regexp-alist): Doc fix. Fixes: debbugs:12136
| * In compilation-error-regexp-alist, allow more HIGHLIGHT types.Chong Yidong2012-09-162-4/+13
| | | | | | | | | | | | | | | | * progmodes/compile.el (compilation-parse-errors): Apply any value that is a valid font-lock-face property. (compilation-error-regexp-alist): Doc fix. Fixes: debbugs:12136
| * Add option to ask bzr itself for the emacs bzr revisionGlenn Morris2012-09-152-34/+63
| | | | | | | | | | * lisp/version.el (emacs-bzr-version-bzr): New function. (emacs-bzr-get-version): Add optional EXTERNAL argument.
| * Auto-commit of loaddefs files.Glenn Morris2012-09-151-1/+1
| |
| * Auto-commit of generated files.Glenn Morris2012-09-152-48/+95
| |
| * Port _setjmp fix to POSIXish hosts as well as Microsoft.Paul Eggert2012-09-154-11/+22
| | | | | | | | | | | | | | | | | | * nt/config.nt: Attempt to sync with autogen/config.in. (HAVE_SIGSETJMP, HAVE__SETJMP): New macros. (_longjmp, _setjmp): Remove. * src/image.c (_setjmp) [!HAVE__SETJMP]: Restore definition, as it's needed on POSIXish hosts that lack _setjmp. Attempt to solve the Microsoft problem in a different way, by altering nt/config.nt.
| * Fix MS-Windows build broken by 2012-09-15T07:06:[email protected], ↵Eli Zaretskii2012-09-1517-18/+35
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | completing fix for bug #12446. src/w32xfns.c: src/w32uniscribe.c: src/w32term.c: src/w32select.c: src/w32reg.c: src/w32proc.c: src/w32menu.c: src/w32inevt.c: src/w32heap.c: src/w32font.c: src/w32fns.c: src/w32console.c: src/w32.c: src/w16select.c: Remove inclusion of setjmp.h, as it is now included by lisp.h. This completes removal of setjmp.h inclusion erroneously announced in the previous commit. src/lisp.h [!HAVE__SETJMP, !HAVE_SIGSETJMP]: Make the commentary more accurate. src/image.c (_setjmp) [!HAVE__SETJMP]: Define only if 'setjmp' is not defined as a macro. The latter happens on MS-Windows.
| * Port better to POSIX hosts lacking _setjmp.Paul Eggert2012-09-15100-144/+132
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * configure.ac (HAVE__SETJMP, HAVE_SIGSETJMP): New symbols. (_setjmp, _longjmp): Remove. * src/lisp.h: Include <setjmp.h> here, since we use its symbols here. All instances of '#include <setjmp.h>' removed, if the only reason for the instance was because "lisp.h" was included. (sys_jmp_buf, sys_setjmp, sys_longjmp): New symbols. Unless otherwise specified, replace all uses of jmp_buf, _setjmp, and _longjmp with the new symbols. Emacs already uses _setjmp if available, so this change affects only POSIXish hosts that have sigsetjmp but not _setjmp, such as some versions of Solaris and Unixware. (Also, POSIX-2008 marks _setjmp as obsolescent.) * src/image.c (_setjmp, _longjmp) [HAVE_PNG && !HAVE__SETJMP]: New macros. (png_load_body) [HAVE_PNG]: (PNG_LONGJMP) [HAVE_PNG && PNG_LIBPNG_VER < 10500]: (PNG_JMPBUF) [HAVE_PNG && PNG_LIBPNG_VER >= 10500]: Use _setjmp and _longjmp rather than sys_setjmp and sys_longjmp, since PNG requires jmp_buf. This is the only exception to the general rule that we now use sys_setjmp and sys_longjmp. This exception is OK since this code does not change the signal mask or longjmp out of a signal handler. Fixes: debbugs:12446
* | merge trunkKenichi Handa2012-09-1510-51/+125
|\|
| * Improve vc-bzr-working-revision for lightweight checkoutsGlenn Morris2012-09-142-4/+15
| | | | | | | | | | | | | | * lisp/vc/vc-bzr.el (vc-bzr-working-revision): For lightweight local checkouts, check the parent dirstate matches the branch. Add "--tree" to "bzr revno" arguments. Don't try to shorten the empty string.
| * Tweak previous emacs-bzr-get-version changeGlenn Morris2012-09-141-1/+1
| |
| * Improve emacs-bzr-version for lightweight checkouts (bug#12441)Glenn Morris2012-09-142-11/+44
| | | | | | | | | | | | | | | | * lisp/version.el (emacs-bzr-version): Doc fix. (emacs-bzr-version-dirstate): New function. (emacs-bzr-get-version): For lightweight checkouts, if the parent is local try and check that it matches the branch. If not, just use dirstate information.
| * * lisp/dired-aux.el (dired-do-chmod): Use `eq' to detect empty input.Juri Linkov2012-09-152-1/+9
| | | | | | | | Fixes: debbugs:12399
| * Fix glitches with 'configure --without-sync-input'.Paul Eggert2012-09-144-1/+10
| | | | | | | | | | | | * configure.ac (--without-sync-input): Fix typo in usage message. * alloc.c [!SYSTEM_MALLOC && !SYNC_INPUT && HAVE_PTHREAD]: Include "syssignal.h", for 'main_thread'.
| * * configure.ac: Port to hosts lacking gtk.Paul Eggert2012-09-142-7/+17
| | | | | | | | | | | | | | | | (PKG_CHECK_MODULES): Capture pkg-config diagnostics better, in particular, problems in invoking pkg-config itself. This is useful on hosts that don't have pkg-config. (GTK_MODULES): Do not exit 'configure' simply because gtk3 and gtk2 are both missing. Problem found on Solaris 8.
| * Avoid out-of-range marker position (Bug#12426).Dmitry Antipov2012-09-142-17/+22
| | | | | | | | | | | | | | * insdel.c (replace_range, replace_range_2): Adjust markers before overlays, as suggested by comments. (insert_1_both, insert_from_buffer_1, adjust_after_replace): Remove redundant check before calling offset_intervals.
| * * lisp/emacs-lisp/advice.el (ad-prognify): Remove, use macroexp-progn.Stefan Monnier2012-09-142-10/+8
| |
* | font.c (Ffont_shape_gstring): Don't adjust grapheme cluster here, but just ↵Kenichi Handa2012-09-152-33/+42
|/ | | | check the validity of glyphs in the glyph-string.
* Auto-commit of generated files.Glenn Morris2012-09-141-5/+1
|
* In Fformat_mode_line always save/restore current buffer. (Bug#12387)Martin Rudalics2012-09-142-4/+7
| | | | | * xdisp.c (Fformat_mode_line): Unconditionally save/restore current buffer. (Bug#12387)
* * lisp/emacs-lisp/edebug.el: Miscellaneous cleanup.Stefan Monnier2012-09-136-309/+180
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Remove obsolete byte-compiler hack that tried to silence some warnings. (edebug-submit-bug-report): Remove. (edebug-get-buffer-window, edebug-sit-for, edebug-input-pending-p): Remove aliases, use the un-prefixed name instead. (edebug-pop-to-buffer): Consider other frames. (edebug-original-read):: Make it more obvious that it's always defined. (edebug--make-form-data-entry, edebug--form-data-name) (edebug--form-data-begin, edebug--form-data-end): Rename from the single-dashed name, and implement with cl-defstruct. (edebug-set-form-data-entry): Use the standard accessors. (edebug-make-top-form-data-entry): Use push. (edebug-no-match): Drop useless `funcall'. (mapcar, mapconcat, mapatoms, apply, funcall): Don't add debug specs to functions. (defsubst, dont-compile, eval-when-compile, eval-and-compile) (delay-mode-hooks, with-temp-file, with-temp-message, ad-dolist) (with-syntax-table, push, pop, 1value, noreturn, defadvice) (easy-menu-define, with-custom-print): Remove redundant specs. (edebug-outside-overriding-local-map) (edebug-outside-overriding-terminal-local-map): Remove, unused. (edebug--display): Bind unread-command-events directly to nil rather than binding it to unread-command-events and later setting it to nil. (edebug--display): Kill edebug-eval-buffer here... (edebug--recursive-edit): ...rather than here. Bind standard-output and standard-input. (edebug-eval): Check cl-macroexpand-all is fboundp. (edebug-temp-display-freq-count): Fix last change. * lisp/emacs-lisp/easymenu.el (easy-menu-define): Add `debug' spec. * lisp/subr.el (noreturn, 1value): Add `debug' spec. * lisp/emacs-lisp/advice.el: Require cl-lib. (ad-copy-tree): Remove, use copy-tree instead. (ad-dolist): Remove use dolist or cl-dolist instead. (ad-do-return): Remove, use cl-return instead. (defadvice): Add `debug' spec.
* src/makefile.w32-in ($(BLD)/alloc.$(O)): Update dependencies.Juanma Barranquero2012-09-142-1/+4
|
* nt/config.nt: Sync with autogen/config.in.Juanma Barranquero2012-09-142-24/+13
| | | | | | (BROKEN_FIONREAD, BROKEN_SIGAIO, BROKEN_SIGIO, BROKEN_SIGPOLL) (BROKEN_SIGPTY, HAVE_CBRT, HAVE_LOGB, NO_TERMIO): Remove. (USABLE_FIONREAD, USABLE_SIGIO): New macros.
* * lisp/dired-aux.el (dired-do-chxxx): Use `eq' to detect empty input.Juri Linkov2012-09-142-1/+9
| | | | Fixes: debbugs:12399
* Update some function declarationsGlenn Morris2012-09-135-6/+13
| | | | | | | | * lisp/calc/calc-ext.el (math-compose-expr): * lisp/calc/calc.el (math-compose-expr): * lisp/progmodes/cc-defs.el (cl-macroexpand-all): * lisp/progmodes/cc-langs.el (delete-duplicates, mapcan) (cl-macroexpand-all): Update declarations.
* * lisp/vc/vc.el: No need to require ediff.Glenn Morris2012-09-132-3/+12
| | | | | | (ediff-load-version-control): Declare. (ediff-vc-internal): Fix declaration. (vc-version-ediff): Require ediff.
* Use a more backwards-compatible timer format.Paul Eggert2012-09-136-6/+25
| | | | | | | | | | | | * etc/NEWS: Document it. * lisp/emacs-lisp/timer.el (timer): PSECS is now at the end, rather than being right after USECS, as that better supports old code that inadvisedly looked directly at the timer vector. * src/keyboard.c (decode_timer): Get PSECS from the 8th (origin-0) vector element, not from the 4th, since PSECS is now at the end. (Fcurrent_idle_time): Doc fix. Fixes: debbugs:12430
* language/chinese.el ("Chinese-GB", "Chinese-BIG5", "Chinese-CNS", ↵Kenichi Handa2012-09-142-4/+12
| | | | "Chinese-EUC-TW"): Add chinese-gbk to coding-priority property of these language environment.
* * configure.ac: Report Gtk+ 3 as GTK.Jan Djärv2012-09-132-5/+2
|
* Fix typos in ChangeLogs.Juanma Barranquero2012-09-132-29/+28
|
* gnus-art.el (gnus-article-stop-animations): Use gnus-timer--function that is ↵Katsumi Yamaoka2012-09-133-1/+12
| | | | an alias to timer--function
* Auto-commit of generated files.Glenn Morris2012-09-132-56/+116
|
* * texinfo.tex: Merge from gnulib.Paul Eggert2012-09-132-17/+24
|
* * configure.ac: Reorder Xaw3d messages.Jan Djärv2012-09-132-1/+6
|
* * etc/NEWS (--with-x-toolkit): Mention Gtk+ 3 is now default.Jan Djärv2012-09-132-0/+12
|