summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Disable __attribute__ ((cold)) on MinGWPaul Eggert2019-04-291-2/+4
| | | | | * src/conf_post.h (ATTRIBUTE_COLD) [__MINGW32__]: Define to empty on this platform.
* Merge from origin/emacs-26Glenn Morris2019-04-293-3/+10
|\ | | | | | | | | | | | | | | | | c26d452 (origin/emacs-26) * src/macfont.m (macfont_shape): Use conven... 140e7f8 Recommend using font-lock-face over face (Bug#35044) 7cb5364 Check if mouse_face_overlay was deleted (Bug#35273) # Conflicts: # src/macfont.m
| * * src/macfont.m (macfont_shape): Use convenient LGLYPH_NEW.YAMAMOTO Mitsuharu2019-04-291-1/+1
| |
| * Recommend using font-lock-face over face (Bug#35044)Noam Postavsky2019-04-281-1/+6
| | | | | | | | | | * doc/lispref/modes.texi (Precalculated Fontification): Explain advantages of using font-lock-face over face.
| * Check if mouse_face_overlay was deleted (Bug#35273)Noam Postavsky2019-04-281-1/+3
| | | | | | | | | | | | * src/xdisp.c (note_mouse_highlight): Check if the mouse_face_overlay actually points to a buffer, before calling mouse_face_overlay_overlaps on it.
* | ; Merge from origin/emacs-26Glenn Morris2019-04-290-0/+0
|\ \ | |/ | | | | | | | | The following commit was skipped: 531c74e Port to platforms where tputs is in libtinfow
| * Port to platforms where tputs is in libtinfowPaul Eggert2019-04-271-1/+2
| | | | | | | | | | | | * configure.ac (tputs_library): Also try tinfow, ncursesw (Bug#33977). (cherry picked from commit a3d52b3057c98bce581bc94912ef3ced6fad6f14)
* | Merge from origin/emacs-26Glenn Morris2019-04-295-14/+48
|\ \ | |/ | | | | | | | | | | 0e8d452 ; * doc/lispref/nonascii.texi (Coding System Basics): Fix gra... 25a2ff7 ; Add missing space in custom.texi 9ec18fb * admin/admin.el (set-version): Check for increase in version... 93912ba Be more careful about indent-sexp going over eol (Bug#35286)
| * ; * doc/lispref/nonascii.texi (Coding System Basics): Fix grammar.Charles A. Roelli2019-04-261-1/+1
| |
| * ; Add missing space in custom.texiMichael Albinus2019-04-251-1/+1
| |
| * * admin/admin.el (set-version): Check for increase in version length,Glenn Morris2019-04-221-4/+4
| | | | | | | | rather than a .50 version.
| * Be more careful about indent-sexp going over eol (Bug#35286)Noam Postavsky2019-04-222-8/+42
| | | | | | | | | | | | | | | | * lisp/emacs-lisp/lisp-mode.el (indent-sexp): Only go over multiple sexps if the end of line is within a sexp. * test/lisp/emacs-lisp/lisp-mode-tests.el (indent-sexp-stop-before-eol-comment) (indent-sexp-stop-before-eol-non-lisp): New tests.
* | ; Merge from origin/emacs-26Glenn Morris2019-04-290-0/+0
|\ \ | |/ | | | | | | | | | | The following commits were skipped: 3988e93 Backport: Improve pure and side-effect-free docs 7565d2d Backport: Avoid using obsolete indent-relative-maybe
| * Backport: Improve pure and side-effect-free docsBasil L. Contovounesios2019-04-225-13/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For discussion, see thread starting at: https://lists.gnu.org/archive/html/emacs-devel/2019-04/msg00316.html * doc/lispref/customize.texi (Composite Types): Do not overspecify :match-alternatives predicates. * doc/lispref/eval.texi (Intro Eval): Anchor definition of "side effect" for cross-referencing... * doc/lispref/functions.texi (What Is a Function): ...from here. Define what a pure function is. * doc/lispref/internals.texi (Writing Emacs Primitives): Describe currently preferred approach to marking primitives as pure and side-effect-free. * doc/lispref/symbols.texi (Standard Properties): Expand description of pure and side-effect-free properties. (cherry picked from commit 4430a9b54fca266e48d0eb8b72d83706910f10b8)
| * Backport: Avoid using obsolete indent-relative-maybeBasil L. Contovounesios2019-04-223-8/+10
| | | | | | | | | | | | | | | | | | | | | | | | * lisp/electric.el (electric-indent-functions-without-reindent): * lisp/indent.el (indent-according-to-mode): Check for indent-relative-first-indent-point in addition to its obsolete alias indent-relative-maybe. * lisp/obsolete/vi.el (vi-com-map): Use indent-relative-first-indent-point in place of its obsolete alias indent-relative-maybe. (cherry picked from commit 0e468a620458fecd003c396050aa6deb722982c1)
* | Replace ‘/* FALLTHROUGH! */’ with ‘break;’Paul Eggert2019-04-291-12/+11
| | | | | | | | | | | | * src/data.c (set_internal, set_default_internal): Replace obsolescent /* FALLTHROUGH! */ comments with ‘break;’, as ‘FALLTHROUGH;’ is not needed here.
* | * test/lisp/net/tramp-tests.el (tramp--test-timeout-handler): Instrument.Michael Albinus2019-04-291-0/+4
| |
* | Avoid compilation warnings in w32.cEli Zaretskii2019-04-291-2/+2
| | | | | | | | | | | | * src/w32.c (unsetenv, readlink): Use memcpy instead of strncpy, to avoid a compiler warning about calculating the bound of the copy.
* | Replace use of obsolete string-make-unibyteNoam Postavsky2019-04-282-5/+46
| | | | | | | | | | | | * lisp/image-file.el (insert-image-file): Use encode-coding-region instead of string-make-unibyte. * test/lisp/image-file-tests.el: New test.
* | ; Add test for previous changeNoam Postavsky2019-04-281-0/+13
| | | | | | | | | | * test/lisp/progmodes/python-tests.el (python-indent-hanging-close-paren): New test.
* | python.el: Fix close paren indentation to match pep8 (Bug#20742)Tommi Komulainen2019-04-281-3/+9
| | | | | | | | | | | | | | | | | | * lisp/progmodes/python.el (python-indent--calculate-indentation): When opening paren is followed by newline the closing paren should follow the current indentation. Otherwise the closing paren should be aligned with the opening paren. This fixes the latter case. Copyright-paperwork-exempt: yes
* | Update from GMPPaul Eggert2019-04-283-227/+336
| | | | | | | | | | | | | | | | * admin/update-copyright (updatable_files): Don’t update copyright year on files copied from GMP, so that they’re identical to upstream. * src/mini-gmp.c, src/mini-gmp.h: Copy from GMP development versions as of 2019-01-01 20:15:39 UTC.
* | Export major version of latest Emacs supported by emacs-module.h.Philipp Stephani2019-04-285-0/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This is useful if module authors want to support multiple versions of emacs-module.h. * configure.ac (emacs_major_version): Define substitution. * src/emacs-module.h.in (EMACS_MAJOR_VERSION): Define macro. * doc/lispref/internals.texi (Module Initialization): Document EMACS_MAJOR_VERSION preprocessor macro. * test/data/emacs-module/mod-test.c (emacs_module_init): Verify behavior of EMACS_MAJOR_VERSION.
* | Fix another compilation warning.Philipp Stephani2019-04-281-1/+1
| | | | | | | | | | * test/src/emacs-module-tests.el (multiply-string): Remove unused variable ‘i’.
* | Also regenerate emacs-module.h if module-env-*.h changes.Philipp Stephani2019-04-281-1/+2
| | | | | | | | | | * Makefile.in (CONFIG_STATUS_FILES_IN): Add versioned environment header fragments.
* | * src/emacs-module.c (funcall_module): Add a nontrivial assertionPhilipp Stephani2019-04-281-0/+5
| |
* | Fix a few minor compilation and Checkdoc warnings.Philipp Stephani2019-04-281-1/+10
| | | | | | | | | | | | * test/src/emacs-module-tests.el: Add package name and standard sections. (multiply-string): Add a docstring.
* | * test/src/emacs-module-tests.el: Switch to lexical binding.Philipp Stephani2019-04-281-1/+1
| |
* | Fix names of functions in last commitEli Zaretskii2019-04-284-24/+30
| | | | | | | | | | | | | | * src/coding.h (build_string_from_utf8): Rename from build_utf8_string. All callers changed. * src/coding.c (make_string_from_utf8): Rename from make_utf8_string. All callers changed.
* | Refactoring: move UTF-8 decoding functions into coding.h.Philipp Stephani2019-04-284-64/+42
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | json_make_string and json_build_string are generally useful and not JSON-specific. Move them to coding.[ch]. * src/coding.h (build_utf8_string): Move from json.c. * src/coding.c (make_utf8_string): Move from json.c. * src/json.c (json_make_string, json_build_string): Move to coding.[ch]. Split out JSON-specific comment. (json_parse_error, Fjson_serialize, json_to_lisp): Fix callers. * src/emacs-module.c (module_make_function, module_make_string): Use new functions. (module_decode, module_decode_copy): Remove.
* | Fix slow scrolling in C++ buffers with lots of template delimiters.Alan Mackenzie2019-04-271-1/+3
| | | | | | | | | | | | | | * lisp/progmodes/cc-engine.el (c-update-brace-stack): bind c-parse-and-markup-<>-arglists and c-restricted-<>-arglists to t around the call to c-forward-<>-arglist, to force the marking of template delimiters with syntax-table text properties.
* | Fix -nw sessions on MS-Windows broken by a recent commitEli Zaretskii2019-04-271-0/+2
| | | | | | | | | | * src/w32console.c: Include dispextern.h. (initialize_w32_display): Populate defined_color_hook.
* | Fix MS-Windows build broken by a recent commitEli Zaretskii2019-04-271-1/+1
| | | | | | | | | | * src/w32term.c (w32_new_focus_frame): Fix a typo in a recent commit.
* | Fix --with-x-toolkit=no build breakageYAMAMOTO Mitsuharu2019-04-273-5/+5
| | | | | | | | | | | | | | | | * oldXMenu/Create.c (XMenuCreate): Add const modifier to variable def_val. * oldXMenu/Create.c: * src/frame.h: Add const modifier to return type of x_get_resource_string. * src/frame.c (x_get_resource_string): Exempt x_get_string_resource from renaming generic x_* identifiers.
* | Update multicolor font support statusYAMAMOTO Mitsuharu2019-04-272-3/+9
| | | | | | | | | | * etc/NEWS: Mention multicolor font support on Cairo and NS. * src/macfont.m (macfont_list): Re-enable color bitmap fonts.
* | * src/frame.c (x_get_resource_string): Fix typoAlexander Gramiak2019-04-261-1/+1
| |
* | * src/xdisp.c: Only check FRAME_RIF for graphical framesAlexander Gramiak2019-04-261-3/+6
| |
* | Rename x_highlight_frame property to highlight_frameAlexander Gramiak2019-04-267-50/+50
| | | | | | | | | | | | | | | | | | | | * src/nsterm.h: * src/nsterm.m: * src/w32term.c: * src/w32term.h: * src/xdisp.c: * src/xterm.c: * src/xterm.h: Rename.
* | Check for existence of terminal hooks before useAlexander Gramiak2019-04-263-22/+33
| | | | | | | | | | | | | | | | | | This should not be necessary, and is merely a precaution. For background, see: https://lists.gnu.org/archive/html/emacs-devel/2019-04/msg00639.html * src/frame.c: * src/xdisp.c: Check for existence of terminal hooks before use.
* | Add terminal hook query_frame_background_colorAlexander Gramiak2019-04-265-19/+35
| | | | | | | | | | | | | | | | | | | | | | * src/termhooks.c (query_frame_background_color): New terminal hook. * src/image.c (image_query_frame_background_color): Remove. Use the terminal hook instead. * src/nsterm.m: * src/w32term.c: * src/xterm.c: Implement and set the new terminal hook.
* | Add terminal hook defined_color_hookAlexander Gramiak2019-04-2612-67/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * src/termhooks.h (defined_color_hook): New terminal hook. * src/xterm.c: * src/nsterm.m: * src/term.c: * src/w32term.c: Set defined_color_hook. * src/xfaces.c: Use defined_color_hook. (defined_color): Remove. * src/image.c: Remove redefinitions of x_defined_color, and use defined_color_hook.
* | Rename generic x_* identifiersAlexander Gramiak2019-04-2632-1805/+2040
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * src/image.c: Rename x_* procedures to image_*. * src/frame.c: Rename x_* procedures to gui_*. Rename xrdb_get_resource to gui_display_get_resource. Rename x_get_arg to gui_display_get arg. * src/frame.h: Rename can_x_set_window_size to can_set_window_size. * src/xfaces.c: Rename realize_x_face to realize_gui_face. Rename x_supports_face_attributes_p to gui_supports_face_attributes_p. * src/keyboard.c: * src/lisp.h: * src/nsterm.m: * src/w32term.c: * src/xterm.c: Rename x_get_keysym_name to get_keysym_name. * src/nsfns.c: * src/nsterm.m: Rename x_* procedures to ns_*. * src/w32fns.c: * src/w32term.c: Rename x_* procedures to w32_*. * src/termhooks.h (query_colors, get_focus_frame, focus_frame_hook) (frame_visible_invisible_hook, iconify_frame_hook) (set_window_size_hook, set_frame_offset_hook, set_frame_alpha_hook) (set_new_font_hook, set_bitmap_icon_hook, implicit_set_name_hook) (activate_menubar_hook, change_tool_bar_height_hook) (set_scroll_bar_default_width_hook) (set_scroll_bar_default_height_hook, get_string_resource_hook): New terminal hooks to replace backend-specific x_* procedures. * src/dispextern.h (clear_under_internal_border): New RIF procedure. * src/alloc.c: * src/frame.c: * src/xdisp.c: Use FRAME_OUTPUT_DATA instead of FRAME_X_OUTPUT. * src/frame.c: * src/w32term.c: * src/w32fns.c: Use FRAME_NATIVE_WINDOW instead of FRAME_X_WINDOW.
* | Add prefixes to some window system-dependent proceduresAlexander Gramiak2019-04-266-50/+53
| | | | | | | | | | | | | | | | | | | | | | | | | | * src/nsterm.m (note_mouse_movement): * src/w32fns.c (construct_console_modifiers): * src/w32inevt.c: * src/w32term.c (frame_highlight, frame_unhighlight) (construct_mouse_click, construct_mouse_wheel, construct_drag_n_drop) (lispy_file_action, queue_notifications, note_mouse_movement): * src/w32term.h: * src/xterm.c (frame_highlight, frame_unhighlight) (construct_mouse_click, note_mouse_movement, get_current_wm_state): Add and use window system prefixes.
* | Rename generic x_* procedures in xdisp.cAlexander Gramiak2019-04-2610-118/+117
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * src/xdisp.c (x_consider_frame_title, x_get_glyph_overhangs) (x_produce_glyphs, x_write_glyphs, x_insert_glyphs) (x_clear_end_of_line), x_fix_overlapping_area) (x_update_cursor, x_clear_cursor, x_clear_window_mouse_face) (x_draw_vertical_border, x_draw_right_divider, x_draw_bottom_divider) (x_intersect_rectangles): Rename with a gui prefix to indicate non-X-specific functionality. * src/composite.c: * src/dispextern.h: * src/nsfns.m: * src/nsterm.m: * src/w32fns.c: * src/w32term.c: * src/window.c: * src/xfns.c: * src/xterm.c: Use the renamed procedures.
* | Avoid assertion violations in calculating line-number widthEli Zaretskii2019-04-261-2/+5
| | | | | | | | | | | | * src/indent.c (line_number_display_width): Don't use the window's start marker if it belongs to a different buffer. (Bug#35429)
* | * lib-src/profile.c: Delete long-obsolete fileStefan Monnier2019-04-262-102/+1
| | | | | | | | | | | | | | | | This auxiliary executable was used by the old `profile.el` which later inspired `elp.el`. It was made obsolete when Emacs acquired native timers. * lib-src/Makefile.in (UTILITIES): Remove profile. (profile${EXEEXT}): Delete rule.
* | Handle quoted file names in tramp-archive.elMichael Albinus2019-04-262-7/+11
| | | | | | | | | | | | | | | | | | * lisp/net/tramp-archive.el (tramp-archive-file-name-p): Suppress quoted file names. (tramp-archive-file-name-handler): Handle quoted file names. * lisp/net/tramp-compat.el (tramp-compat-file-name-quoted-p): Add optional TOP argument.
* | Avoid compiler warning in dynlib.cEli Zaretskii2019-04-261-1/+2
| | | | | | | | | | | | | | | | * src/dynlib.c (dynlib_addr) [WINDOWSNT]: Rename the first argument to be consistent with other platforms. Cast it to 'void *' to avoid compiler warning as result of changing the function's signature as part of the last recent change in dynlib.c.
* | * test/lisp/progmodes/sql-tests.el (sql-tests-buffer-naming-harness):Glenn Morris2019-04-251-1/+1
| | | | | | | | Fix previous for TEST_LOAD_EL=no.
* | Fix the formatting of '\' (including apostrophes) in CC Mode.Alan Mackenzie2019-04-261-1/+13
| | | | | | | | | | | | | | | | | | In particular, the second apostrophe must also get font-lock-warning-face. * lisp/progmodes/cc-mode.el (c-parse-quotes-before-change) (c-parse-quotes-after-change): Add cond arms to recognize and handle the anomalous construct '\'. Correct the handling of c-new-BEG in c-parse-quotes-before-change.