commit bf32130d7debe3ee6dbd9974e50bb4a2a48047f4 (HEAD, refs/remotes/origin/master) Author: Paul Eggert Date: Sat Jun 20 13:35:29 2015 -0700 Improve port of settings UI to older displays * lisp/cus-start.el (standard): Don't assume curved quotes are easily distinguishable when users are tinkering with a setting that affects how curved quotes are generated. diff --git a/lisp/cus-start.el b/lisp/cus-start.el index a246d89..69dbf0d 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -223,10 +223,11 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of ;; doc.c (help-quote-translation help (choice - (character :tag "Quote ‘like this’" :value ?‘) + (character :tag "Quote with curved quotes" + :value ?‘) (character :tag "Quote 'like this'" :value ?\') (character :tag "Quote `like this'" :value ?\`) - (const :tag "Quote ‘like this’ if displayable, 'like this' otherwise" nil)) + (const :tag "Quote with curved quotes if displayable, 'like this' otherwise" nil)) "25.1") ;; dosfns.c (dos-display-scancodes display boolean) commit b1cd8375f618969aab5c2df403a97b7d88064bda Author: Paul Eggert Date: Sat Jun 20 13:33:33 2015 -0700 Fix quoting in electric-quote-mode doc string * lisp/electric.el (electric-quote-mode): Fix quoting. This is a fallout from the recent change introducing ‘help-quote-translation’. diff --git a/lisp/electric.el b/lisp/electric.el index 88b2835..ca05c8c 100644 --- a/lisp/electric.el +++ b/lisp/electric.el @@ -486,7 +486,7 @@ With a prefix argument ARG, enable Electric Quote mode if ARG is positive, and disable it otherwise. If called from Lisp, enable the mode if ARG is omitted or nil. -When enabled, this replaces \\=`foo bar' with ‘foo bar’ and replaces +When enabled, this replaces \\=`foo bar' with \\=‘foo bar\\=’ and replaces \\=`\\=`foo bar'' with “foo bar” as you type. This occurs only in comments, strings, and text paragraphs, and these are selectively controlled with ‘electric-quote-comment’, commit 1b89ea39dde83531f1b97590cb4ea9391d896d0b Author: Paul Eggert Date: Sat Jun 20 10:24:08 2015 -0700 Spelling fix diff --git a/lisp/cus-start.el b/lisp/cus-start.el index 7cf5ce7..a246d89 100644 --- a/lisp/cus-start.el +++ b/lisp/cus-start.el @@ -226,7 +226,7 @@ Leaving \"Default\" unchecked is equivalent with specifying a default of (character :tag "Quote ‘like this’" :value ?‘) (character :tag "Quote 'like this'" :value ?\') (character :tag "Quote `like this'" :value ?\`) - (const :tag "Quote ‘like this’ if displyable, 'like this' otherwise" nil)) + (const :tag "Quote ‘like this’ if displayable, 'like this' otherwise" nil)) "25.1") ;; dosfns.c (dos-display-scancodes display boolean) commit 0e0dae5e87eef0c164f544457f68d808a07cb39b Author: Paul Eggert Date: Sat Jun 20 10:16:36 2015 -0700 * doc/misc/texinfo.tex, lib/set-permissions.c: Merge from gnulib. diff --git a/doc/misc/texinfo.tex b/doc/misc/texinfo.tex index 1a4741d..6095110 100644 --- a/doc/misc/texinfo.tex +++ b/doc/misc/texinfo.tex @@ -3,7 +3,7 @@ % Load plain if necessary, i.e., if running under initex. \expandafter\ifx\csname fmtname\endcsname\relax\input plain\fi % -\def\texinfoversion{2015-06-01.15} +\def\texinfoversion{2015-06-14.15} % % Copyright 1985, 1986, 1988, 1990, 1991, 1992, 1993, 1994, 1995, % 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, @@ -3196,8 +3196,15 @@ end \def\Eogonek{{\ecfont \char"86}}\def\macrocharE{E} \def\eogonek{{\ecfont \char"A6}}\def\macrochare{e} % -% Use the ec* fonts (cm-super in outline format) for non-CM glyphs. -\def\ecfont{% +% Use the European Computer Modern fonts (cm-super in outline format) +% for non-CM glyphs. That is ec* for regular text and tc* for the text +% companion symbols (LaTeX TS1 encoding). Both are part of the ec +% package and follow the same conventions. +% +\def\ecfont{\etcfont{e}} +\def\tcfont{\etcfont{t}} +% +\def\etcfont#1{% % We can't distinguish serif/sans and italic/slanted, but this % is used for crude hacks anyway (like adding French and German % quotes to documents typeset with CM, where we lose kerning), so @@ -3206,14 +3213,14 @@ end \edef\nominalsize{\csname\curfontsize nominalsize\endcsname}% \ifmonospace % typewriter: - \font\thisecfont = ectt\ecsize \space at \nominalsize + \font\thisecfont = #1ctt\ecsize \space at \nominalsize \else \ifx\curfontstyle\bfstylename % bold: - \font\thisecfont = ecb\ifusingit{i}{x}\ecsize \space at \nominalsize + \font\thisecfont = #1cb\ifusingit{i}{x}\ecsize \space at \nominalsize \else % regular: - \font\thisecfont = ec\ifusingit{ti}{rm}\ecsize \space at \nominalsize + \font\thisecfont = #1c\ifusingit{ti}{rm}\ecsize \space at \nominalsize \fi \fi \thisecfont @@ -9021,17 +9028,17 @@ directory should work if nowhere else does.} \def\latonechardefs{% \gdef^^a0{\tie} \gdef^^a1{\exclamdown} - \gdef^^a2{\missingcharmsg{CENT SIGN}} - \gdef^^a3{{\pounds}} - \gdef^^a4{\missingcharmsg{CURRENCY SIGN}} - \gdef^^a5{\missingcharmsg{YEN SIGN}} - \gdef^^a6{\missingcharmsg{BROKEN BAR}} + \gdef^^a2{{\tcfont \char162}} % cent + \gdef^^a3{\pounds} + \gdef^^a4{{\tcfont \char164}} % currency + \gdef^^a5{{\tcfont \char165}} % yen + \gdef^^a6{{\tcfont \char166}} % broken bar \gdef^^a7{\S} \gdef^^a8{\"{}} \gdef^^a9{\copyright} \gdef^^aa{\ordf} \gdef^^ab{\guillemetleft} - \gdef^^ac{$\lnot$} + \gdef^^ac{\ensuremath\lnot} \gdef^^ad{\-} \gdef^^ae{\registeredsymbol} \gdef^^af{\={}} @@ -9396,7 +9403,11 @@ directory should work if nowhere else does.} \def\utfeightchardefs{% \DeclareUnicodeCharacter{00A0}{\tie} \DeclareUnicodeCharacter{00A1}{\exclamdown} + \DeclareUnicodeCharacter{00A2}{{\tcfont \char162}}% 0242=cent \DeclareUnicodeCharacter{00A3}{\pounds} + \DeclareUnicodeCharacter{00A4}{{\tcfont \char164}}% 0244=currency + \DeclareUnicodeCharacter{00A5}{{\tcfont \char165}}% 0245=yen + \DeclareUnicodeCharacter{00A6}{{\tcfont \char166}}% 0246=brokenbar \DeclareUnicodeCharacter{00A7}{\S} \DeclareUnicodeCharacter{00A8}{\"{ }} \DeclareUnicodeCharacter{00A9}{\copyright} diff --git a/lib/set-permissions.c b/lib/set-permissions.c index 2236879..3bcfd31 100644 --- a/lib/set-permissions.c +++ b/lib/set-permissions.c @@ -774,7 +774,7 @@ set_permissions (struct permission_context *ctx, const char *name, int desc) early_chmod = false; # else - /* All other plaforms */ + /* All other platforms */ /* On Cygwin, it is necessary to call chmod before acl, because chmod can change the contents of the ACL (in ways that don't change the allowed accesses, but still visible). */ commit 20514277e2998be6bbecfae60b4a18a1776d570d Author: Paul Eggert Date: Sat Jun 20 10:15:24 2015 -0700 * src/doc.c (syms_of_doc): Remove unused symbols. diff --git a/src/doc.c b/src/doc.c index 2ea416f..d2d3c8d 100644 --- a/src/doc.c +++ b/src/doc.c @@ -1024,8 +1024,6 @@ void syms_of_doc (void) { DEFSYM (Qfunction_documentation, "function-documentation"); - DEFSYM (Qtraditional, "traditional"); - DEFSYM (Qprefer_unicode, "prefer-unicode"); DEFVAR_LISP ("internal-doc-file-name", Vdoc_file_name, doc: /* Name of file containing documentation strings of built-in symbols. */);