1. 16 Sep, 2012 18 commits
    • Katsumi Yamaoka's avatar
    • Paul Eggert's avatar
      Remove configure's --without-sync-input option. · 0caaedb1
      Paul Eggert authored
      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
      0caaedb1
    • Paul Eggert's avatar
      634b8cac
    • Glenn Morris's avatar
    • Glenn Morris's avatar
      164b9bf3
    • Glenn Morris's avatar
      92f7c6f1
    • Glenn Morris's avatar
      Increase compartmentalization of Nextstep builds rules, · 83da1b55
      Glenn Morris authored
      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.
      83da1b55
    • Chong Yidong's avatar
      Fix marker usage in align-areas. · 40d70ecb
      Chong Yidong authored
      * align.el (align-areas): Call the indication function with
      positions instead of markers for arguments.
      
      Fixes: debbugs:12343
      40d70ecb
    • Kenichi Handa's avatar
      merge trunk · 0b97c030
      Kenichi Handa authored
      0b97c030
    • Kenichi Handa's avatar
    • Chong Yidong's avatar
      * files.el (parse-colon-path): Use split-string. · 1667e065
      Chong Yidong authored
      Fixes: debbugs:12351
      1667e065
    • Kenichi Handa's avatar
      merge trunk · ba13e616
      Kenichi Handa authored
      ba13e616
    • Martin Rudalics's avatar
      Window parameter functions again accept any window as argument (Bug#12452). · a8c729af
      Martin Rudalics authored
      * window.c (Fwindow_parameter, Fset_window_parameter): Accept
      any window as argument (Bug#12452).
      a8c729af
    • Jan Djärv's avatar
      Try to fix crashes introduced by 2012-09-10T21:01:45Z!jan.h.d@swipnet.se. · c077c059
      Jan Djärv authored
      * 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.
      c077c059
    • Chong Yidong's avatar
      Mark display-buffer-function as obsolete. · 71ce58e7
      Chong Yidong authored
      * lisp/window.el (display-buffer-function): Mark as obsolete.
      
      Fixes: debbugs:12166
      71ce58e7
    • Chong Yidong's avatar
      * window.el (special-display-popup-frame): Doc fix. · fdc2806d
      Chong Yidong authored
      Fixes: debbugs:8853
      fdc2806d
    • Chong Yidong's avatar
      Alter last change to be compatible with Emacs 23. · f1be615c
      Chong Yidong authored
      * 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
      f1be615c
    • Chong Yidong's avatar
      In compilation-error-regexp-alist, allow more HIGHLIGHT types. · c584eaf9
      Chong Yidong authored
      * 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
      c584eaf9
  2. 15 Sep, 2012 11 commits
    • Glenn Morris's avatar
      Add option to ask bzr itself for the emacs bzr revision · 72aa16e1
      Glenn Morris authored
      * lisp/version.el (emacs-bzr-version-bzr): New function.
      (emacs-bzr-get-version): Add optional EXTERNAL argument.
      72aa16e1
    • Glenn Morris's avatar
      Auto-commit of loaddefs files. · 830be228
      Glenn Morris authored
      830be228
    • Glenn Morris's avatar
      Auto-commit of generated files. · e2d8f316
      Glenn Morris authored
      e2d8f316
    • Paul Eggert's avatar
      Port _setjmp fix to POSIXish hosts as well as Microsoft. · 39a57ad0
      Paul Eggert authored
      * 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.
      39a57ad0
    • Eli Zaretskii's avatar
      Fix MS-Windows build broken by 2012-09-15T07:06:56Z!eggert@cs.ucla.edu,... · 7105c8cb
      Eli Zaretskii authored
      Fix MS-Windows build broken by 2012-09-15T07:06:56Z!eggert@cs.ucla.edu, 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.
      7105c8cb
    • Paul Eggert's avatar
      Port better to POSIX hosts lacking _setjmp. · 0328b6de
      Paul Eggert authored
      * 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
      0328b6de
    • Kenichi Handa's avatar
      merge trunk · dcbd9236
      Kenichi Handa authored
      dcbd9236
    • Kenichi Handa's avatar
      font.c (Ffont_shape_gstring): Don't adjust grapheme cluster here, but just... · ea964864
      Kenichi Handa authored
      font.c (Ffont_shape_gstring): Don't adjust grapheme cluster here, but just check the validity of glyphs in the glyph-string.
      ea964864
    • Glenn Morris's avatar
      Improve vc-bzr-working-revision for lightweight checkouts · 82375160
      Glenn Morris authored
      * 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.
      82375160
    • Glenn Morris's avatar
      Tweak previous emacs-bzr-get-version change · fea895b1
      Glenn Morris authored
      fea895b1
    • Glenn Morris's avatar
      Improve emacs-bzr-version for lightweight checkouts (bug#12441) · f40a9709
      Glenn Morris authored
      * 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.
      f40a9709
  3. 14 Sep, 2012 10 commits
    • Juri Linkov's avatar
      * lisp/dired-aux.el (dired-do-chmod): Use `eq' to detect empty input. · cb26b7f5
      Juri Linkov authored
      Fixes: debbugs:12399
      cb26b7f5
    • Paul Eggert's avatar
      Fix glitches with 'configure --without-sync-input'. · 2af03429
      Paul Eggert authored
      * configure.ac (--without-sync-input): Fix typo in usage message.
      * alloc.c [!SYSTEM_MALLOC && !SYNC_INPUT && HAVE_PTHREAD]:
      Include "syssignal.h", for 'main_thread'.
      2af03429
    • Paul Eggert's avatar
      * configure.ac: Port to hosts lacking gtk. · e3141fcf
      Paul Eggert authored
      (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.
      e3141fcf
    • Dmitry Antipov's avatar
      Avoid out-of-range marker position (Bug#12426). · 2f294edf
      Dmitry Antipov authored
      * 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.
      2f294edf
    • Stefan Monnier's avatar
    • Glenn Morris's avatar
      Auto-commit of generated files. · 33bd7ff0
      Glenn Morris authored
      33bd7ff0
    • Martin Rudalics's avatar
      In Fformat_mode_line always save/restore current buffer. (Bug#12387) · 6b533e9c
      Martin Rudalics authored
      * xdisp.c (Fformat_mode_line): Unconditionally save/restore current
      buffer.  (Bug#12387)
      6b533e9c
    • Stefan Monnier's avatar
      * lisp/emacs-lisp/edebug.el: Miscellaneous cleanup. · 2de39f08
      Stefan Monnier authored
      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.
      2de39f08
    • Juanma Barranquero's avatar
    • Juanma Barranquero's avatar
      nt/config.nt: Sync with autogen/config.in. · fe597931
      Juanma Barranquero authored
      (BROKEN_FIONREAD, BROKEN_SIGAIO, BROKEN_SIGIO, BROKEN_SIGPOLL)
      (BROKEN_SIGPTY, HAVE_CBRT, HAVE_LOGB, NO_TERMIO): Remove.
      (USABLE_FIONREAD, USABLE_SIGIO): New macros.
      fe597931
  4. 13 Sep, 2012 1 commit