diff --git a/lisp/files.el b/lisp/files.el index 462abaf2dc7..f9341ab5a90 100644 --- a/lisp/files.el +++ b/lisp/files.el @@ -722,12 +722,14 @@ code contained within those files and directories without an explicit request by the user. One important case when this might happen is when `flymake-mode' is enabled (for example, when it is added to a mode hook). -Each element of the list should be a string: + +Each element of the list should be a string naming a file or a directory +by their abbreviated file names: - If it ends in \"/\", it is considered as a directory name and means that Emacs should trust all the files whose name has this directory as a prefix. - Otherwise, it is considered a file name. -Use abbreviated file names. For example, an entry \"~/mycode/\" means -that Emacs will trust all the files in your directory \"mycode\". +For example, an entry \"~/mycode/\" means that Emacs will trust all the +files in the directory \"mycode\" under your home directory. This variable can also be set to `:all', in which case Emacs will trust all files, which opens a gaping security hole. Emacs Lisp authors should note that this value must never be set by a major or minor mode." diff --git a/lisp/textmodes/fill.el b/lisp/textmodes/fill.el index a6858fdea8b..b291cbef390 100644 --- a/lisp/textmodes/fill.el +++ b/lisp/textmodes/fill.el @@ -50,7 +50,7 @@ A value of nil means that any change in indentation starts a new paragraph." :safe #'booleanp) (defcustom fill-separate-heterogeneous-words-with-space nil - "Non-nil means to use a space to separate words of a different kind. + "Non-nil means to use a space to separate words of different scripts. For example, when an English word at the end of a line and a CJK word at the beginning of the next line are joined into a single line, they will be separated by a space if this variable is non-nil. @@ -657,6 +657,10 @@ functions. (In most cases, the variable `fill-column' controls the width.) It leaves point at the beginning of the line following the region. +Note that how paragraph breaks are removed in text that includes +characters from different scripts is affected by the value +of `fill-separate-heterogeneous-words-with-space', which see. + Normally, the command performs justification according to the `current-justification' function, but with a prefix arg, it does full justification instead.