mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-25 23:10:47 -08:00
Code Issues Projects Releases Wiki Activity
98269 commits 242 branches 194 tags 7.7 GiB
Commit graph

30085 commits

Author SHA1 Message Date
Eli Zaretskii
8b3c625b7d Don't define HAVE_STRFTIME on MS-Windows. 
s/ms-w32.h (HAVE_STRFTIME): Don't define.
 2011-01-31 22:00:40 +02:00
Eli Zaretskii
70b0d280eb Fix the MS-Windows build broken by 2011-01-30T23:34:18Z!eggert@cs.ucla.edu and 2011-01-31T08:15:13Z!eggert@cs.ucla.edu. 
lib/makefile.w32-in (GNULIBOBJS): Add $(BLD)/strftime.$(O) and
 $(BLD)/time_r.$(O).
 ($(BLD)/dtoastr.$(O)): Depend on $(EMACS_ROOT)/src/s/ms-w32.h and
 $(EMACS_ROOT)/src/m/intel386.h.
 ($(BLD)/strftime.$(O)): 
 ($(BLD)/time_r.$(O)): Define prerequisites.
 src/makefile.w32-in (OBJ2): Remove strftime.$(O).
 ($(BLD)/strftime.$(O)): Remove prerequisites.
 lib-src/makefile.w32-in (VERSION): Don't define, defined on nt/config.nt.
 (ECLIENT_CFLAGS): Remove -DVERSION.
 ($(BLD)/emacsclient.$(O)): Don't depend on makefile.w32-in.
 nt/config.nt (VERSION): Uncomment definition.
 (restrict): Define.
 nt/inc/stdbool.h: New file.
 admin/admin.el (set-version): Remove lib-src/makefile.w32-in.  Add
 nt/config.nt.
 2011-01-31 21:36:08 +02:00
Paul Eggert
3df3a1fc82 Merge: src/emacs.c now gets version number from configure.in 2011-01-31 00:15:13 -08:00
Paul Eggert
16fab14354 src/emacs.c now gets version number from configure.in 2011-01-31 00:12:52 -08:00
Jim Meyering
546961a989 charset.c (load_charset_map): Don't deref NULL on failed malloc. 2011-01-31 08:34:45 +01:00
Paul Eggert
16c3e636a6 strftime: import from gnulib 2011-01-30 15:34:18 -08:00
Paul Eggert
4eec7f8b2b Use SSDATA when the context wants char *. 2011-01-30 14:22:58 -08:00
Paul Eggert
42a5b22fc0 Use SSDATA when the context wants char *. 
* alloc.c, buffer.c, bytecode.c, callproc.c, dired.c:
* dispnew.c, doc.c, editfns.c, emacs.c, fileio.c, filelock.c:
* fns.c, font.c, frame.c, image.c, indent.c, keyboard.c:
* lread.c, minibuf.c, print.c, process.c, search.c, widget.c:
* xdisp.c, xfaces.c, xfns.c, xml.c, xselect.c, xterm.c:
Use SSDATA (not SDATA) when the context of the expression wants
char * (not unsigned char *).
 2011-01-30 14:17:44 -08:00
Jan Djärv
2787bba35d * .gdbinit: Read global lisp variables as globals.f_V*. 2011-01-30 19:36:12 +01:00
Andreas Schwab
4ec88040a1 * src/font.c (PROP_MATCH): Remove parameter N and use strlen instead. 
All uses changed.
(PROP_SAVE): Likewise.
 2011-01-30 01:35:35 +01:00
