mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2026-01-22 04:21:24 -08:00
Code Issues Projects Releases Wiki Activity
97640 commits 244 branches 194 tags 732 MiB
Commit graph

29949 commits

Author SHA1 Message Date
Stefan Monnier
7a600d54c0 Merge from trunk 2010-12-12 23:11:49 -05:00
Stefan Monnier
f07a954eeb Make the effect of (defvar foo) local. 
* src/eval.c (apply_lambda): Make static.  Remove eval_flag arg.
(Fsetq): Don't check declared_special.
(Fdefun, Fdefmacro): Use Ffunction.
(Fdefvar): Don't set declared_special for (defvar foo).
(FletX): Check locally-special vars.  Only do specbind once.
(Flet): Check locally-special vars.
(Feval): Don't check declared_special.
(funcall_lambda): Check locally-special vars.
* src/lisp.h (apply_lambda): Remove extern declaration.
* src/lread.c (readevalloop): CSE.
* lisp/subr.el (with-lexical-binding): Remove.
 2010-12-12 23:04:15 -05:00
Eli Zaretskii
39321b94bf Fix bug #7398 with truncated glyphs in w32 tooltips. 
w32fns.c (Fx_show_tip): Call try_window with last argument
 TRY_WINDOW_IGNORE_FONTS_CHANGE.  Delete the TODO ifdef: problem
 solved.  Round up the tip height to an integral multiple of the
 frame's line height.  Add FRAME_COLUMN_WIDTH to the tip width.
 2010-12-11 17:41:04 +02:00
Glenn Morris
d1ddd1d02e ChangeLog fix. 2010-12-10 18:41:47 -08:00
Stefan Monnier
2c302df3a1 Merge from trunk 2010-12-10 19:13:08 -05:00
Glenn Morris
ec1b9b17fa Make verify-visited-file-modtime default to the current buffer. 
* src/fileio.c (Fverify_visited_file_modtime): Default to current buffer.
* doc/lispref/buffers.texi (Modification Time):
verify-visited-file-modtime now defaults to the current buffer.
 2010-12-07 19:45:45 -08:00
Lars Magne Ingebrigtsen
3c2317e891 Return CDATA sections (like <style>foo</style>) as text nodes. 
Also ignore blank HTML nodes.
 2010-12-06 17:59:52 +01:00
Stefan Monnier
bba3e50834 * src/lread.c (read1): Allow newstyle unquote outside of backquote. 
Disallow old-style backquotes inside new-style backquotes.
Don't count unquotes to figure out when we're "syntactically inside
but semantically outside of a backquote" any more.
Extend the restriction no-unescaped-commas-and-backquotes-in-symbols
to all contexts.
 2010-12-06 11:37:26 -05:00
