diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2015-08-17 12:00:54 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2015-08-17 12:01:26 -0700 |
| commit | 7f2b98d09d113e0f9b1fffb0524622adfafe3ac4 (patch) | |
| tree | 0bf33b3ebf47f3fcbec56119f043dde60227efcd /src/regex.h | |
| parent | 481859ba71253725f4aed4877b89123e11aaef0c (diff) | |
| download | emacs-7f2b98d09d113e0f9b1fffb0524622adfafe3ac4.tar.gz | |
Curved quotes in --batch diagnostics in non-UTF-8
When run with --batch, check that curved quotes are compatible with
the system locale before outputting them in diagnostics.
Problem reported by Eli Zaretskii in:
http://lists.gnu.org/archive/html/emacs-devel/2015-08/msg00594.html
* lisp/startup.el (command-line): Set internal--text-quoting-flag
after the standard display table is initialized.
* src/doc.c (default_to_grave_quoting_style): New function.
(text_quoting_style): Use it.
(text_quoting_flag): New static var, visible to Lisp as
internal--text-quoting-flag.
* src/emacs.c: Include <wchar.h> if available.
(using_utf8): New function.
(main): Use it to initialize text_quoting_flag.
* src/regex.h (btowc) [WIDE_CHAR_SUPPORT && emacs]:
Don't define, as it's not needed and it clashes with wchar.h.
Diffstat (limited to 'src/regex.h')
| -rw-r--r-- | src/regex.h | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/regex.h b/src/regex.h index 3dfecf0a7e5..c89ca46d4bd 100644 --- a/src/regex.h +++ b/src/regex.h @@ -603,7 +603,9 @@ typedef wchar_t re_wchar_t; # define re_wctype_to_bit(cc) 0 #else # define CHAR_CLASS_MAX_LENGTH 9 /* Namely, `multibyte'. */ -# define btowc(c) c +# ifndef emacs +# define btowc(c) c +# endif /* Character classes. */ typedef enum { RECC_ERROR = 0, |