diff options
| author | Juanma Barranquero | 2002-08-30 17:02:47 +0000 |
|---|---|---|
| committer | Juanma Barranquero | 2002-08-30 17:02:47 +0000 |
| commit | 842a938969739f86aad8060c280e2606d1cda1c3 (patch) | |
| tree | faa643ddc2200878c4ca03e051594427ea827c98 | |
| parent | d9256ccbd3dbf30c172d66eedc52f2e7a803cb6a (diff) | |
| download | emacs-842a938969739f86aad8060c280e2606d1cda1c3.tar.gz emacs-842a938969739f86aad8060c280e2606d1cda1c3.zip | |
(Fx_open_connection): Fix docstring. Patch from Rune Kleveland <runekl@viewpoint.no>.
| -rw-r--r-- | src/ChangeLog | 15 | ||||
| -rw-r--r-- | src/xfns.c | 4 |
2 files changed, 12 insertions, 7 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 77f8118a2f5..e0321af6b0f 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2002-08-30 Juanma Barranquero <lektu@terra.es> | ||
| 2 | |||
| 3 | * xfns.c (Fx_open_connection): Fix error message. Patch from Rune | ||
| 4 | Kleveland <runekl@viewpoint.no>. | ||
| 5 | |||
| 1 | 2002-08-30 Kim F. Storm <storm@cua.dk> | 6 | 2002-08-30 Kim F. Storm <storm@cua.dk> |
| 2 | 7 | ||
| 3 | The following changes consolidates the handling of the cursor | 8 | The following changes consolidates the handling of the cursor |
| @@ -39,7 +44,7 @@ | |||
| 39 | (x_set_cursor_type): Use set_frame_cursor_types. | 44 | (x_set_cursor_type): Use set_frame_cursor_types. |
| 40 | (Qbar, Qbox): Removed. | 45 | (Qbar, Qbox): Removed. |
| 41 | (syms_of_macfns): Don't intern or staticpro them. | 46 | (syms_of_macfns): Don't intern or staticpro them. |
| 42 | 47 | ||
| 43 | * macterm.c (x_specified_cursor_type): Remove prototype. | 48 | * macterm.c (x_specified_cursor_type): Remove prototype. |
| 44 | (x_draw_bar_cursor): Use FRAME_CURSOR_WIDTH. | 49 | (x_draw_bar_cursor): Use FRAME_CURSOR_WIDTH. |
| 45 | (x_display_and_set_cursor): Use get_window_cursor_type. | 50 | (x_display_and_set_cursor): Use get_window_cursor_type. |
| @@ -51,7 +56,7 @@ | |||
| 51 | (struct output_mac) <current_cursor, desired_cursor, cursor_width> | 56 | (struct output_mac) <current_cursor, desired_cursor, cursor_width> |
| 52 | <blink_off_cursor, blink_off_cursor_width>: Members removed. | 57 | <blink_off_cursor, blink_off_cursor_width>: Members removed. |
| 53 | (FRAME_DESIRED_CURSOR): Macro removed. | 58 | (FRAME_DESIRED_CURSOR): Macro removed. |
| 54 | 59 | ||
| 55 | * w32fns.c (Vblink_cursor_alist): Removed. | 60 | * w32fns.c (Vblink_cursor_alist): Removed. |
| 56 | (Qbar, Qhbar, Qbox, Qhollow): Removed. | 61 | (Qbar, Qhbar, Qbox, Qhollow): Removed. |
| 57 | (syms_of_w32fns): Don't intern, staticpro, or define them. | 62 | (syms_of_w32fns): Don't intern, staticpro, or define them. |
| @@ -64,7 +69,7 @@ | |||
| 64 | Remove unused local variables cursor_off_state. | 69 | Remove unused local variables cursor_off_state. |
| 65 | Redraw cursor if hbar cursor width changes. | 70 | Redraw cursor if hbar cursor width changes. |
| 66 | Changed all occurrences of w32_highlight_frame to x_highlight_frame. | 71 | Changed all occurrences of w32_highlight_frame to x_highlight_frame. |
| 67 | 72 | ||
| 68 | * w32term.h (enum text_cursor_kinds): Removed. | 73 | * w32term.h (enum text_cursor_kinds): Removed. |
| 69 | (struct output_w32) <current_cursor, desired_cursor, cursor_width> | 74 | (struct output_w32) <current_cursor, desired_cursor, cursor_width> |
| 70 | <blink_off_cursor, blink_off_cursor_width>: Members removed. | 75 | <blink_off_cursor, blink_off_cursor_width>: Members removed. |
| @@ -72,7 +77,7 @@ | |||
| 72 | (FRAME_BLINK_OFF_CURSOR_WIDTH): Macros removed. | 77 | (FRAME_BLINK_OFF_CURSOR_WIDTH): Macros removed. |
| 73 | (struct w32_display_info) <x_highlight_frame>: Renamed member from | 78 | (struct w32_display_info) <x_highlight_frame>: Renamed member from |
| 74 | w32_highlight_frame. | 79 | w32_highlight_frame. |
| 75 | 80 | ||
| 76 | * xfns.c (Vblink_cursor_alist): Removed. | 81 | * xfns.c (Vblink_cursor_alist): Removed. |
| 77 | (Qbar, Qhbar, Qbox, Qhollow): Removed. | 82 | (Qbar, Qhbar, Qbox, Qhollow): Removed. |
| 78 | (syms_of_xfns): Don't intern, staticpro, or define them. | 83 | (syms_of_xfns): Don't intern, staticpro, or define them. |
| @@ -91,7 +96,7 @@ | |||
| 91 | (FRAME_DESIRED_CURSOR, FRAME_CURSOR_WIDTH, FRAME_BLINK_OFF_CURSOR) | 96 | (FRAME_DESIRED_CURSOR, FRAME_CURSOR_WIDTH, FRAME_BLINK_OFF_CURSOR) |
| 92 | (FRAME_BLINK_OFF_CURSOR_WIDTH): Macros removed. | 97 | (FRAME_BLINK_OFF_CURSOR_WIDTH): Macros removed. |
| 93 | (x_specified_cursor_type): Remove prototype. | 98 | (x_specified_cursor_type): Remove prototype. |
| 94 | 99 | ||
| 95 | 2002-08-28 Richard M. Stallman <rms@gnu.org> | 100 | 2002-08-28 Richard M. Stallman <rms@gnu.org> |
| 96 | 101 | ||
| 97 | * w32fns.c (x_set_cursor_type): Set FRAME_BLINK_OFF_CURSOR and | 102 | * w32fns.c (x_set_cursor_type): Set FRAME_BLINK_OFF_CURSOR and |
diff --git a/src/xfns.c b/src/xfns.c index f3f16d4abe1..58163101f8a 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -5293,8 +5293,8 @@ terminate Emacs if we can't open the connection. */) | |||
| 5293 | if (!NILP (must_succeed)) | 5293 | if (!NILP (must_succeed)) |
| 5294 | fatal ("Cannot connect to X server %s.\n\ | 5294 | fatal ("Cannot connect to X server %s.\n\ |
| 5295 | Check the DISPLAY environment variable or use `-d'.\n\ | 5295 | Check the DISPLAY environment variable or use `-d'.\n\ |
| 5296 | Also use the `xauth' program to verify that you have the proper | 5296 | Also use the `xauth' program to verify that you have the proper\n\ |
| 5297 | authoritization information needed to connect the X server.\n\ | 5297 | authorization information needed to connect the X server.\n\ |
| 5298 | An insecure way to solve the problem may be to use `xhost'.\n", | 5298 | An insecure way to solve the problem may be to use `xhost'.\n", |
| 5299 | SDATA (display)); | 5299 | SDATA (display)); |
| 5300 | else | 5300 | else |