Commit 333d54da authored by Paul Eggert's avatar Paul Eggert

Merge from trunk.

parents 90856fe0 620c53a6
......@@ -24,7 +24,7 @@
# the same distribution terms as the rest of that program.
#
# Generated by gnulib-tool.
# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk --no-libtool --macro-prefix=gl --no-vc-files careadlinkat crypto/md5 crypto/sha1 dtoastr filemode getloadavg getopt-gnu ignore-value intprops lstat mktime readlink socklen stdarg stdio strftime strtoumax symlink sys_stat
# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=. --makefile-name=gnulib.mk --conditional-dependencies --no-libtool --macro-prefix=gl --no-vc-files careadlinkat crypto/md5 crypto/sha1 dtoastr filemode getloadavg getopt-gnu ignore-value intprops lstat mktime readlink socklen stdarg stdio strftime strtoumax symlink sys_stat
VPATH = @srcdir@
pkgdatadir = $(datadir)/@PACKAGE@
......@@ -1070,7 +1070,8 @@ c++defs.h: $(top_srcdir)/./c++defs.h
getopt.h: getopt.in.h $(top_builddir)/config.status $(ARG_NONNULL_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \
sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
......@@ -1118,7 +1119,8 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG_N
@GL_GENERATE_STDARG_H_TRUE@stdarg.h: stdarg.in.h $(top_builddir)/config.status
@GL_GENERATE_STDARG_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \
@GL_GENERATE_STDARG_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
@GL_GENERATE_STDARG_H_TRUE@ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@GL_GENERATE_STDARG_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \
@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
@GL_GENERATE_STDARG_H_TRUE@ -e 's|@''NEXT_STDARG_H''@|$(NEXT_STDARG_H)|g' \
......@@ -1144,7 +1146,8 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG_N
@GL_GENERATE_STDDEF_H_TRUE@stddef.h: stddef.in.h $(top_builddir)/config.status
@GL_GENERATE_STDDEF_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \
@GL_GENERATE_STDDEF_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
@GL_GENERATE_STDDEF_H_TRUE@ sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@GL_GENERATE_STDDEF_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \
@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
@GL_GENERATE_STDDEF_H_TRUE@ -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \
......@@ -1161,7 +1164,8 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG_N
@GL_GENERATE_STDINT_H_TRUE@stdint.h: stdint.in.h $(top_builddir)/config.status
@GL_GENERATE_STDINT_H_TRUE@ $(AM_V_GEN)rm -f $@-t $@ && \
@GL_GENERATE_STDINT_H_TRUE@ { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
@GL_GENERATE_STDINT_H_TRUE@ sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
@GL_GENERATE_STDINT_H_TRUE@ sed -e 's|@''GUARD_PREFIX''@|GL|g' \
@GL_GENERATE_STDINT_H_TRUE@ -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@GL_GENERATE_STDINT_H_TRUE@ -e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
......@@ -1198,7 +1202,8 @@ inttypes.h: inttypes.in.h $(top_builddir)/config.status $(WARN_ON_USE_H) $(ARG_N
stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \
......@@ -1312,7 +1317,8 @@ stdio.h: stdio.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H)
stdlib.h: stdlib.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
......@@ -1393,7 +1399,8 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU
$(AM_V_at)$(MKDIR_P) sys
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \
......@@ -1441,7 +1448,8 @@ sys/stat.h: sys_stat.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNU
time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
-e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \
......@@ -1473,7 +1481,8 @@ time.h: time.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(
unistd.h: unistd.in.h $(top_builddir)/config.status $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
$(AM_V_GEN)rm -f $@-t $@ && \
{ echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
sed -e 's|@''GUARD_PREFIX''@|GL|g' \
-e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
-e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
-e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-e 's|@''PRAGMA_COLUMNS''@|@PRAGMA_COLUMNS@|g' \
......
......@@ -16710,10 +16710,6 @@ fi
# Persuade glibc <stdlib.h> to declare getloadavg().
# Make sure getloadavg.c is where it belongs, at configure-time.
test -f "$srcdir/$gl_source_base/getloadavg.c" ||
as_fn_error "$srcdir/$gl_source_base/getloadavg.c is missing" "$LINENO" 5
gl_save_LIBS=$LIBS
# getloadvg is present in libc on glibc >= 2.2, MacOS X, FreeBSD >= 2.0,
......
......@@ -91,6 +91,10 @@ and pops down the *Completions* buffer accordingly.
*** New completion style `substring'.
*** Completion style can be set per-category `completion-category-overrides'.
*** Completion of buffers now uses substring completion by default.
*** `completing-read' can be customized using the new variable
`completing-read-function'.
......@@ -861,6 +865,14 @@ valid for completion-extra-properties.
*** completion-annotate-function is obsolete.
*** New `metadata' method for completion tables. The metadata thus returned
can specify various details of the data returned by `all-completions':
- `category' is the kind of objects returned (e.g., `buffer', `file', ...),
used to select a style in completion-category-overrides.
- `annotation-function' to add annotations in *Completions*.
- `display-sort-function' to specify how to sort entries in *Completions*.
- `cycle-sort-function' to specify how to sort entries when cycling.
** `glyphless-char-display' can now distinguish between graphical and
text terminal display, via a char-table entry that is a cons cell.
......
2011-05-30 Oliver Scholz <epameinondas@gmx.de>
* quail/ipa-praat.el: New input method.
2011-05-16 Eli Zaretskii <eliz@gnu.org>
* Makefile.in (OTHERS): Add $(srcdir)/quail/persian.elc.
......
;;; ipa-praat.el --- Inputting IPA characters with the conventions of Praat
;; Copyright (C) 2011 Free Software Foundation, Inc.
;; Author: Oliver Scholz <epameinondas@gmx.de>
;; Keywords: multilingual, input method, IPA
;; This file is part of GNU Emacs.
;; GNU Emacs is free software: you can redistribute it and/or modify
;; it under the terms of the GNU General Public License as published by
;; the Free Software Foundation, either version 3 of the License, or
;; (at your option) any later version.
;; GNU Emacs is distributed in the hope that it will be useful,
;; but WITHOUT ANY WARRANTY; without even the implied warranty of
;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
;; GNU General Public License for more details.
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
;;; Commentary:
;; This is a new input method for IPA characters and diacritics, which follows
;; the conventions of Praat, a GPLed program for phonetical analysis.
;;
;; This input method is much more complete than the current ipa.el.
;;; Code:
(require 'quail)
(quail-define-package
"ipa-praat" "IPA" "IPAP" t
"International Phonetic Alphabet input method.
This follows the input method of the phonetical analysis program
Praat (http://www.fon.hum.uva.nl/praat/).
* Vowels
- Unrounded
| front | centr. | back
-------------+-------+--------+------
close | i i | ɨ \\i- | ɯ \\mt
close centr. | ɪ \\ic | |
close-mid | e e | ɘ \\e- | ɤ \\rh
| | ə \\sw |
open-mid | ɛ \\ef | ɜ \\er | ʌ \\vt
| æ \\ae | ɐ \\at |
open | a a | | ɑ \\as
- Rounded
| front | centr. | back
-------------+-------+--------+-------
close | y y | ʉ \\u- | u u
close centr. | ʏ \\yc | | ʊ \\hs
close-mid | ø \\o/ | ɵ \\o- | o o
open-mid | œ \\oe | ɞ \\kb | ɔ \\ct
open | ɶ \\Oe | | ɒ \\ab
For most of the codes, the first letter tells you the most
similar letter of the English alphabet. The second letter can be
t (turned), c (capital), s (script), r (reversed), - (barred or
retracted), or / (slashed). One symbol (ɛ) is a phonetic version
of a Greek letter. The codes for ə, ɤ, ʊ and ɞ are abbreviations
for schwa, ram's horn, horseshoe, and kidney bean.
* Consonants
- Pulmonic
| plos. | nasal | fric. | approx. | trill | tap/flap | l. appr.
-----------+-------+-------+-------+---------+-------+----------+---------
bilabial | p p | m m | ɸ \\ff | | | |
| b b | | β \\bf | ʋ \\vs | ʙ \\bc | |
labiodent. | | ɱ \\mj | f f | | | |
| | | v v | | | |
dental | | | θ \\tf | | | |
| | | ð \\dh | | | |
alveolar | t t | n n | s s | | | ɾ \\fh |
| d d | | z z | ɹ \\rt | r r | | l l
alv. lat. | | | ɬ \\l- | | | ɺ \\rl |
| | | ɮ \\lz | l l | | | l l
postalv. | | | ʃ \\sh | | | |
| | | ʒ \\zh | | | |
retroflex | ʈ \\t. | ɳ \\n. | ʂ \\s. | | | ɽ \\f. |
| ɖ \\d. | | ʐ \\z. | ɻ \\r. | | | ɭ \\l.
alv.-pala. | | | ɕ \\cc | | | |
| | | ʑ \\zc | | | |
palatal | c c | ɲ \\nj | ç \\c, | | | |
| ɟ \\j. | | ʝ \\jc | j j | | | ʎ \\yt
lab-pal. | | | | | | |
| | | | ɥ \\ht | | |
lab.-vela. | | | ʍ \\wt | | | |
| | | | w w | | |
velar | k k | ŋ \\ng | x x | | | | ʟ \\lc
| ɡ \\gs | | ɣ \\gf | ɰ \\ml | | |
uvular | q q | ɴ \\nc | χ \\cf | | | |
| ɢ \\gc | | ʁ \\ri | | ʀ \\rc | |
pharyngeal | | | ħ \\h- | | | |
| | | ʕ \\9e | | | |
epiglottal | ʡ \\?- | | ʜ \\hc | | | |
| | | ʢ \\9- | | | |
glottal | ʔ | | h h | | | |
| | | ɦ \\h^ | | | |
- Nonpulmonic
| implosive | click
----------+-----------+------
bilabial | ɓ \\b^ | ʘ \\O.
dental | | ǀ \\|1
alveolar | ɗ \\d^ |
alv.-lat. | | ǁ \\|2
postalv. | | ǂ \\|-
retrofl. | | ! !
palatal | ʄ \\j^ |
velar | ɠ \\g^ |
uvular | ʛ \\G^ |
For most of the codes, the first letter tells you the most
similar letter of the English alphabet. The second letter can be
t (turned), c (capital or curled), s (script), - (barred),
l (with leg), i (inverted), or j (left tail). Some phonetic
symbols are similar to Greek letters but have special
phonetic (f) versions with serifs (ɸ, β, ɣ) or are otherwise
slightly different (θ, χ). The codes for ŋ (engma), ð (eth),
ʃ (esh), and ʒ (yogh) are traditional alternative spellings. The
retroflexes have a period in the second place, because an
alternative traditional spelling is to write a dot under
them. The code for ɾ is an abbreviation for fishhook.
* Diacritics
- In line
input | example | description
------+---------+---------------------
\\:f | ː | phonetic length sign
\\'1 | ˈ | primary stress
\\'2 | ˌ | secondary stress
\\cn | t̚ | unreleased plosive
\\rh | ɜ˞ | rhotacized vowel
- Understrikes
input | example | description
------+---------+--------------------------------
\\|v | n̩ | syllabic consonant
\\0v | b̥ | voiceless
\\Tv | o̞ | lowered
\\T^ | o̝ | raised
\\T( | o̘ | advanced tongue root
\\T) | o̙ | retracted tongue root
\\-v | e̱ | backed
\\+v | o̟ | fronted
\\:v | o̤ | breathy voice
\\~v | o̰ | creaky voice
\\Nv | d̪ | dental (as opposed to alveolar)
\\Uv | d̺ | apical
\\Dv | d̻ | laminal
\\nv | u̯ | nonsyllabic
\\e3v | e̹ | slightly rounded
\\cv | u̜ | slightly unrounded
- Overstrikes
input | example | description
------+---------+--------------------------------------------
\\0^ | ɣ̊ | voiceless
\\'^ | | high tone
\\`^ | | low tone
\\-^ | | mid tone
\\~^ | | nasalized
\\v^ | | rising tone
\\^^ | | falling tone
\\:^ | | centralized
\\N^ | | short
\\li | k͡p | simultaneous articulation or single segment
"
nil t nil nil nil nil nil nil nil nil t)
(quail-define-rules
;; plosives
("\\t." ?ʈ) ; retroflex
("\\d." ?ɖ) ; voiced retroflex
("\\j-" ?ɟ) ; voiced palatal
("\\gs" ?ɡ) ; voiced velar
("\\gc" ?ɢ) ; voiced uvular
("\\?-" ?ʡ) ; epiglottal
("\\?g" ?ʔ) ; glottal
;; nasals
("\\mj" ?ɱ) ; labiodental
("\\n." ?ɳ) ; retroflex
("\\nj" ?ɲ) ; palatal
("\\ng" ?ŋ) ; velar
("\\nc" ?ɴ) ; uvular
;; fricatives
("\\ff" ?ɸ) ; bilabial
("\\bf" ?β) ; voiced bilabial
("\\tf" ?θ) ; labiodental
("\\dh" ?ð) ; voiced labiodental
("\\sh" ?ʃ) ; postalveolar
("\\l-" ?ɬ) ; alv. lateral
("\\lz" ?ɮ) ; voiced alv. lateral
("\\zh" ?ʒ) ; voiced postalveolar
("\\s." ?ʂ) ; retroflex
("\\z." ?ʐ) ; voiced retroflex
("\\cc" ?ɕ) ; alveolo-palatal
("\\zc" ?ʑ) ; voiced alveolo-palatal
("\\c," ?ç) ; palatal
("\\jc" ?ʝ) ; voiced palatal
("\\wt" ?ʍ) ; labial-velar
("\\gf" ?ɣ) ; voiced velar
("\\cf" ?χ) ; uvular
("\\ri" ?ʁ) ; voiced uvular
("\\h-" ?ħ) ; pharyngeal
("\\9e" ?ʕ) ; voiced pharyngeal
("\\hc" ?ʜ) ; epiglottal
("\\9-" ?ʢ) ; voiced epiglottal
("\\h^" ?ɦ) ; voiced glottal
;; approximants
("\\vs" ?ʋ) ; labiodental
("\\rt" ?ɹ) ; alveolar
("\\r." ?ɻ) ; retroflex
("\\ht" ?ɥ) ; labial-palatal
("\\ml" ?ɰ) ; velar
;; trills
("\\bc" ?ʙ) ; bilabial
("\\rc" ?ʀ) ; uvular
;; taps or flaps
; ⱱ -- labiodental
("\\fh" ?ɾ) ; alveolar
("\\rl" ?ɺ) ; alv.-lateral
("\\f." ?ɽ) ; retroflex
;; lateral approx.
("\\l." ?ɭ) ; retroflex
("\\yt" ?ʎ) ; palatal
("\\lc" ?ʟ) ; velar
;; implosives
("\\b^" ?ɓ) ; bilabial
("\\d^" ?ɗ) ; alveolar
("\\j^" ?ʄ) ; palatal
("\\g^" ?ɠ) ; velar
("\\G^" ?ʛ) ; uvular
;; clicks
("\\O." ?ʘ) ; bilabial
("\\|1" ?ǀ) ; dental
("\\|2" ?ǁ) ; alv. lateral
("\\|-" ?ǂ) ; postalveolar
;; other
("\\l~" ?ɫ) ; velarized l
("\\hj" ?ɧ) ; post-alveolar & velar fricative
;; vowels
("\\i-" ?ɨ)
("\\u-" ?ʉ)
("\\mt" ?ɯ)
("\\ic" ?ɪ)
("\\yc" ?ʏ)
("\\hs" ?ʊ)
("\\o/" ?ø)
("\\e-" ?ɘ)
("\\o-" ?ɵ)
("\\rh" ?ɤ)
("\\sw" ?ə)
("\\ef" ?ɛ)
("\\oe" ?œ)
("\\er" ?ɜ)
("\\kb" ?ɞ)
("\\vt" ?ʌ)
("\\ct" ?ɔ)
("\\ae" ?æ)
("\\at" ?ɐ)
("\\Oe" ?ɶ)
("\\as" ?ɑ)
("\\ab" ?ɒ)
("\\sr" ?ɚ)
;; diacritics
("\\:f" ?ː) ; phonetic length sign
("\\'1" ?ˈ) ; primary stress
("\\'2" ?ˌ) ; secondary stress
("\\cn" #x031A) ; t̚ unreleased plosive
("\\rh" #x02DE) ; ɜ˞ rhotacized vowel
("\\|v" #x0329) ; n̩ syllabic consonant
("\\0v" #x0325) ; b̥ voiceless
("\\Tv" #x031E) ; o̞ lowered
("\\T^" #x031D ) ; o̝ raised
("\\T(" #x0318) ; o̘ advanced tongue root
("\\T)" #x0319) ; o̙ retracted tongue root
("\\-v" #x0331) ; e̱ backed
("\\+v" #x031F) ; o̟ fronted
("\\:v" #x0324) ; o̤ breathy voice
("\\~v" #x0330) ; o̰ creaky voice
("\\Nv" #x032A) ; d̪ dental (as opposed to alveolar)
("\\Uv" #x033A) ; d̺ apical
("\\Dv" #x033B) ; d̻ laminal
("\\nv" #x032F) ; u̯ nonsyllabic
("\\e3v" #x0339) ; e̹ slightly rounded
("\\cv" #x031C) ; u̜ slightly unrounded
("\\0^" #x030A) ; ɣ̊ voiceless
("\\'^" #x0301) ; high tone
("\\`^" #x0300) ; low tone
("\\-^" #x0304) ; mid tone
("\\~^" #x0303) ; nasalized
("\\v^" #x030C) ; rising tone
("\\^^" #x0302) ; falling tone
("\\:^" #x0308) ; centralized
("\\N^" #x0306) ; short
("\\li" #x0361) ; k͡p simultaneous articulation or single segment
)
;; Local Variables:
;; coding: utf-8
;; End:
;;; ipa-praat.el ends here
2011-05-31 Stefan Monnier <monnier@iro.umontreal.ca>
* minibuffer.el: Add metadata method to completion tables.
(completion-category-overrides): New defcustom.
(completion-metadata, completion--field-metadata)
(completion-metadata-get, completion--styles)
(completion--cycle-threshold): New functions.
(completion-try-completion, completion-all-completions):
Add `metadata' argument to choose completion-styles.
(completion--do-completion): Use metadata to choose cycling.
(completion-all-sorted-completions): Use metadata for sorting.
Remove :completion-cycle-penalty which is not needed any more.
(completion--try-word-completion): Add `metadata' argument.
(minibuffer-completion-help): Check metadata for annotation function
and sorting.
(completion-file-name-table): Return `category' metadata.
(minibuffer-completing-file-name): Make obsolete.
* simple.el (minibuffer-completing-symbol): Make obsolete.
* icomplete.el (icomplete-completions): Pass new `metadata' param to
completion-try-completion.
2011-05-30 Stefan Monnier <monnier@iro.umontreal.ca>
* mail/smtpmail.el (smtpmail-send-data): Add progress reporter.
2011-05-30 Leo Liu <sdl.web@gmail.com>
* net/rcirc.el (rcirc-debug-buffer): Use visible buffer name.
(rcirc-print): Decode all incoming messages (bug#8744).
(rcirc-decode-coding-system): Allow value nil for automatic coding
system detection.
2011-05-29 Chong Yidong <cyd@stupidchicken.com>
* image.el (image-animate-max-time): Allow nil and t values.
......
......@@ -4155,6 +4155,8 @@ binding slots have been popped."
(if (eq fun 'defconst)
;; `defconst' sets `var' unconditionally.
(let ((tmp (make-symbol "defconst-tmp-var")))
;; Quote with `quote' to prevent byte-compiling the body,
;; which would lead to an inf-loop.
`(funcall '(lambda (,tmp) (defconst ,var ,tmp))
,value))
;; `defvar' sets `var' only when unbound.
......
2011-05-30 Lars Magne Ingebrigtsen <larsi@gnus.org>
* gnus-group.el (gnus-group-mark-article-read): It's possible that we
want to have `gnus-newsgroup-unselected' kept sorted. If this isn't
done, then unselected articles may be marked as read.
* pop3.el (pop3-open-server): Erase the buffer after the greeting,
since not doing this seems to lead to a race condition in pop3-logon.
* nnvirtual.el (nnvirtual-request-article): Bind `gnus-command-method'
so that the call chain it correct when we call "upwards".
* gnus-sum.el (gnus-select-newsgroup): Auto-expiry doesn't make sense
in read-only groups.
* gnus-group.el (gnus-group-mark-article-read): Ditto.
* message.el (message-cite-reply-position): Doc string fix.
* nnimap.el (nnimap-transform-headers): Simplify regexp to hopefully
avoid regexp overflow.
(nnimap-transform-split-mail): Ditto.
* pop3.el (pop3-retr): Error out if the server closes the connection.
2011-05-30 Stefan Monnier <monnier@iro.umontreal.ca>
* mml1991.el (mml1991-mailcrypt-encrypt): Remove use of ill-designed
mm-with-unibyte-current-buffer. The buffer should not contain any
multibyte chars anyway at this stage.
2011-05-29 Lars Magne Ingebrigtsen <larsi@gnus.org>
* shr.el (shr-urlify): Use shr-add-font to make underlines be less ugly
......
......@@ -3567,7 +3567,8 @@ or nil if no action could be taken."
(gnus-add-marked-articles group 'tick nil nil 'force)
(gnus-add-marked-articles group 'dormant nil nil 'force))
;; Do auto-expirable marks if that's required.
(when (gnus-group-auto-expirable-p group)
(when (and (gnus-group-auto-expirable-p group)
(not (gnus-group-read-only-p group)))
(gnus-range-map
(lambda (article)
(gnus-add-marked-articles group 'expire (list article))
......@@ -4630,10 +4631,11 @@ This command may read the active file."
(push n gnus-newsgroup-unselected))
(setq n (1+ n)))
(setq gnus-newsgroup-unselected
(nreverse gnus-newsgroup-unselected)))))
(sort gnus-newsgroup-unselected '<)))))
(gnus-activate-group group)
(gnus-group-make-articles-read group (list article))
(when (gnus-group-auto-expirable-p group)
(when (and (gnus-group-auto-expirable-p group)
(not (gnus-group-read-only-p group)))
(gnus-add-marked-articles
group 'expire (list article))))))
......
......@@ -5715,7 +5715,8 @@ If SELECT-ARTICLES, only select those articles from GROUP."
(gnus-summary-remove-list-identifiers)
;; Check whether auto-expire is to be done in this group.
(setq gnus-newsgroup-auto-expire
(gnus-group-auto-expirable-p group))
(and (gnus-group-auto-expirable-p group)
(not (gnus-group-read-only-p group))))
;; Set up the article buffer now, if necessary.
(unless (and gnus-single-article-buffer
(equal gnus-article-buffer "*Article*"))
......
......@@ -1091,7 +1091,7 @@ Note: Many newsgroups frown upon nontraditional reply styles. You
probably want to set this variable only for specific groups,
e.g. using `gnus-posting-styles':
(eval (set (make-local-variable 'message-cite-reply-above) 'above))"
(eval (set (make-local-variable 'message-cite-reply-position) 'above))"
:type '(choice (const :tag "Reply inline" 'traditional)
(const :tag "Reply above" 'above)
(const :tag "Reply below" 'below))
......
......@@ -137,33 +137,32 @@ Whether the passphrase is cached at all is controlled by
(while (looking-at "^Content[^ ]+:") (forward-line))
(unless (bobp)
(delete-region (point-min) (point)))
(mm-with-unibyte-current-buffer
(with-temp-buffer
(inline (mm-disable-multibyte))
(setq cipher (current-buffer))
(insert-buffer-substring text)
(unless (mc-encrypt-generic