From e6750596ef55352c260c200747bec3303e181fe8 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Fri, 14 Apr 2017 12:42:03 -0700 Subject: [PATCH] ; Spelling and minor wording fixes --- ChangeLog.2 | 2 +- doc/lispref/frames.texi | 4 ++-- lisp/progmodes/xref.el | 2 +- src/frame.c | 6 +++--- src/gtkutil.c | 8 ++++---- 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 @@ 2015-08-07 Phillip Lord - Improve error signalling for seq-subseq + Improve error signaling for seq-subseq * lisp/emacs-lisp/seq.el (seq-subseq): The existing behavior is to error when indexes are too large, but to silently ignore numbers which 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. On MS-Windows the @var{noactivate} argument has no effect. However, if @var{frame} is a child frame (@pxref{Child Frames}), this function -usualy does focus @var{frame} without raising it above other child +usually focuses @var{frame} without raising it above other child frames. 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. child and a parent frame. Also, the relative roles of child and parent frame may be reversed at any time (though it's usually a good idea to keep the size of child frames sufficiently smaller than that of their -parent). An error will be signalled for the attempt to make a frame an +parent). An error will be signaled for the attempt to make a frame an ancestor of itself. 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." (erase-buffer) (call-process-shell-command command nil t) ;; FIXME: What to do when the call fails? - ;; "find: ‘zzgrep’: No such file or directory\n" + ;; "find: ‘foo’: No such file or directory\n" ;; The problem is, find-grep can exit with a nonzero code even ;; when there are some matches in the output. (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, * value to be returned. In that latter case IGNORE is ignored. * * If `frame-windows-min-size' is called, it will make sure that the - * return value accomodates all windows of FRAME respecting the values + * return value accommodates all windows of FRAME respecting the values * of `window-min-height' (`window-min-width' if HORIZONTAL is non-nil). * With IGNORE non-nil the values of these variables are ignored. * @@ -2614,8 +2614,8 @@ store_frame_param (struct frame *f, Lisp_Object prop, Lisp_Object val) } } - /* Check these parameters for circular dependeny. This does not check - for interdependencies between these properties. Hence you can + /* Check each parent-frame and delete-before parameter for a + circular dependency. Do not check between parameters, so you can still create circular dependencies with different properties, for example a chain of frames F1->F2->...Fn such that F1 is an ancestor 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) if (FRAME_GTK_WIDGET (f)) { GtkWindow *gwin = GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)); - gboolean gno_focus_on_map = NILP (no_focus_on_map) ? TRUE : FALSE; + gboolean g_no_focus_on_map = NILP (no_focus_on_map) ? TRUE : FALSE; - gtk_window_set_focus_on_map (gwin, gno_focus_on_map); + gtk_window_set_focus_on_map (gwin, g_no_focus_on_map); } unblock_input (); } @@ -1555,9 +1555,9 @@ xg_set_no_accept_focus (struct frame *f, Lisp_Object no_accept_focus) if (FRAME_GTK_WIDGET (f)) { GtkWindow *gwin = GTK_WINDOW (FRAME_GTK_OUTER_WIDGET (f)); - gboolean gno_accept_focus = NILP (no_accept_focus) ? TRUE : FALSE; + gboolean g_no_accept_focus = NILP (no_accept_focus) ? TRUE : FALSE; - gtk_window_set_accept_focus (gwin, gno_accept_focus); + gtk_window_set_accept_focus (gwin, g_no_accept_focus); } unblock_input (); } 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 hints.decorations = NILP (new_value) ? MWM_DECOR_ALL : 0; block_input (); - /* For some reason the third and fourth argument in the following - call must be identic: In the corresponding XGetWindowProperty - call in getMotifHints, xfwm has the third and seventh arg both + /* For some reason the third and fourth arguments in the following + call must be identical: In the corresponding XGetWindowProperty + call in getMotifHints, xfwm has the third and seventh args both display_info->atoms[MOTIF_WM_HINTS]. Obviously, YMMV. */ XChangeProperty (dpy, FRAME_OUTER_WINDOW (f), prop, prop, 32, PropModeReplace, (unsigned char *) &hints, @@ -3041,9 +3041,9 @@ x_window (struct frame *f, long window_prompting) hints.flags = MWM_HINTS_DECORATIONS; hints.decorations = 0; - /* For some reason the third and fourth argument in the following - call must be identic: In the corresponding XGetWindowProperty - call in getMotifHints, xfwm has the third and seventh arg both + /* For some reason the third and fourth arguments in the following + call must be identical: In the corresponding XGetWindowProperty + call in getMotifHints, xfwm has the third and seventh args both display_info->atoms[MOTIF_WM_HINTS]. Obviously, YMMV. */ XChangeProperty (dpy, FRAME_OUTER_WINDOW (f), prop, prop, 32, PropModeReplace, (unsigned char *) &hints, @@ -3201,9 +3201,9 @@ x_window (struct frame *f) hints.flags = MWM_HINTS_DECORATIONS; hints.decorations = 0; - /* For some reason the third and fourth argument in the following - call must be identic: In the corresponding XGetWindowProperty - call in getMotifHints, xfwm has the third and seventh arg both + /* For some reason the third and fourth arguments in the following + call must be identical: In the corresponding XGetWindowProperty + call in getMotifHints, xfwm has the third and seventh args both display_info->atoms[MOTIF_WM_HINTS]. Obviously, YMMV. */ XChangeProperty (dpy, FRAME_OUTER_WINDOW (f), prop, prop, 32, PropModeReplace, (unsigned char *) &hints, -- 2.39.5