diff options
| author | Paul Eggert | 2017-04-14 12:42:03 -0700 |
|---|---|---|
| committer | Paul Eggert | 2017-04-14 12:42:31 -0700 |
| commit | e6750596ef55352c260c200747bec3303e181fe8 (patch) | |
| tree | 58dbe9af98440c8e2fd9f8a8c839e01f17918e01 | |
| parent | fc05d4fec98387097c30a5c60e2f343cb797af26 (diff) | |
| download | emacs-e6750596ef55352c260c200747bec3303e181fe8.tar.gz emacs-e6750596ef55352c260c200747bec3303e181fe8.zip | |
; Spelling and minor wording fixes
| -rw-r--r-- | ChangeLog.2 | 2 | ||||
| -rw-r--r-- | doc/lispref/frames.texi | 4 | ||||
| -rw-r--r-- | lisp/progmodes/xref.el | 2 | ||||
| -rw-r--r-- | src/frame.c | 6 | ||||
| -rw-r--r-- | src/gtkutil.c | 8 | ||||
| -rw-r--r-- | src/xfns.c | 18 |
6 files changed, 20 insertions, 20 deletions
diff --git a/ChangeLog.2 b/ChangeLog.2 index a9e1dd2a117..c1e10b19e1e 100644 --- a/ChangeLog.2 +++ b/ChangeLog.2 | |||
| @@ -26836,7 +26836,7 @@ | |||
| 26836 | 26836 | ||
| 26837 | 2015-08-07 Phillip Lord <phillip.lord@newcastle.ac.uk> | 26837 | 2015-08-07 Phillip Lord <phillip.lord@newcastle.ac.uk> |
| 26838 | 26838 | ||
| 26839 | Improve error signalling for seq-subseq | 26839 | Improve error signaling for seq-subseq |
| 26840 | * lisp/emacs-lisp/seq.el (seq-subseq): The existing behavior is to error | 26840 | * lisp/emacs-lisp/seq.el (seq-subseq): The existing behavior is to error |
| 26841 | when indexes are too large, but to silently ignore numbers which | 26841 | when indexes are too large, but to silently ignore numbers which |
| 26842 | are too negative for lists. String and vector handling errors in | 26842 | are too negative for lists. String and vector handling errors in |
diff --git a/doc/lispref/frames.texi b/doc/lispref/frames.texi index 9a32f0045a2..8fc4d7d6497 100644 --- a/doc/lispref/frames.texi +++ b/doc/lispref/frames.texi | |||
| @@ -2480,7 +2480,7 @@ raise @var{frame} above other frames. | |||
| 2480 | 2480 | ||
| 2481 | On MS-Windows the @var{noactivate} argument has no effect. However, if | 2481 | On MS-Windows the @var{noactivate} argument has no effect. However, if |
| 2482 | @var{frame} is a child frame (@pxref{Child Frames}), this function | 2482 | @var{frame} is a child frame (@pxref{Child Frames}), this function |
| 2483 | usualy does focus @var{frame} without raising it above other child | 2483 | usually focuses @var{frame} without raising it above other child |
| 2484 | frames. | 2484 | frames. |
| 2485 | 2485 | ||
| 2486 | If there is no window system support, this function does nothing. | 2486 | If there is no window system support, this function does nothing. |
| @@ -2835,7 +2835,7 @@ whose window-system window is a child of its display's root window. | |||
| 2835 | child and a parent frame. Also, the relative roles of child and parent | 2835 | child and a parent frame. Also, the relative roles of child and parent |
| 2836 | frame may be reversed at any time (though it's usually a good idea to | 2836 | frame may be reversed at any time (though it's usually a good idea to |
| 2837 | keep the size of child frames sufficiently smaller than that of their | 2837 | keep the size of child frames sufficiently smaller than that of their |
| 2838 | parent). An error will be signalled for the attempt to make a frame an | 2838 | parent). An error will be signaled for the attempt to make a frame an |
| 2839 | ancestor of itself. | 2839 | ancestor of itself. |
| 2840 | 2840 | ||
| 2841 | A child frame is clipped at the native edges (@pxref{Frame Geometry}) | 2841 | A child frame is clipped at the native edges (@pxref{Frame Geometry}) |
diff --git a/lisp/progmodes/xref.el b/lisp/progmodes/xref.el index e9c42a129a8..1ca3e1d1539 100644 --- a/lisp/progmodes/xref.el +++ b/lisp/progmodes/xref.el | |||
| @@ -932,7 +932,7 @@ IGNORES is a list of glob patterns." | |||
| 932 | (erase-buffer) | 932 | (erase-buffer) |
| 933 | (call-process-shell-command command nil t) | 933 | (call-process-shell-command command nil t) |
| 934 | ;; FIXME: What to do when the call fails? | 934 | ;; FIXME: What to do when the call fails? |
| 935 | ;; "find: ‘zzgrep’: No such file or directory\n" | 935 | ;; "find: ‘foo’: No such file or directory\n" |
| 936 | ;; The problem is, find-grep can exit with a nonzero code even | 936 | ;; The problem is, find-grep can exit with a nonzero code even |
| 937 | ;; when there are some matches in the output. | 937 | ;; when there are some matches in the output. |
| 938 | (goto-char (point-min)) | 938 | (goto-char (point-min)) |
diff --git a/src/frame.c b/src/frame.c index fc7982d0d55..282b691c277 100644 --- a/src/frame.c +++ b/src/frame.c | |||
| @@ -337,7 +337,7 @@ DEFUN ("frame-windows-min-size", Fframe_windows_min_size, | |||
| 337 | * value to be returned. In that latter case IGNORE is ignored. | 337 | * value to be returned. In that latter case IGNORE is ignored. |
| 338 | * | 338 | * |
| 339 | * If `frame-windows-min-size' is called, it will make sure that the | 339 | * If `frame-windows-min-size' is called, it will make sure that the |
| 340 | * return value accomodates all windows of FRAME respecting the values | 340 | * return value accommodates all windows of FRAME respecting the values |
| 341 | * of `window-min-height' (`window-min-width' if HORIZONTAL is non-nil). | 341 | * of `window-min-height' (`window-min-width' if HORIZONTAL is non-nil). |
| 342 | * With IGNORE non-nil the values of these variables are ignored. | 342 | * With IGNORE non-nil the values of these variables are ignored. |
| 343 | * | 343 | * |
| @@ -2614,8 +2614,8 @@ store_frame_param (struct frame *f, Lisp_Object prop, Lisp_Object val) | |||
| 2614 | } | 2614 | } |
| 2615 | } | 2615 | } |
| 2616 | 2616 | ||
| 2617 | /* Check these parameters for circular dependeny. This does not check | 2617 | /* Check each parent-frame and delete-before parameter for a |
| 2618 | for interdependencies between these properties. Hence you can | 2618 | circular dependency. Do not check between parameters, so you can |
| 2619 | still create circular dependencies with different properties, for | 2619 | still create circular dependencies with different properties, for |
| 2620 | example a chain of frames F1->F2->...Fn such that F1 is an ancestor | 2620 | example a chain of frames F1->F2->...Fn such that F1 is an ancestor |
| 2621 | frame of Fn and thus cannot be deleted before Fn and a second chain | 2621 | frame of Fn and thus cannot be deleted before Fn and a second chain |
diff --git a/src/gtkutil.c b/src/gtkutil.c index ad3590dfa66..1b63293fe55 100644 --- a/src/gtkutil.c +++ b/src/gtkutil.c | |||
| @@ -1540,9 +1540,9 @@ xg_set_no_focus_on_map (struct frame *f, Lisp_Object no_focus_on_map) | |||
| 1540 | if (FRAME_GTK_WIDGET (f)) | 1540 | if (FRAME_GTK_WIDGET (f)) |
| 1541 | { | 1541 | { |
| 1542 | GtkWindow *gwin = GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)); | 1542 | GtkWindow *gwin = GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)); |
| 1543 | gboolean gno_focus_on_map = NILP (no_focus_on_map) ? TRUE : FALSE; | 1543 | gboolean g_no_focus_on_map = NILP (no_focus_on_map) ? TRUE : FALSE; |
| 1544 | 1544 | ||
| 1545 | gtk_window_set_focus_on_map (gwin, gno_focus_on_map); | 1545 | gtk_window_set_focus_on_map (gwin, g_no_focus_on_map); |
| 1546 | } | 1546 | } |
| 1547 | unblock_input (); | 1547 | unblock_input (); |
| 1548 | } | 1548 | } |
| @@ -1555,9 +1555,9 @@ xg_set_no_accept_focus (struct frame *f, Lisp_Object no_accept_focus) | |||
| 1555 | if (FRAME_GTK_WIDGET (f)) | 1555 | if (FRAME_GTK_WIDGET (f)) |
| 1556 | { | 1556 | { |
| 1557 | GtkWindow *gwin = GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)); | 1557 | GtkWindow *gwin = GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)); |
| 1558 | gboolean gno_accept_focus = NILP (no_accept_focus) ? TRUE : FALSE; | 1558 | gboolean g_no_accept_focus = NILP (no_accept_focus) ? TRUE : FALSE; |
| 1559 | 1559 | ||
| 1560 | gtk_window_set_accept_focus (gwin, gno_accept_focus); | 1560 | gtk_window_set_accept_focus (gwin, g_no_accept_focus); |
| 1561 | } | 1561 | } |
| 1562 | unblock_input (); | 1562 | unblock_input (); |
| 1563 | } | 1563 | } |
diff --git a/src/xfns.c b/src/xfns.c index 3257805cabb..e463391c74a 100644 --- a/src/xfns.c +++ b/src/xfns.c | |||
| @@ -799,9 +799,9 @@ x_set_undecorated (struct frame *f, Lisp_Object new_value, Lisp_Object old_value | |||
| 799 | hints.decorations = NILP (new_value) ? MWM_DECOR_ALL : 0; | 799 | hints.decorations = NILP (new_value) ? MWM_DECOR_ALL : 0; |
| 800 | 800 | ||
| 801 | block_input (); | 801 | block_input (); |
| 802 | /* For some reason the third and fourth argument in the following | 802 | /* For some reason the third and fourth arguments in the following |
| 803 | call must be identic: In the corresponding XGetWindowProperty | 803 | call must be identical: In the corresponding XGetWindowProperty |
| 804 | call in getMotifHints, xfwm has the third and seventh arg both | 804 | call in getMotifHints, xfwm has the third and seventh args both |
| 805 | display_info->atoms[MOTIF_WM_HINTS]. Obviously, YMMV. */ | 805 | display_info->atoms[MOTIF_WM_HINTS]. Obviously, YMMV. */ |
| 806 | XChangeProperty (dpy, FRAME_OUTER_WINDOW (f), prop, prop, 32, | 806 | XChangeProperty (dpy, FRAME_OUTER_WINDOW (f), prop, prop, 32, |
| 807 | PropModeReplace, (unsigned char *) &hints, | 807 | PropModeReplace, (unsigned char *) &hints, |
| @@ -3041,9 +3041,9 @@ x_window (struct frame *f, long window_prompting) | |||
| 3041 | hints.flags = MWM_HINTS_DECORATIONS; | 3041 | hints.flags = MWM_HINTS_DECORATIONS; |
| 3042 | hints.decorations = 0; | 3042 | hints.decorations = 0; |
| 3043 | 3043 | ||
| 3044 | /* For some reason the third and fourth argument in the following | 3044 | /* For some reason the third and fourth arguments in the following |
| 3045 | call must be identic: In the corresponding XGetWindowProperty | 3045 | call must be identical: In the corresponding XGetWindowProperty |
| 3046 | call in getMotifHints, xfwm has the third and seventh arg both | 3046 | call in getMotifHints, xfwm has the third and seventh args both |
| 3047 | display_info->atoms[MOTIF_WM_HINTS]. Obviously, YMMV. */ | 3047 | display_info->atoms[MOTIF_WM_HINTS]. Obviously, YMMV. */ |
| 3048 | XChangeProperty (dpy, FRAME_OUTER_WINDOW (f), prop, prop, 32, | 3048 | XChangeProperty (dpy, FRAME_OUTER_WINDOW (f), prop, prop, 32, |
| 3049 | PropModeReplace, (unsigned char *) &hints, | 3049 | PropModeReplace, (unsigned char *) &hints, |
| @@ -3201,9 +3201,9 @@ x_window (struct frame *f) | |||
| 3201 | hints.flags = MWM_HINTS_DECORATIONS; | 3201 | hints.flags = MWM_HINTS_DECORATIONS; |
| 3202 | hints.decorations = 0; | 3202 | hints.decorations = 0; |
| 3203 | 3203 | ||
| 3204 | /* For some reason the third and fourth argument in the following | 3204 | /* For some reason the third and fourth arguments in the following |
| 3205 | call must be identic: In the corresponding XGetWindowProperty | 3205 | call must be identical: In the corresponding XGetWindowProperty |
| 3206 | call in getMotifHints, xfwm has the third and seventh arg both | 3206 | call in getMotifHints, xfwm has the third and seventh args both |
| 3207 | display_info->atoms[MOTIF_WM_HINTS]. Obviously, YMMV. */ | 3207 | display_info->atoms[MOTIF_WM_HINTS]. Obviously, YMMV. */ |
| 3208 | XChangeProperty (dpy, FRAME_OUTER_WINDOW (f), prop, prop, 32, | 3208 | XChangeProperty (dpy, FRAME_OUTER_WINDOW (f), prop, prop, 32, |
| 3209 | PropModeReplace, (unsigned char *) &hints, | 3209 | PropModeReplace, (unsigned char *) &hints, |