Chong Yidong
d23d86081b * src/process.c: Remove checks for HAVE_SYS_IOCTL_H (Bug#7484). 2010-12-04 20:23:22 -05:00
Andreas Schwab
d6a003a8b5 Remove empty machine description files 
* configure.in: Remove reference to removed machine description
files and allow $machine and $machfile to be empty.  Substitute
M_FILE/S_FILE instead of machfile/opsysfile.

* msdos/sed1v2.inp (M_FILE, S_FILE): Add $(srcdir)/ prefix.

* Makefile.in (M_FILE): Substitute @M_FILE@ instead of @machfile@.
(S_FILE): Substitute @S_FILE@ instead of @opsysfile@.
* src/m/arm.h, src/m/sh3.h, src/m/xtensa.h: Remove files.
 2010-12-04 20:50:39 +01:00
Andreas Schwab
201ef780e0 Remove EXPLICIT_SIGN_EXTEND. 
* lisp.h (union Lisp_Object): Explicitly declare signedness of
bit-field.
(XINT): Remove variant for EXPLICIT_SIGN_EXTEND.
* m/alpha.h (EXPLICIT_SIGN_EXTEND): Don't define.
* m/amdx86-64.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/ia64.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/ibms390.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/ibms390x.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/iris4d.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/m68k.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/sparc.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/template.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/hp800.h: Remove file.
* m/mips.h: Remove file.
 2010-12-03 17:08:05 -05:00
Chong Yidong
903653532f Revert to 2010-12-03T11:48:24Z!jan.h.d@swipnet.se. 2010-12-03 17:01:43 -05:00
Andreas Schwab
e5bd16703f Remove EXPLICIT_SIGN_EXTEND. 
* lisp.h (union Lisp_Object): Explicitly declare signedness of
bit-field.
(XINT): Remove variant for EXPLICIT_SIGN_EXTEND.
* m/alpha.h (EXPLICIT_SIGN_EXTEND): Don't define.
* m/amdx86-64.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/ia64.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/ibms390.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/ibms390x.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/iris4d.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/m68k.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/sparc.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/template.h (EXPLICIT_SIGN_EXTEND): Likewise.
* m/hp800.h: Remove file.
* m/mips.h: Remove file.

* CPP-DEFINES (EXPLICIT_SIGN_EXTEND): Remove.
 2010-12-03 21:55:23 +01:00
Jan Djärv
146490c35d Draw cursor and images correctly for Nextstep (bug#7412). 
* src/nsterm.m (ns_dumpglyphs_image): If drawing cursor, fill background
with cursor color and draw a rectangle around the image.
 2010-12-03 11:54:44 +01:00
Andreas Schwab
babc8f0d4a * frame.c (x_set_font): Remove unused variable. 2010-12-03 11:07:40 +01:00
Jan Djärv
dd723bbd42 * nsmenu.m (update_frame_tool_bar): Remove NSLog on invalid image. 2010-12-02 10:33:57 +01:00
Jan Djärv
9583e9a03c Draw text under filled box cursor in inverted color (Bug#7479). 
* src/nsterm.m (ns_draw_glyph_string): Switch fore- and background if
drawing text under filled box cursor.
 2010-12-02 09:24:16 +01:00
Chong Yidong
088c8c092b Fix error in last merge. 
src/gtkutil.c (menubar_map_cb): Use xg_height_or_width_changed.
 2010-11-30 12:01:18 -05:00
Chong Yidong
07976ae3b8 Merge changes from emacs-23 branch 2010-11-27 15:04:57 -05:00
Eli Zaretskii
228482b229 Force left-to-right paragraph direction in echo area and prog-mode buffers. 
src/xdisp.c (set_message_1): Force paragraph direction in echo area
 be left-to-right.
 lisp/simple.el (prog-mode): Set bidi-paragraph-direction to left-to-right.
 2010-11-26 21:10:26 +02:00
Eli Zaretskii
8547874a7c Fix and document components of mouse event position. 
src/keyboard.c (make_lispy_position): Put a meaningful value in yret
 when the click is on the header or mode line.
 doc/lispref/commands.texi (Click Events): Document the values of X, Y and
 COL, ROW in the event's position, when the click is on the header or
 mode line, on the fringes, or in the margins.
 2010-11-26 20:15:09 +02:00
Eli Zaretskii
123652403c Fixing bug #7474 also fixes #7481. 2010-11-25 22:28:14 +02:00
Eli Zaretskii
1e2dddbe93 Fix bug #7474 with cursor positioning in overlay strings. 
xdisp.c (set_cursor_from_row): Don't forget to consider the
 `cursor' property of the first character in overlay strings.
 2010-11-25 20:38:09 +02:00
Kenichi Handa
e957f9ae90 merge emacs-23 2010-11-25 12:56:41 +09:00
Kenichi Handa
b84ae58433 Fix decoding of emacs-mule coding system. 2010-11-25 12:55:14 +09:00
Jan Djärv
c80c6166fb nsterm.m (keyDown): Compare Left key masks exactly (Bug#7458). 2010-11-24 15:52:14 +01:00
Jan Djärv
50795d1ff3 Bug 7458: Make key press like Left + right ctrl work when right is not control. 
Ditto Alt and Command.

* src/nsterm.m (NSLeftControlKeyMask, NSLeftCommandKeyMask)
(NSLeftAlternateKeyMask): New defines.
(keyDown): Parse left and right keys separatly.
 2010-11-24 08:50:08 +01:00
Eli Zaretskii
f8ab8c1f81 Avoid GCC warning with inline functions. 
intervals.c (temp_set_point_both): Define before calling, to
 avoid GCC warnings.
 2010-11-23 22:27:22 +02:00
Dan Nicolaescu
b29116efce * src/nsmenu.m: Use #include <config.h> instead of "config.h". 2010-11-23 11:36:48 -08:00
Dan Nicolaescu
b932f8b17e Move extern declarations from term.c to lisp.h. 
* src/term.c (Qglyphless_char,last_glyphless_glyph_frame)
(last_glyphless_glyph_face_id. last_glyphless_glyph_merged_face_id):
Move declarations ...
* src/lisp.h (Qglyphless_char,last_glyphless_glyph_frame)
(last_glyphless_glyph_face_id. last_glyphless_glyph_merged_face_id):
... here.
 2010-11-23 10:56:28 -08:00
Dan Nicolaescu
42c8bc9b87 Mark debugger related variables and functions as EXTERNALLY_VISIBLE 
so that they do not get optimized away.

* configure.in (EXTERNALLY_VISIBLE): New definition.

* src/emacs.c (gdb_use_union, gdb_valbits,gdb_gctypebits)
(gdb_data_seg_bits, gdb_array_mark_flag, PVEC_FLAG)
(gdb_pvec_type):
* src/print.c (print_output_debug_flag):
* src/lisp.h (debug_print): Mark as EXTERNALLY_VISIBLE.
(safe_debug_print): New declaration.
 2010-11-23 10:47:23 -08:00
Dan Nicolaescu
2e8a479790 Include <sys/ioctl.h> unconditionally. 
* configure.in <AC_CHECK_HEADERS>: Remove sys/ioctl.h.
* src/xterm.c:
* src/systty.h:
* src/sound.c: Include <sys/ioctl.h> unconditionally.
 2010-11-23 10:09:55 -08:00
Eli Zaretskii
a6d3e72e37 w32.c: Fix a typo in a comment. 2010-11-22 20:15:07 +02:00
Eli Zaretskii
b8e5cf1da0 Back-port 2010-09-17T21:34:45Z!eliz@gnu.org from the trunk, to resolve bug #7452. 
w32.c (_PROCESS_MEMORY_COUNTERS_EX): Don't define with versions
 of w32api >= 3.15.
 2010-11-22 20:09:29 +02:00
YAMAMOTO Mitsuharu
b609f5916d * alloc.c (mark_maybe_object): Return early if given a Lisp integer (Bug#6301). 2010-11-21 19:43:53 -05:00
YAMAMOTO Mitsuharu
96ad0af741 Fix image cache marking bug (Bug#6301). 
* src/alloc.c (mark_terminals): Ensure that the image cache is marked
even if the terminal object was marked earlier (Bug#6301).
 2010-11-21 19:39:42 -05:00
Chong Yidong
35f1de62f2 * editfns.c (Fbyte_to_string): Signal an error if arg is not a byte. 2010-11-21 13:16:19 -05:00
Ken Brown
731e263a73 * src/sheap.c (STATIC_HEAP_SIZE): Revert previous change. 2010-11-21 10:46:23 -05:00
Jan Djärv
b7d1e14447 Add separate key mappings for left/right control/command on Nextstep (Bug#7458). 
* lisp/cus-start.el (all): Add ns-right-control-modifier and
ns-right-command-modifier.

* lisp/term/ns-win.el (ns-right-control-modifier)
(ns-right-command-modifier): Defvar them.

* src/nsterm.m (ns_right_command_modifier, ns_right_control_modifier):
Define (Bug#7458).
(NSRightCommandKeyMask, NSRightControlKeyMask): Define (Bug#7458).
(EV_MODIFIERS): Check for NSRightCommandKeyMask and
NSRightControlKeyMask also (Bug#7458).
(keyDown): Ditto (Bug#7458).
(syms_of_nsterm): Defvar ns-right-command-modifier and
ns-right-control-modifier (Bug#7458).
 2010-11-21 14:09:34 +01:00
Dan Nicolaescu
bee3419fea Remove emacs-priority. 
* src/sysdep.c (sys_subshell): Remove SET_EMACS_PRIORITY.
* src/emacs.c (emacs_priority, syms_of_emacs): Remove emacs_priority.
 2010-11-20 21:39:01 -08:00
Dan Nicolaescu
b798205966 Remove INLINE uses in header files. 
* src/intervals.h (temp_set_point, temp_set_point_both):
* src/buffer.h (offset_intervals, copy_intervals): Remove INLINE.
 2010-11-20 21:20:50 -08:00
Dan Nicolaescu
33726611e7 * configure.in (INLINE): Do not depend on OPTIMIZE, unused. 2010-11-20 21:17:19 -08:00
Ken Brown
01664ed1f0 * src/sheap.c (STATIC_HEAP_SIZE): Increase to 13MB. 2010-11-20 10:23:49 -05:00
Eli Zaretskii
7c2d713b9b Use \uNNNN, \UNNNNNN, or \xNNNNNN for hex-code display on a TTY. 
term.c (produce_glyphless_glyph): Use \uNNNN, \UNNNNNN, or
 \xNNNNNN for hex-code display of glyphless characters.
 2010-11-20 17:04:50 +02:00
Jan Djärv
d2bd51898e Add keyword :vert-only for tool bar items with labels not shown horizontally. 
* lisp/info.el (info-tool-bar-map): Add some :vert-only keywords.

* lisp/tool-bar.el (tool-bar-setup): Add some :vert-only keywords.

* src/dispextern.h (tool_bar_item_idx): Add TOOL_BAR_ITEM_VERT_ONLY.

* src/gtkutil.c (xg_make_tool_item): Take vert_only as argument.
Set important to ! vert_only.
(xg_show_toolbar_item): Don't show label horizontally if
tool item isn't important.
(update_frame_tool_bar): Get TOOL_BAR_ITEM_VERT_ONLY and pass it to
xg_make_tool_item, or update important on existing tool item.

* src/keyboard.c (QCvert_only): New variable.
(parse_tool_bar_item): Check for QCvert_only.
(syms_of_keyboard): Initialize QCvert_only.
 2010-11-20 15:51:25 +01:00
Jan Djärv
8d7f026f62 Fix bug 7425. 
NOTE: When merging to trunk: xg_height_changed is xg_height_or_width_changed
      in trunk.

* src/gtkutil.c (menubar_map_cb): New function.
(xg_update_frame_menubar): Connect signal map to menubar_map_cb.
Use 23 as menubar height if 0. (Bug#7425).
 2010-11-20 14:50:55 +01:00
Eli Zaretskii
6ce950f336 msdos.c (dos_rawgetc): Use gen_help_event, instead of doing the same in-line. 2010-11-20 13:45:14 +02:00
Eli Zaretskii
d9a95e6767 msdos.c (dos_rawgetc): Use gen_help_event, instead of doing the same in-line. 2010-11-20 13:24:28 +02:00
Andreas Schwab
b65575536f * src/xfaces.c (lookup_face): Make static. 
* src/dispnew.c (copy_row_except_pointers): Likewise.
* src/syntax.c (dec_bytepos): Likewise.
(inc_bytepos): Remove.
* src/dispextern.h (lookup_face): Remove declaration.
 2010-11-20 11:07:00 +01:00
Eli Zaretskii
f48fe1f074 Fix bug #6687 with cursor positioning after before-string from overlays. 
xdisp.c (set_cursor_from_row): Display cursor after all the
 glyphs that come from an overlay.  Don't overstep the last glyph
 when skipping glyphs from an overlay.
 2010-11-19 18:34:22 +02:00