diff options
| author | Glenn Morris | 2018-08-26 15:10:50 -0700 |
|---|---|---|
| committer | Glenn Morris | 2018-08-26 15:10:50 -0700 |
| commit | 1afd313334c93cb5b0a7a378bd635a54dc1d6a9e (patch) | |
| tree | cb95ad44d35f9b32a8acc8bb00b7291f38549c52 /lisp/textmodes | |
| parent | 18d52b90a1692a47cea5b5e905a58a3b2c6c9a64 (diff) | |
| parent | 54fb383af6f6af7b72c28f38b308d9b24d2af4f6 (diff) | |
| download | emacs-1afd313334c93cb5b0a7a378bd635a54dc1d6a9e.tar.gz emacs-1afd313334c93cb5b0a7a378bd635a54dc1d6a9e.zip | |
Merge from origin/emacs-26
54fb383 (origin/emacs-26) Fix detection of freed emacs_values (Bug#32...
769d0cd ; Fix out-of-tree build for mod-test.so
9a1329e Avoid crashes with very wide TTY frames on MS-Windows
9a613d3 Prevent `modify-file-local-variable-prop-line' from adding ex...
624e7dc Update GNOME bugtracker URLs
51ef6d5 Clarify in the Emacs manual that ChangeLog files are not used
6e08019 Recognize codepage 65001 as a valid encoding
1a350d7 ; * etc/NEWS: Fix format of first lines of some entries.
22d1f53 Avoid compilation warning in nt/addpm.c
7bc9ce7 Fix duplicate custom group names in bibtex.el
a9cf938 Fix outdated text in the Calc manual
Conflicts:
etc/NEWS
etc/PROBLEMS
src/emacs-module.c
src/gtkutil.c
src/image.c
src/xterm.c
test/Makefile.in
Diffstat (limited to 'lisp/textmodes')
| -rw-r--r-- | lisp/textmodes/bibtex.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/textmodes/bibtex.el b/lisp/textmodes/bibtex.el index 50a30cf6c36..6f6b06266ef 100644 --- a/lisp/textmodes/bibtex.el +++ b/lisp/textmodes/bibtex.el | |||
| @@ -457,7 +457,7 @@ INIT is either the initial content of the field or a function, | |||
| 457 | which is called to determine the initial content of the field. | 457 | which is called to determine the initial content of the field. |
| 458 | ALTERNATIVE if non-nil is an integer that numbers sets of | 458 | ALTERNATIVE if non-nil is an integer that numbers sets of |
| 459 | alternatives, starting from zero." | 459 | alternatives, starting from zero." |
| 460 | :group 'BibTeX | 460 | :group 'bibtex |
| 461 | :version "26.1" ; add Conference | 461 | :version "26.1" ; add Conference |
| 462 | :type 'bibtex-entry-alist) | 462 | :type 'bibtex-entry-alist) |
| 463 | (put 'bibtex-BibTeX-entry-alist 'risky-local-variable t) | 463 | (put 'bibtex-BibTeX-entry-alist 'risky-local-variable t) |