diff --git a/lisp/cus-start.el b/lisp/cus-start.el index b4d2139022c..8740f075621 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -181,6 +181,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of (repeat (directory :format "%v"))) ;; coding.c (inhibit-eol-conversion mule boolean) + (enable-character-translation mule boolean) (eol-mnemonic-undecided mule string) ;; startup.el fiddles with the values. IMO, would be ;; simpler to just use #ifdefs in coding.c. diff --git a/src/coding.c b/src/coding.c index 9342c3841f6..9d1ebc8a4cb 100644 --- a/src/coding.c +++ b/src/coding.c @@ -11053,7 +11053,7 @@ conversion. */); DEFVAR_BOOL ("inhibit-eol-conversion", inhibit_eol_conversion, doc: /* -*Non-nil means always inhibit code conversion of end-of-line format. +Non-nil means always inhibit code conversion of end-of-line format. See info node `Coding Systems' and info node `Text and Binary' concerning such conversion. */); inhibit_eol_conversion = 0; @@ -11128,27 +11128,27 @@ encoding standard output and error streams. */); /* The eol mnemonics are reset in startup.el system-dependently. */ DEFVAR_LISP ("eol-mnemonic-unix", eol_mnemonic_unix, doc: /* -*String displayed in mode line for UNIX-like (LF) end-of-line format. */); +String displayed in mode line for UNIX-like (LF) end-of-line format. */); eol_mnemonic_unix = build_pure_c_string (":"); DEFVAR_LISP ("eol-mnemonic-dos", eol_mnemonic_dos, doc: /* -*String displayed in mode line for DOS-like (CRLF) end-of-line format. */); +String displayed in mode line for DOS-like (CRLF) end-of-line format. */); eol_mnemonic_dos = build_pure_c_string ("\\"); DEFVAR_LISP ("eol-mnemonic-mac", eol_mnemonic_mac, doc: /* -*String displayed in mode line for MAC-like (CR) end-of-line format. */); +String displayed in mode line for MAC-like (CR) end-of-line format. */); eol_mnemonic_mac = build_pure_c_string ("/"); DEFVAR_LISP ("eol-mnemonic-undecided", eol_mnemonic_undecided, doc: /* -*String displayed in mode line when end-of-line format is not yet determined. */); +String displayed in mode line when end-of-line format is not yet determined. */); eol_mnemonic_undecided = build_pure_c_string (":"); DEFVAR_LISP ("enable-character-translation", Venable_character_translation, doc: /* -*Non-nil enables character translation while encoding and decoding. */); +Non-nil enables character translation while encoding and decoding. */); Venable_character_translation = Qt; DEFVAR_LISP ("standard-translation-table-for-decode", diff --git a/src/font.c b/src/font.c index 556f32bb432..60dd03a20b2 100644 --- a/src/font.c +++ b/src/font.c @@ -5270,7 +5270,7 @@ See `font-weight-table' for the format of the vector. */); ASET (font_style_table, 2, Vfont_width_table); DEFVAR_LISP ("font-log", Vfont_log, doc: /* -*Logging list of font related actions and results. +Logging list of font related actions and results. The value t means to suppress the logging. The initial value is set to nil if the environment variable EMACS_FONT_LOG is set. Otherwise, it is set to t. */);