summaryrefslogtreecommitdiff
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* * src/fns.c (Fcompare_strings): Use FETCH_STRING_CHAR_AS_MULTIBYTE_ADVANCE.Dmitry Antipov2014-06-262-15/+6
| | | | | | * lisp/calc/calc-alg.el (math-beforep): * lisp/progmodes/cc-guess.el (c-guess-view-reorder-offsets-alist-in-style): Simplify because string-lessp can accept symbols as args.
* Fix ChangeLog entry.Dmitry Antipov2014-06-251-1/+3
|
* Consistently use validate_subarray to verify substring.Dmitry Antipov2014-06-255-47/+41
| | | | | | | | | | * fns.c (validate_substring): Not static any more. Adjust to use ptrdiff_t, not EMACS_INT, becase string and vector limits can't exceed ptrdiff_t even if EMACS_INT is wider. * lisp.h (validate_subarray): Add prototype. * coding.c (Fundecodable_char_position): * composite.c (Fcomposition_get_gstring, Fcompose_string_internal): Use validate_subarray. Adjust comment to mention substring.
* Do not allow out-of-range character position in Fcompare_strings.Dmitry Antipov2014-06-252-42/+31
| | | | | | | | | | | | | | * src/fns.c (validate_subarray): Add prototype. (Fcompare_substring): Use validate_subarray to check ranges. Adjust comment to mention that the semantics was changed. Also see http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00447.html. * lisp/files.el (dir-locals-find-file, file-relative-name): * lisp/info.el (Info-complete-menu-item): * lisp/minibuffer.el (completion-table-subvert): Prefer string-prefix-p to compare-strings to avoid out-of-range errors. * lisp/subr.el (string-prefix-p): Adjust to match strict range checking in compare-strings. * test/automated/fns-tests.el (fns-tests-compare-string): New test.
* Be more consistent about the 'Qfoo' naming convention.Paul Eggert2014-06-244-15/+24
| | | | | | | | * image.c (Fimagemagick_types): * lisp.h (lisp_h_CHECK_TYPE, CHECK_TYPE, CHECK_ARRAY): * process.c (Fmake_network_process): Rename C local identifier 'Qfoo to avoid giving the false impression that it stands for the symbol 'foo'.
* Simplify and cleanup character conversion stuff.Dmitry Antipov2014-06-2320-98/+68
| | | | | | | | | | | | | * lisp.h (multibyte_char_to_unibyte, multibyte_char_to_unibyte_safe): Remove prototypes. * character.c (multibyte_char_to_unibyte) (multibyte_char_to_unibyte_safe): Remove; no longer used. * character.h (make_char): Remove; unused. (CHAR_TO_BYTE8, CHAR_TO_BYTE_SAFE): Simplify. (ASCII_BYTE_P): Remove; ASCII_CHAR_P does the same thing. * buffer.c, charset.c, charset.h, cmds.c, coding.c, editfns.c: * fileio.c, indent.c, insdel.c, keyboard.c, lread.c, print.c: * search.c, term.c, xdisp.c, xterm.c: Related users changed.
* "the the", "from from" and "and and".Mario Lang2014-06-232-1/+5
|
* * xmenu.c (mouse_position_for_popup):Dmitry Antipov2014-06-228-92/+55
| | | | | | | | | | | * xselect.c (mouse_position_for_drop): Do not duplicate ... * xfns.c (x_relative_mouse_position): ... and prefer this function. * menu.c (Fx_popup_menu): * xselect.c (x_handle_dnd_message): Adjust users. * menu.h (mouse_position_for_popup): Remove prototype. * xterm.h (x_relative_mouse_position): Add prototype. * xterm.c (x_find_topmost_parent): Break from the loop and do not call XFree if XQueryTree returns zero.
* Merge from emacs-24; up to 2014-06-06T02:22:40Z!monnier@iro.umontreal.caGlenn Morris2014-06-218-39/+115
|\
| * src/dispextern.h: Fix commentary to it's hpos member.Eli Zaretskii2014-06-211-1/+2
| |
| * Fix bug #17823 with vertical-motion in lines with line-prefix.Eli Zaretskii2014-06-212-12/+10
| | | | | | | | | | | | | | src/indent.c (Fvertical_motion): Move to the goal column, if any, with a single call to move_it_in_display_line, not in two calls. Doing this with two calls causes move_it_in_display_line apply the line-prefix handling twice instead of just once.
| * Improve documentation of how vertical-motion interprets columns.Eli Zaretskii2014-06-212-3/+10
| | | | | | | | | | | | | | src/indent.c (Fvertical_motion): Doc fix. doc/lispref/positions.texi (Screen Lines): Clarify how columns are counted by vertical-motion.
| * Port to OS X ACLs.Paul Eggert2014-06-212-1/+10
| | | | | | | | | | | | | | * fileio.c (Ffile_acl): Port to OS X, where acl_get_file (..., ACL_TYPE_ACCESS) doesn't work. Fixes: debbugs:17810
| * * src/keyboard.c (read_key_sequence): Don't invoke Vprefix_help_commandStefan Monnier2014-06-182-12/+19
| | | | | | | | | | | | before checking key-translation-map. Fixes: debbugs:17659
| * * font.c (font_make_object): Avoid dangling pointer which mayDmitry Antipov2014-06-192-0/+8
| | | | | | | | crash GC (Bug#17771).
| * src/image.c: Yet another fix for last commit.Eli Zaretskii2014-06-181-0/+1
| | | | | | | | Fixes: debbugs:17790
| * src/image.c: Another fix for last commit.Eli Zaretskii2014-06-181-1/+1
| | | | | | | | Fixes: debbugs:17790
| * src/image.c: Fix last commit.Eli Zaretskii2014-06-181-2/+2
| | | | | | | | Fixes: debbugs:17790
| * Fix bug #17790 with compilation against giflib 5.1.0 and later.Eli Zaretskii2014-06-182-7/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | src/image.c [5 < GIFLIB_MAJOR + (1 <= GIFLIB_MINOR)]: Declare the prototype of DGifCloseFile as appropriate for older and newer versions of giflib. (gif_close): New function, encapsulates the differences in the calling sequence of DGifCloseFile before v5.1.0 and after it. (gif_load): Call gif_close instead of DGifCloseFile. Divulge the error string where appropriate. lisp/term/w32-win.el (dynamic-library-alist): Support giflib 5.1.0 and later.
| * A better fix for bug #17777 with visual-order cursor movement.Eli Zaretskii2014-06-162-1/+11
| | | | | | | | | | | | | | src/xdisp.c (Fmove_point_visually): Instead of testing for keyboard macro execution, make sure point didn't move since last complete redisplay, as the condition for using the glyph matrix information.
| * Spelling fix.Paul Eggert2014-06-151-1/+1
| |
* | Minor cleanup of fonset code.Dmitry Antipov2014-06-192-28/+24
| | | | | | | | | | | | | | | | | | | | | | | | * fontset.c (FONTSET_ID, set_fontset_id, FONTSET_NAME) (set_fontset_name, FONTSET_ASCII, set_fontset_ascii) (FONTSET_BASE, set_fontset_base, FONTSET_FRAME) (set_fontset_frame, FONTSET_NOFONT_FACE, set_fontset_nofont_face) (FONTSET_DEFAULT, set_fontset_default, FONTSET_FALLBACK) (set_fontset_fallback): Reorder extra slots and avoid unused slots. (free_realized_fontset): Remove because a no-op since 2008. (free_face_fontset): Adjust user. (syms_of_fontset): Shrink fontset by one extra slot.
* | Omit redundant extern decls.Paul Eggert2014-06-1714-91/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Most of this patch is from Dmitry Antipov, in: http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00263.html * configure.ac (WERROR_CFLAGS): Add -Wredundant-decls. * lib-src/emacsclient.c (getenv): Remove decl. * lib-src/make-docfile.c (write_globals): Add ATTRIBUTE_CONST for Fbyteorder, Ftool_bar_height, Fmax_char, Fidentity. * lwlib/lwlib-Xm.c (lw_motif_widget_p, xm_update_one_value) (xm_create_dialog, xm_destroy_instance, xm_popup_menu) (xm_set_keyboard_focus, xm_set_main_areas): Remove decls. * src/commands.h (update_mode_lines): * src/frame.h (Qbackground_color, Qforeground_color) (x_set_menu_bar_lines): * src/ftfont.c (ftfont_font_format): * src/intervals.h (Qkeymap, Qfont): * src/keyboard.c (timer_check, safe_run_hooks, Qregion_extract_function): * src/lisp.h (Ffboundp, Qnil, Qt, Qlambda, Qintegerp, Qwholenump) (Qsymbolp, Qlisp, Qconsp, Qstringp, Qarrayp, Qbufferp, Qmarkerp) (Qvectorp, Qbuffer_or_string_p, Qchar_table_p, Qvector_or_char_table_p) (Qfloatp, Qnumberp, Qfont_spec, Qfont_entity, Qfont_object) (Fbyteorder, wrong_type_argument, Fmax_char, syms_of_composite) (Fidentity, extract_float, init_display, syms_of_display, Qdisplay): (Qimage, Qbox, redisplay_preserve_echo_area, char_table_ref) (char_table_set, char_table_translate, Qautoload, Qbottom, Qtop) (Qvisible, Qfont, Qfront_sticky, Qrear_nonsticky, init_sigio) (Qtool_bar, Qheader_line): * src/macros.c (Fexecute_kbd_macro): * src/xdisp.c (Ftool_bar_height, Ftool_bar_height): * src/xterm.c (x_delete_terminal, XSetIMValues): * src/xterm.h (x_set_window_size, x_query_color, x_get_focus_frame) (x_implicitly_set_name, popup_activated) (widget_store_internal_border): Remove redundant decls. * src/frame.c [USE_X_TOOLKIT]: Include widget.h. * src/keyboard.c (Fexit_recursive_edit, Fabort_recursive_edit): Remove _Noreturn, as make-docfile now does that for us. * src/lisp.h (DEFUN): Don't declare fnname here; rely on make-docfile. (Qregion_extract_function): New decl. * src/window.c, src/xfns.c: Include menu.h.
* | * src/callint.c (Fcall_interactively): Fix up last change.Stefan Monnier2014-06-175-6/+11
| | | | | | | | Fixes: debbugs:17701
* | * lisp.h (STRING_COPYIN): Remove; unused.Dmitry Antipov2014-06-174-15/+7
| | | | | | | | | | * ccl.c (Fccl_execute_on_string): * font.c (fon_intern_prop): Use make_specified_string.
* | * eval.c (toplevel): Remove redundant #include directives.Dmitry Antipov2014-06-173-6/+3
| | | | | | | | * xterm.c (x_initialize): Add static to match prototype.
* | * fileio.c (Fread_file_name): Do not pass redundant args and ...Dmitry Antipov2014-06-175-43/+49
| | | | | | | | | | | | | | * callint.c (read_file_name): ... convert to static here. * lisp.h (Fread_file_name): Do not EXFUN it. * composite.c (CHAR_COMPOSABLE_P): Replace unsafe macro with ... (char_composable_p): ... static function. All users changed.
* | * Makefile.in (ns-app): Fix typo that broke build on OS X.Paul Eggert2014-06-162-1/+7
| | | | | | | | | | Reported by David Caldwell in: http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00251.html
* | Do not ask for XRender extension each time XFT font is opened.Dmitry Antipov2014-06-163-17/+31
| | | | | | | | | | * xftfont.c (xftfont_open): Move call to XRenderQueryExtension ... * xterm.c (x_term_init) [HAVE_XFT]: ... to here. Adjust comment.
* | Use `make -C' rather than `cd && make'Glenn Morris2014-06-142-14/+17
| | | | | | | | | | | | | | | | | | | | | | | | * Makefile.in: Use `make -C' rather than `cd && make' throughout. * lib-src/Makefile.in (../lib/libgnu.a): Use `make -C' rather than `cd && make'. * lisp/Makefile.in (leim, semantic): Use `make -C' rather than `cd && make'. * lwlib/Makefile.in ($(globals_h)): Use `make -C' rather than `cd && make'. * src/Makefile.in: Use `make -C' rather than `cd && make' throughout.
* | Merge from emacs-24; up to 2014-06-03T06:51:18Z!eliz@gnu.orgGlenn Morris2014-06-143-6/+85
|\ \ | |/
| * Fix bug #17777 with keyboard macros and visual-order cursor movement.Eli Zaretskii2014-06-142-0/+8
| | | | | | | | | | | | | | src/xdisp.c (Fmove_point_visually): Don't use the glyph matrix information if we are in the middle of executing a keyboard macro, since redisplay doesn't update the screen until the macro is finished.
| * src/xdisp.c: Enhance commentary.Eli Zaretskii2014-06-141-3/+64
| |
| * Attempt to fix bug #17771 with segfault if "C-h h" is interrupted.Eli Zaretskii2014-06-132-3/+15
| | | | | | | | | | src/alloc.c (cleanup_vector): Don't dereference a font driver pointer if it is NULL.
* | With GNU make, MFLAGS is not neededGlenn Morris2014-06-132-14/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Makefile.in (CC, CFLAGS, LDFLAGS, CPPFLAGS, abs_top_srcdir): Remove, no longer used. (lib, lib-src, lisp, nt, src, blessmail, install-arch-dep) (install-nt, install-strip, uninstall, uninstall-nt) (mostlyclean, clean, distclean, bootstrap-clean) (maintainer-clean, extraclean, TAGS, tags, check, $(DOCS)): ($(INSTALL_DOC), $(UNINSTALL_DOC), info, bootstrap, check-declare): GNU make automatically passes command-line arguments to sub-makes. * admin/unidata/Makefile.in (${DSTDIR}/charprop.el): GNU make automatically passes command-line arguments to sub-makes. * lib-src/Makefile.in (../lib/libgnu.a): GNU make automatically passes command-line arguments to sub-makes. * lisp/Makefile.in ($(lisp)/cus-load.el, $(lisp)/finder-inf.el) (autoloads, $(lisp)/subdirs.el, compile-main, leim, semantic, compile) (compile-always): GNU make automatically passes command-line arguments to sub-makes. * lwlib/Makefile.in ($(globals_h)): GNU make automatically passes command-line arguments to sub-makes. * src/Makefile.in ($(leimdir)/leim-list.el, $(srcdir)/macuvs.h) ($(lispsource)/international/charprop.el) ($(libsrc)/make-docfile$(EXEEXT), $(lwlibdir)/liblw.a) ($(oldXMenudir)/libXMenu11.a, ns-app, .el.elc) ($(lispsource)/loaddefs.el, bootstrap-emacs$(EXEEXT)): GNU make automatically passes command-line arguments to sub-makes. * test/automated/Makefile.in (compile-main): GNU make automatically passes command-line arguments to sub-makes.
* | Avoid hangs in accept-process-output.Paul Eggert2014-06-133-62/+78
| | | | | | | | | | | | | | | | | | | | | | | | | | * lisp.h, process.c (wait_reading_process_input): Return int, not bool. All uses changed. * process.c (SELECT_CANT_DO_WRITE_MASK): Remove macro, replacing with ... (SELECT_CAN_DO_WRITE_MASK): ... new constant, with inverted sense. All uses changed. (status_notify): New arg WAIT_PROC. Return int, not void. All uses changed. Fixes: debbugs:17647
* | Don't try to display menus and dialogs in an 'initial' frame.Eli Zaretskii2014-06-132-3/+13
| | | | | | | | | | | | | | src/menu.c (Fx_popup_menu): Don't call the frame's menu_show_hook if the frame is the initial frame, because the hook is not set up then, and Emacs crashes. Reported by Fabrice Popineau <fabrice.popineau@gmail.com>.
* | * src/keymap.c (silly_event_symbol_error): Don't recommend the use of strings.Stefan Monnier2014-06-122-6/+9
| |
* | Merge from emacs-24; up to 2014-06-02T14:17:07Z!michael.albinus@gmx.deGlenn Morris2014-06-112-3/+9
|\ \ | |/
| * Fix bug #17744 with cursor motion near overlay string with 'cursor' prop.Eli Zaretskii2014-06-112-3/+9
| | | | | | | | | | | | src/xdisp.c (set_cursor_from_row): Fix an off-by-one error when matching overlay strings with 'cursor' property against buffer positions traversed in the glyph row.
* | Fix memory leaksJan Djärv2014-06-114-22/+43
| | | | | | | | | | | | | | | | | | | | | | | | * macfont.m (macfont_draw): positions where not freed. * nsterm.h (EmacsApp): Always compile in shouldKeepRunning, isFirst on Cocoa. * nsterm.m (run): Always compile for Cocoa. Use runtime check to determine 10.9. Fixes: debbugs:17751
* | Spelling fix.Paul Eggert2014-06-111-7/+7
| |
* | * frame.h (window_system_available) [!HAVE_WINDOW_SYSTEM]: Always false.Dmitry Antipov2014-06-103-9/+11
| | | | | | | | * frame.c (window_system_available) [HAVE_WINDOW_SYSTEM]: Now here.
* | * dispextern.h (last_tool_bar_item): Remove declaration.Dmitry Antipov2014-06-107-21/+30
| | | | | | | | | | | | | | | | | | * frame.h (struct frame): New member last_tool_bar_item. * frame.c (make_frame): Initialize it. * xdisp.c (toplevel): Remove last_tool_bar_item. (handle_tool_bar_click, note_tool_bar_highlight): * w32term.c (w32_read_socket, w32_initialize): * xterm.c (handle_one_xevent, x_initialize): Adjust users.
* | * dispextern.h (struct face) [HAVE_XFT]: Ifdef 'extra' member.Dmitry Antipov2014-06-107-18/+20
| | | | | | | | | | | | | | | | | | | | * font.c (font_done_for_face): * xface.c (realize_non_ascii_face): Adjust user. * font.h (struct font_driver): Convert 'prepare_face' to return void because its return value is never used anyway. * xfont.c (xfont_prepare_face): Return void. * xftfont.c (xftfont_prepare_face): Likewise. Use xmalloc. (xftfont_done_face): Use xfree.
* | * dispextern.h (PREPARE_FACE_FOR_DISPLAY): Remove as a duplicate of ...Dmitry Antipov2014-06-107-27/+26
| | | | | | | | | | | | * xfaces.c (prepare_face_for_display) [HAVE_WINDOW_SYSTEM]: ... this function. Also adjust comment. * fringe.c, w32term.c, xdisp.c, xterm.c: All users changed.
* | Say (accept-process-output P)'s result pertains to P if P is non-nil.Paul Eggert2014-06-092-13/+19
| | | | | | | | | | | | | | * doc/lispref/processes.texi (Accepting Output): * src/process.c (Faccept_process_output) (wait_reading_process_output): Mention that if PROCESS is non-nil, the return value is about PROCESS, not about other processes.
* | Further adjustments to mark_object and friends.Dmitry Antipov2014-06-092-22/+40
| | | | | | | | | | | | | | Now the mark_object's stack is just 32 bytes on a 64-bit system, which means extra 20% off the stack usage. * alloc.c (mark_save_value): As before, refactored out from ... (mark_object): ... adjusted user. Also add comment.
* | Fix core dump after a dropped X connection.Paul Eggert2014-06-092-1/+9
| | | | | | | | | | | | | | * sysdep.c (stuff_char): Don't abort merely because the selected frame is dead, as we may be shutting down. Fixes: debbugs:17704
* | Merge from emacs-24; up to 2014-06-02T11:35:40Z!michael.albinus@gmx.deGlenn Morris2014-06-083-7/+11
|\ \ | |/