Chong Yidong
b6bcd04894 * keyboard.c (make_lispy_position): Fix typo in last change (Bug#7935). 2011-01-29 10:17:00 -05:00
Eli Zaretskii
f915f0f7c8 Fix the MS-Windows build broken by 2011-01-17T19:01:01Z!eggert@cs.ucla.edu and emacs-23/2010-05-21T19:51:48Z!acm@muc.de. 
lib/makefile.w32-in:
 lib/getopt_.h: New files.
 src/s/ms-w32.h (HAVE_MKTIME): Remove.
 src/makefile.w32-in (LOCAL_FLAGS): Add -I../lib.
 (GNULIB): New variable.
 (LIBS): Add $(GNULIB).
 $(TEMACS): Depend on $(GNULIB).
 <top-level>: Fix font-lock disrupted by a lone `"'.
 src/makefile.w32-in (LOCAL_FLAGS): Add -I../lib.
 (GETOPTOBJS, GETOPTDEPS): Remove targets.
 (MOVEMAILOBJS): Replace $(GETOPTOBJS) with ../lib/$(BLD)/libgnu.$(A).
 ($(BLD)/movemail.exe): Depend on ../lib/getopt.h.
 (ECLIENTOBJS, ETAGSOBJ, CTAGSOBJ, EBROWSEOBJ): Replace getopt.o
 and getopt1.o with ../lib/$(BLD)/libgnu.$(A).
 (clean): Don't remove getopt.h.
 (getopt.h, $(BLD)/getopt.$(O), $(BLD)/getopt1.$(O)): Remove targets.
 ($(BLD)/ctags.$(O), $(BLD)/etags.$(O)): Replace getopt.h with
 $(EMACS_ROOT)/lib/getopt.h.
 nt/makefile.w32-in (all-other-dirs-nmake, all-other-dirs-gmake)
 (bootstrap-nmake, bootstrap-gmake, bootstrap-clean-nmake)
 (bootstrap-clean-gmake, clean-other-dirs-nmake)
 (clean-other-dirs-gmake, cleanall-other-dirs-nmake)
 (cleanall-other-dirs-gmake, distclean-other-dirs-nmake)
 (distclean-other-dirs-gmake, maintainer-clean-other-dirs-nmake)
 (maintainer-clean-other-dirs-gmake): Recurse into ../lib as well.
 nt/configure.bat: Create lib/makefile.
 nt/config.nt (HAVE_MKTIME, BROKEN_MKTIME): Remove.
 (HAVE_ATTRIBUTE_ALIGNED, HAVE_C99_STRTOLD, HAVE_DECL_GETENV)
 (HAVE_DECL_LOCALTIME_R, HAVE_WCHAR_T, PACKAGE, VERSION, inline)
 (_GL_UNUSED, _UNUSED_PARAMETER_): Add definitions, for gnulib.
 2011-01-29 14:36:11 +02:00
Jan Djärv
497a1925ec Handle nul-character in copy/paste (Bug#7934). 
* nsselect.m (ns_string_from_pasteboard): Get length of string
and use make_string instead of build_string.
(ns_string_to_pasteboard_internal): Use initWithBytesNoCopy
instead of stringWithUTF8String  (Bug#7934).
 2011-01-29 12:30:11 +01:00
Jan Djärv
481ae0855f Handle floating point errors in ns-fonts (Bug#7887). 
* nsfont.m (nsfont_open): Ensure that fonts with inexact
descenders would not become one pixel too tall (Bug#7887).
 2011-01-29 11:36:16 +01:00
Chong Yidong
6b91861333 Fix text pos part of lispy positions for right fringe clicks (Bug#7839). 
* src/keyboard.c (make_lispy_position): For clicks on right fringe or
margin, compute text position using the X coordinate relative to
the left of the text area (Bug#7839).
 2011-01-28 15:30:38 -05:00
Kenichi Handa
9e269017e7 (ftfont_spec_pattern): Check each extra property value. 2011-01-28 21:31:39 +09:00
Stefan Monnier
17dd1fc895 * src/xdisp.c (safe_eval_handler): Distinguish symbols and strings. 2011-01-27 23:53:17 -05:00
Chong Yidong
372fb76be9 Convert font parse testsuite to an ERT test. 
* test/automated/font-parse-tests.el: Move from
font-parse-testsuite.el.

* src/font.c (font_parse_fcname): Undefine a temporary macro.
 2011-01-27 18:45:04 -05:00
Paul Eggert
125c3718c2 fix two m4/gnulib-*.m4 file names that clashed under MS-DOS 2011-01-26 23:24:57 -08:00
Stefan Monnier
e7f7fbaa11 Let the debugger continue to the normal handler. 
* src/eval.c (maybe_call_debugger): Declare before new use.
(find_handler_clause): Don't call debugger any more.
Ignore Vstack_trace_on_error.
Use XCAR/XCDR.
(syms_of_eval): Remove Vstack_trace_on_error.
(Fsignal): Only modify handlerlist when we know we need to do it.
Call the debugger when necessary.
* src/globals.h (Vstack_trace_on_error): Remove.

Fixes: debbugs:7825
 2011-01-26 15:02:07 -05:00
Chong Yidong
6608a7d8fb * src/font.c (font_parse_fcname): Rewrite GTK font name parser. 
* test/font-parse-testsuite.el (test-font-parse-data): New file.
 2011-01-26 13:10:04 -05:00
Glenn Morris
95df8112a0 Refill some long/short copyright headers. 2011-01-26 00:36:39 -08:00
Glenn Morris
73b0cd5003 Convert consecutive FSF copyright years to ranges. 2011-01-24 20:08:28 -08:00
Glenn Morris
06d8ace515 Merge from emacs-23. 
Note setting of CANNOT_DUMP on ia64 hpux is still to be merged manually.
 2011-01-24 19:47:47 -08:00
Stefan Monnier
f996bbcb94 * xdisp.c (handle_fontified_prop): Be careful with font-lock changing 
the buffer's point-max.

Fixes: debbugs:7876
 2011-01-24 17:05:52 -05:00
Paul Eggert
d6974efa70 Remove HAVE_RAW_DECL_CHOWN etc. from config.h 2011-01-23 20:53:39 -08:00
Chong Yidong
19634648a6 * lisp.h (XPNTR): Obey DATA_SEG_BITS in all non-USE_LSB_TAG cases (Bug#6811). 
Remove unused HAVE_SHM branch.
 2011-01-23 17:38:13 -05:00
Peter O'Gorman
6de1218f3c Two more hunks from the HP-UX patch at Bug#6811. 
* configure.in: Add HP-UX on IA64 (Bug#6811).
* src/s/hpux11.h: Set CANNOT_DUMP on IA64 (Bug#6811).
 2011-01-23 17:00:22 -05:00
Jan Djärv
8ab7032073 * nsterm.m (x_set_offset): Set dont_constrain to 0 so the call to 
setFrameTopLeftPoint is constrained.
 2011-01-23 14:28:14 +01:00
Paul Eggert
200034fcff Merge: Check return values of some library calls. 2011-01-22 23:32:08 -08:00
Paul Eggert
9055082ef8 Check return values of some library calls. 2011-01-22 23:30:19 -08:00
Paul Eggert
5c7d01a54e * src/image.c: Add cast to fix type clash 2011-01-22 20:34:48 -08:00
Paul Eggert
f77fabaf6b * image.c (x_create_bitmap_from_xpm_data): Add cast to fix type clash 
when calling XpmCreatePixmapFromData.
 2011-01-22 20:33:12 -08:00
Paul Eggert
51b59d794f Promote SSDATA macro from gtkutil.c and xsmfns.c to lisp.h. 2011-01-22 18:56:06 -08:00
Glenn Morris
7c82f3e23e Merge from emacs-23 2011-01-22 11:36:45 -08:00
Chong Yidong
bd2a4b24c4 Fix last change. 2011-01-22 10:55:08 -05:00
Jan Djärv
3fb695589e * nsterm.m (constrainFrameRect): Only constrain the first time called. 2011-01-22 12:33:32 +01:00
Martin Rudalics
e6b84b30bc Rework 2011-01-15 changes to window.c. 
* src/window.c (select_window): New function.
(Fselect_window): Call it.
(inhibit_point_swap): Variable deleted.
(Fset_window_configuration): Call select_window directly.
 2011-01-21 21:44:53 -05:00
Paul Eggert
b06b1098fc src/config.in: shrink slightly 
* configure.in: Invoke the new gnulib macro gl_ASSERT_NO_GNULIB_TESTS.
This makes src/config.in a bit smaller, by removing identifiers
like GNULIB_TEST_MKTIME that Emacs does not need.
* m4/getopt.m4, m4/gnulib-common.m4, m4/include_next.m4:
* m4/multiarch.m4, m4/stddef_h.m4, m4/time_h.m4, m4/unistd_h.m4:
Sync from gnulib.  This removes a few more unnecessary symbols from
src/config.in, such as AA_APPLE_UNIVERSAL_BUILD and HAVE_STDDEF_H.
* configure, src/config.in: Regenerate.
 2011-01-21 16:12:10 -08:00
Jan Djärv
e2f79c8d27 Make Nextstep port handle multiple screens for resize and move. 
* nsterm.h (ns_output): Add dont_constrain and zooming.
(EmacsView): Add ns_userRect.

* nsterm.m (keyDown): If ns_right_alternate_modifier is Qleft, check
if ns_alternate_modifier is none.

* nsterm.m (x_set_offset, windowDidMove): When calculating y, use first
screen, not the window screen.
(x_set_window_size): Remove constraints.
Calculate origin.y only if zooming is 0 and without referring to a
screen.
(windowWillResize): Don't modify frameSize.
(windowDidBecomeKey, mouseDown): Set dont_constrain to 1.
(initFrameFromEmacs): Initialize ns_userRect.
(windowShouldZoom): Set zooming to one.  Remove all other code.
(windowWillUseStandardFrame): Move static ns_userRect to EmacsView.
Zero it after restore.
(constrainFrameRect): New method for EmacsWindow.
(mouseDragged): Always post NSWindowDidResizeNotification after call to
windowWillResize.
 2011-01-21 15:19:44 +01:00
Jan Djärv
449ab399f4 * nsterm.m (keyDown): If ns_right_alternate_modifier is Qleft, check 
if ns_alternate_modifier is none.
 2011-01-21 09:35:30 +01:00
Stefan Monnier
8dabbfd632 Don't mess with *temp*. 
* lisp/obsolete/spell.el: Move from textmodes/spell.el.
(spell-string):
* lisp/term.el (term-read-input-ring):
* lisp/startup.el (display-startup-echo-area-message):
* lisp/progmodes/antlr-mode.el (antlr-directory-dependencies):
* lisp/gnus/message.el (message-mailer-swallows-blank-line):
* lisp/comint.el (comint-read-input-ring): Use with-temp-buffer.
* lisp/international/mule.el (ctext-pre-write-conversion):
Don't hardcode point-min==1.
* lisp/gnus/mm-util.el (mm-find-buffer-file-coding-system): Don't forget to
kill the temp buffer.
 2011-01-20 17:36:12 -05:00
Jan Djärv
e885315dd0 * src/unexmacosx.c: Add comment about include order. 2011-01-20 07:43:04 +01:00
Glenn Morris
c11136ec3e Give read-expression-history a doc. 
* lisp/simple.el (read-expression-history): Remove, it's in minibuf.c.

* src/minibuf.c (syms_of_minibuf) <read-expression-history>:
Give it a doc string.
* src/globals.h: Add Vread_expression_history.
 2011-01-19 22:40:36 -08:00
Glenn Morris
bb1c666333 Give kbd-macro-termination-hook a doc. 
* src/macros.c (syms_of_macros) <kbd-macro-termination-hook>:
Give it a doc string.
* src/globals.h: Add Vkbd_macro_termination_hook.
 2011-01-19 22:10:05 -08:00
Chong Yidong
9aea757bb0 Revert changes adding format args to yes-or-no-p and y-or-n-p. 
See discussion on emacs-devel at
http://lists.gnu.org/archive/html/emacs-devel/2011-01/msg00388.html

* src/fns.c (Fyes_or_no_p): Revert 2011-01-07 change, removing ARGS.

* lisp/subr.el (y-or-n-p): Revert 2011-01-07 change, removing ARGS.

* lisp/files.el (find-alternate-file, basic-save-buffer)
(basic-save-buffer-2, revert-buffer, recover-file)
(kill-buffer-ask, abort-if-file-too-large)
(set-visited-file-name, write-file, backup-buffer)
(basic-save-buffer, save-some-buffers):
* lisp/dired-aux.el (dired-compress-file): Callers changed.
 2011-01-19 21:55:36 -05:00
Paul Eggert
e1ef0dac08 Fix X11 compilation failure. 
* globals.h (struct emacs_globals): Document f_Vselection_alist.
* xselect.c (Vselection_alist): Remove declaration, moving its
documentation to globals.h.  This fixes a compilation failure
induced by the earlier change to globals.h today.
 2011-01-19 15:32:42 -08:00
Jan Djärv
8beb828a0b * unexmacosx.c: Include config.h before unistd.h. 
Fixes: debbugs:7859
 2011-01-19 23:13:54 +01:00
Jan Djärv
fb9d0f5afc Fix NextStep build problems with globals.h introducion. 
* src/globals.h (struct emacs_globals): Add f_ns_input_file,
f_ns_input_font, f_ns_input_fontsize, f_ns_input_line,
f_ns_input_color, f_ns_input_text, f_ns_working_text,
f_ns_input_spi_name, f_ns_input_spi_arg, f_ns_alternate_modifier,
f_ns_right_alternate_modifier, f_ns_command_modifier,
f_ns_right_command_modifier, f_ns_control_modifier,
f_ns_right_control_modifier, f_ns_function_modifier,
f_ns_antialias_text, f_ns_confirm_quit, f_Vns_icon_type_alist,
f_Vns_version_string, f_Vns_sent_selection_hooks,
f_Vns_lost_selection_hooks, f_Vselection_alist, f_Vns_reg_to_script
and corresponding defines.

* src/nsfns.m (Vmenu_bar_mode, Vtool_bar_mode): Remove declaration.
(Vns_icon_type_alist, Vns_version_string): Move to globals.h.
(syms_of_nsfns): Remove & from DEFVAR_LISP calls.

* src/nsfont.m (Vns_reg_to_script, ns_antialias_text): Move to
globals.h.
(syms_of_nsfont): Remove & from DEFVAR_LISP.

* src/nsselect.m (Vns_sent_selection_hooks, Vns_lost_selection_hooks
(Vselection_alist, Vselection_converter_alist): Move to globals.h.
(syms_of_nsselect): Remove & from DEFVAR_LISP.

* src/nsterm.m (ns_input_file, ns_input_font, ns_input_fontsize)
(ns_input_line, ns_input_color, ns_input_text, ns_working_text)
(ns_input_spi_name, ns_input_spi_arg)
(ns_alternate_modifier, ns_right_alternate_modifier)
(ns_command_modifier, ns_right_command_modifier, ns_control_modifier)
(ns_right_control_modifier, ns_function_modifier)
(ns_antialias_text, ns_confirm_quit): Move to globals.h.
(Vx_toolkit_scroll_bars, x_use_underline_position_properties)
(x_underline_at_descent_line): Remove declaration.
(syms_of_nsterm): Remove & from DEFVAR_LISP and DEFVAR_BOOL.

* src/nsmenu.m (Voverriding_local_map, Voverriding_local_map_menu_flag):
Remove declaration.
 2011-01-19 23:11:33 +01:00
Sam Steingold
817a735de0 Fix an error introduced by the previous patch. 2011-01-19 10:55:47 -05:00