diff options
| author | Michal Nazarewicz | 2014-03-03 22:14:11 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2014-03-03 22:14:11 -0500 |
| commit | 5b87d0d9cd65911aca0b99a44bc5f79c44938753 (patch) | |
| tree | f9acca1539bc7143620f5588c1c0da13f51d89fc /src | |
| parent | 757c70af04476ffdaf24cee8d0d2ecd175635aeb (diff) | |
| download | emacs-5b87d0d9cd65911aca0b99a44bc5f79c44938753.tar.gz emacs-5b87d0d9cd65911aca0b99a44bc5f79c44938753.zip | |
* binding.el: Add comment describing why C-d binds to `delete-char'.
* lisp/simple.el (delete-forward-char): Mark as interactive-only.
* src/cmds.c (delete-char): Update docstring pointing out that the
function ignores `delete-active-region' and `overwrite-mode'.
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 63 | ||||
| -rw-r--r-- | src/cmds.c | 3 |
2 files changed, 36 insertions, 30 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index d23edda95a2..9ca2d811f27 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2014-03-04 Michal Nazarewicz <mina86@mina86.com> | ||
| 2 | |||
| 3 | * cmds.c (delete-char): Update docstring pointing out that the | ||
| 4 | function ignores `delete-active-region' and `overwrite-mode'. | ||
| 5 | |||
| 1 | 2014-03-03 Eli Zaretskii <eliz@gnu.org> | 6 | 2014-03-03 Eli Zaretskii <eliz@gnu.org> |
| 2 | 7 | ||
| 3 | * font.c (Fframe_font_cache): Fix last change. (Bug#16930) | 8 | * font.c (Fframe_font_cache): Fix last change. (Bug#16930) |
| @@ -307,11 +312,11 @@ | |||
| 307 | 312 | ||
| 308 | 2014-02-06 Eli Zaretskii <eliz@gnu.org> | 313 | 2014-02-06 Eli Zaretskii <eliz@gnu.org> |
| 309 | 314 | ||
| 310 | * w32.c (pMultiByteToWideChar, pWideCharToMultiByte): New | 315 | * w32.c (pMultiByteToWideChar, pWideCharToMultiByte): |
| 311 | variables: pointers through which to call the respective APIs. | 316 | New variables: pointers through which to call the respective APIs. |
| 312 | (filename_to_utf16, filename_from_utf16, filename_to_ansi) | 317 | (filename_to_utf16, filename_from_utf16, filename_to_ansi) |
| 313 | (filename_from_ansi, sys_link, check_windows_init_file): Call | 318 | (filename_from_ansi, sys_link, check_windows_init_file): |
| 314 | MultiByteToWideChar and WideCharToMultiByte through pointers. | 319 | Call MultiByteToWideChar and WideCharToMultiByte through pointers. |
| 315 | This is required on Windows 9X, where we dynamically load | 320 | This is required on Windows 9X, where we dynamically load |
| 316 | UNICOWS.DLL which has their non-stub implementations. | 321 | UNICOWS.DLL which has their non-stub implementations. |
| 317 | (maybe_load_unicows_dll): Assign addresses to these 2 function | 322 | (maybe_load_unicows_dll): Assign addresses to these 2 function |
| @@ -321,8 +326,8 @@ | |||
| 321 | MultiByteToWideChar and WideCharToMultiByte through function | 326 | MultiByteToWideChar and WideCharToMultiByte through function |
| 322 | pointers. | 327 | pointers. |
| 323 | 328 | ||
| 324 | * w32.h (pMultiByteToWideChar, pWideCharToMultiByte): New | 329 | * w32.h (pMultiByteToWideChar, pWideCharToMultiByte): |
| 325 | declarations. | 330 | New declarations. |
| 326 | 331 | ||
| 327 | 2014-02-06 Jan Djärv <jan.h.d@swipnet.se> | 332 | 2014-02-06 Jan Djärv <jan.h.d@swipnet.se> |
| 328 | 333 | ||
| @@ -362,8 +367,8 @@ | |||
| 362 | * w32menu.c (w32_popup_dialog): Don't condition the whole function | 367 | * w32menu.c (w32_popup_dialog): Don't condition the whole function |
| 363 | on HAVE_DIALOGS. If the dialog is "simple", pop up a message box | 368 | on HAVE_DIALOGS. If the dialog is "simple", pop up a message box |
| 364 | to show it; otherwise return 'unsupported--w32-dialog' to signal | 369 | to show it; otherwise return 'unsupported--w32-dialog' to signal |
| 365 | to the caller that emulation with menus is necessary. This | 370 | to the caller that emulation with menus is necessary. |
| 366 | resurrects code inadvertently deleted by the 2013-10-08 commit. | 371 | This resurrects code inadvertently deleted by the 2013-10-08 commit. |
| 367 | (Bug#16636) | 372 | (Bug#16636) |
| 368 | (syms_of_w32menu): DEFSYM Qunsupported__w32_dialog. | 373 | (syms_of_w32menu): DEFSYM Qunsupported__w32_dialog. |
| 369 | 374 | ||
| @@ -471,8 +476,8 @@ | |||
| 471 | from 2013-03-29. | 476 | from 2013-03-29. |
| 472 | (move_it_to): Re-remove reference to last_max_ascent. | 477 | (move_it_to): Re-remove reference to last_max_ascent. |
| 473 | (Fwindow_text_pixel_size): Add iterator's max_ascent and | 478 | (Fwindow_text_pixel_size): Add iterator's max_ascent and |
| 474 | max_descent here instead of calling line_bottom_y. Fix | 479 | max_descent here instead of calling line_bottom_y. |
| 475 | doc-string. | 480 | Fix doc-string. |
| 476 | 481 | ||
| 477 | 2014-01-28 Dmitry Antipov <dmantipov@yandex.ru> | 482 | 2014-01-28 Dmitry Antipov <dmantipov@yandex.ru> |
| 478 | 483 | ||
| @@ -537,8 +542,8 @@ | |||
| 537 | 542 | ||
| 538 | 2014-01-24 Dmitry Antipov <dmantipov@yandex.ru> | 543 | 2014-01-24 Dmitry Antipov <dmantipov@yandex.ru> |
| 539 | 544 | ||
| 540 | * xdisp.c (reseat_1, Fcurrent_bidi_paragraph_direction): Avoid | 545 | * xdisp.c (reseat_1, Fcurrent_bidi_paragraph_direction): |
| 541 | undefined behavior by initializing display property bit of a | 546 | Avoid undefined behavior by initializing display property bit of a |
| 542 | string processed by the bidirectional iterator. For details, see | 547 | string processed by the bidirectional iterator. For details, see |
| 543 | <http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01920.html>. | 548 | <http://lists.gnu.org/archive/html/emacs-devel/2014-01/msg01920.html>. |
| 544 | 549 | ||
| @@ -637,8 +642,8 @@ | |||
| 637 | 642 | ||
| 638 | 2014-01-13 Daniel Colascione <dancol@dancol.org> | 643 | 2014-01-13 Daniel Colascione <dancol@dancol.org> |
| 639 | 644 | ||
| 640 | * textprop.c (Fremove_list_of_text_properties): Correctly | 645 | * textprop.c (Fremove_list_of_text_properties): |
| 641 | handle reaching the end of the interval tree. (Bug#15344) | 646 | Correctly handle reaching the end of the interval tree. (Bug#15344) |
| 642 | 647 | ||
| 643 | 2014-01-13 Martin Rudalics <rudalics@gmx.at> | 648 | 2014-01-13 Martin Rudalics <rudalics@gmx.at> |
| 644 | 649 | ||
| @@ -651,7 +656,7 @@ | |||
| 651 | * macfont.m: Include termchar.h. | 656 | * macfont.m: Include termchar.h. |
| 652 | (CG_SET_FILL_COLOR_WITH_FACE_FOREGROUND) | 657 | (CG_SET_FILL_COLOR_WITH_FACE_FOREGROUND) |
| 653 | (CG_SET_FILL_COLOR_WITH_FACE_BACKGROUND) | 658 | (CG_SET_FILL_COLOR_WITH_FACE_BACKGROUND) |
| 654 | (CG_SET_STROKE_COLOR_WITH_FACE_FOREGROUND): Modified from | 659 | (CG_SET_STROKE_COLOR_WITH_FACE_FOREGROUND): Modify from |
| 655 | *_WITH_GC_* to take face and f as parameters. | 660 | *_WITH_GC_* to take face and f as parameters. |
| 656 | (macfont_draw): Check for DRAW_MOUSE_FACE and set face accordingly. | 661 | (macfont_draw): Check for DRAW_MOUSE_FACE and set face accordingly. |
| 657 | Use *_WITH_FACE_*, and pass face as parameter (Bug#16425). | 662 | Use *_WITH_FACE_*, and pass face as parameter (Bug#16425). |
| @@ -695,8 +700,8 @@ | |||
| 695 | 2014-01-10 Martin Rudalics <rudalics@gmx.at> | 700 | 2014-01-10 Martin Rudalics <rudalics@gmx.at> |
| 696 | 701 | ||
| 697 | Fix handling of internal borders (Bug#16348). | 702 | Fix handling of internal borders (Bug#16348). |
| 698 | * dispnew.c (adjust_frame_glyphs_for_window_redisplay): Remove | 703 | * dispnew.c (adjust_frame_glyphs_for_window_redisplay): |
| 699 | internal border width from pixel width of windows. | 704 | Remove internal border width from pixel width of windows. |
| 700 | (change_frame_size_1): Don't return early when frame's pixel | 705 | (change_frame_size_1): Don't return early when frame's pixel |
| 701 | size changes - we still have to record the new sizes in the | 706 | size changes - we still have to record the new sizes in the |
| 702 | frame structure. | 707 | frame structure. |
| @@ -705,14 +710,14 @@ | |||
| 705 | * window.c (check_frame_size): Include internal_border_width in | 710 | * window.c (check_frame_size): Include internal_border_width in |
| 706 | check. | 711 | check. |
| 707 | * xdisp.c (Ftool_bar_height): Fix doc-string typo. | 712 | * xdisp.c (Ftool_bar_height): Fix doc-string typo. |
| 708 | * xfns.c (x_set_menu_bar_lines, x_set_tool_bar_lines): In | 713 | * xfns.c (x_set_menu_bar_lines, x_set_tool_bar_lines): |
| 709 | non-toolkit/non-GTK version clear internal border. | 714 | In non-toolkit/non-GTK version clear internal border. |
| 710 | * xterm.c (x_clear_under_internal_border): New function for | 715 | * xterm.c (x_clear_under_internal_border): New function for |
| 711 | non-toolkit/non-GTK version. | 716 | non-toolkit/non-GTK version. |
| 712 | (x_after_update_window_line): In non-toolkit/non-GTK version | 717 | (x_after_update_window_line): In non-toolkit/non-GTK version |
| 713 | don't do that. | 718 | don't do that. |
| 714 | (handle_one_xevent, x_set_window_size): Call | 719 | (handle_one_xevent, x_set_window_size): |
| 715 | x_clear_under_internal_border in non-toolkit/non-GTK version. | 720 | Call x_clear_under_internal_border in non-toolkit/non-GTK version. |
| 716 | * xterm.h (x_clear_under_internal_border): Extern it. | 721 | * xterm.h (x_clear_under_internal_border): Extern it. |
| 717 | 722 | ||
| 718 | 2014-01-07 Paul Eggert <eggert@cs.ucla.edu> | 723 | 2014-01-07 Paul Eggert <eggert@cs.ucla.edu> |
| @@ -767,8 +772,8 @@ | |||
| 767 | 2014-01-02 Martin Rudalics <rudalics@gmx.at> | 772 | 2014-01-02 Martin Rudalics <rudalics@gmx.at> |
| 768 | 773 | ||
| 769 | Further adjust frame/window scrollbar width calculations. | 774 | Further adjust frame/window scrollbar width calculations. |
| 770 | * window.c (apply_window_adjustment): Set | 775 | * window.c (apply_window_adjustment): |
| 771 | windows_or_buffers_changed. | 776 | Set windows_or_buffers_changed. |
| 772 | (Fwindow_scroll_bars): Return actual scrollbar width. | 777 | (Fwindow_scroll_bars): Return actual scrollbar width. |
| 773 | * xfns.c (x_set_scroll_bar_default_width): Rename wid to unit. | 778 | * xfns.c (x_set_scroll_bar_default_width): Rename wid to unit. |
| 774 | For non-toolkit builds again use 14 as minimum width and set | 779 | For non-toolkit builds again use 14 as minimum width and set |
| @@ -843,8 +848,8 @@ | |||
| 843 | (globals_of_w32): Initialize them to zero. | 848 | (globals_of_w32): Initialize them to zero. |
| 844 | (set_named_security_info): Set them to non-zero if the | 849 | (set_named_security_info): Set them to non-zero if the |
| 845 | corresponding API is available. | 850 | corresponding API is available. |
| 846 | (SetNamedSecurityInfoW_Proc, SetNamedSecurityInfoA_Proc): New | 851 | (SetNamedSecurityInfoW_Proc, SetNamedSecurityInfoA_Proc): |
| 847 | function typedefs. | 852 | New function typedefs. |
| 848 | 853 | ||
| 849 | 2013-12-31 Martin Rudalics <rudalics@gmx.at> | 854 | 2013-12-31 Martin Rudalics <rudalics@gmx.at> |
| 850 | 855 | ||
| @@ -1464,8 +1469,8 @@ | |||
| 1464 | ANSI and Unicode APIs. Use the latter if w32_unicode_filenames is | 1469 | ANSI and Unicode APIs. Use the latter if w32_unicode_filenames is |
| 1465 | non-zero, else the former. | 1470 | non-zero, else the former. |
| 1466 | (codepage_for_filenames, filename_to_utf16, ) | 1471 | (codepage_for_filenames, filename_to_utf16, ) |
| 1467 | (filename_from_utf16, filename_to_ansi, filename_from_ansi): New | 1472 | (filename_from_utf16, filename_to_ansi, filename_from_ansi): |
| 1468 | functions. | 1473 | New functions. |
| 1469 | (init_user_info): Allow $HOME and $SHELL to include non-ANSI | 1474 | (init_user_info): Allow $HOME and $SHELL to include non-ANSI |
| 1470 | characters. | 1475 | characters. |
| 1471 | (normalize_filename): Lose the DBCS code, now works on UTF-8. | 1476 | (normalize_filename): Lose the DBCS code, now works on UTF-8. |
| @@ -1608,8 +1613,8 @@ | |||
| 1608 | * xterm.c (x_make_frame_visible): Restore hack which is needed when | 1613 | * xterm.c (x_make_frame_visible): Restore hack which is needed when |
| 1609 | input polling is used. This is still meaningful for Cygwin, see | 1614 | input polling is used. This is still meaningful for Cygwin, see |
| 1610 | http://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00351.html. | 1615 | http://lists.gnu.org/archive/html/emacs-devel/2013-12/msg00351.html. |
| 1611 | * keyboard.c (poll_for_input_1, input_polling_used): Define | 1616 | * keyboard.c (poll_for_input_1, input_polling_used): |
| 1612 | unconditionally. | 1617 | Define unconditionally. |
| 1613 | * dispextern.h (FACE_SUITABLE_FOR_CHAR_P): Remove unused macro. | 1618 | * dispextern.h (FACE_SUITABLE_FOR_CHAR_P): Remove unused macro. |
| 1614 | (FACE_FOR_CHAR): Simplify because face_for_char does the same. | 1619 | (FACE_FOR_CHAR): Simplify because face_for_char does the same. |
| 1615 | * fontset.c (face_suitable_for_char_p) [0]: Remove unused function. | 1620 | * fontset.c (face_suitable_for_char_p) [0]: Remove unused function. |
diff --git a/src/cmds.c b/src/cmds.c index fdc3fcac281..7459908828d 100644 --- a/src/cmds.c +++ b/src/cmds.c | |||
| @@ -229,7 +229,8 @@ Optional second arg KILLFLAG non-nil means kill instead (save in kill ring). | |||
| 229 | Interactively, N is the prefix arg, and KILLFLAG is set if | 229 | Interactively, N is the prefix arg, and KILLFLAG is set if |
| 230 | N was explicitly specified. | 230 | N was explicitly specified. |
| 231 | 231 | ||
| 232 | The command `delete-forward-char' is preferable for interactive use. */) | 232 | The command `delete-forward-char' is preferable for interactive use, e.g. |
| 233 | because it respects values of `delete-active-region' and `overwrite-mode'. */) | ||
| 233 | (Lisp_Object n, Lisp_Object killflag) | 234 | (Lisp_Object n, Lisp_Object killflag) |
| 234 | { | 235 | { |
| 235 | EMACS_INT pos; | 236 | EMACS_INT pos; |