maint: merge stable to default

libinterp/corefcn/environment.cc

@@ -162,12 +162,16 @@ DEFMETHOD (EDITOR, interp, args, nargout,
 @deftypefn  {} {@var{val} =} EDITOR ()
 @deftypefnx {} {@var{old_val} =} EDITOR (@var{new_val})
 @deftypefnx {} {@var{old_val} =} EDITOR (@var{new_val}, "local")
-Query or set the internal variable that specifies the default text editor.
+Query or set the internal variable that specifies the default text editor when
+using the CLI.
 
 The default value is taken from the environment variable
 @w{@env{EDITOR}}@ when Octave starts.  If the environment variable is not
 initialized, @w{@env{EDITOR}}@ will be set to @qcode{"emacs"}.
 
+@emph{Note:} This setting applies when running the CLI.  When using the
+Octave GUI the default editor is specified in the Editor tab of Preferences.
+
 When called from inside a function with the @qcode{"local"} option, the
 variable is changed locally for the function and any subroutines it calls.
 The original variable value is restored when exiting the function.

scripts/miscellaneous/edit.m

@@ -31,7 +31,9 @@
 ## Edit the named function, or change editor settings.
 ##
 ## If @code{edit} is called with the name of a file or function as its
-## argument it will be opened in the text editor defined by @env{EDITOR}.
+## argument it will be opened in the default text editor.  The default editor
+## for the Octave GUI is specified in the Editor tab of Preferences.  The
+## default editor for the CLI is specified by the @code{EDITOR} function.
 ##
 ## @itemize @bullet
 ## @item