diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2016-08-05 14:10:30 -0700 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2016-08-05 14:10:30 -0700 |
| commit | 0274862f395807d05585eb6325c5285f1bf775d8 (patch) | |
| tree | da85c643cf8040db118538bf7705d2a461ec055a /lisp/ChangeLog.17 | |
| parent | f902a6b89e6970eabaaf3c2c1452bf2104e2004b (diff) | |
| parent | d08afa1d0339425f03a48e533166a7cadfa66139 (diff) | |
| download | emacs-0274862f395807d05585eb6325c5285f1bf775d8.tar.gz | |
Merge from origin/emacs-25
d08afa1 * etc/AUTHORS: Update the AUTHORS file
2668500 ;; * ChangeLog.2: ChangeLog update.
7acfaea ; ChangeLog fixes
97d28b4 * admin/authors.el (authors-valid-file-names): Addition.
9ab52f6 * admin/authors.el: Additions.
0e646c7 Warn about Cairo-related problems
bc4c07f Don't let completion break `declare' handling
66f95e0 Adjust match data before calling after-change-funs
52cf0d5 Do not show string-rectangle preview if minibuffer is empty
6a3d031 * etc/PROBLEMS: Add entry about selection problems under Plas...
# Conflicts:
# ChangeLog.2
# src/lisp.h
Diffstat (limited to 'lisp/ChangeLog.17')
| -rw-r--r-- | lisp/ChangeLog.17 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/ChangeLog.17 b/lisp/ChangeLog.17 index f0b2651f870..bbf25b60483 100644 --- a/lisp/ChangeLog.17 +++ b/lisp/ChangeLog.17 @@ -6026,7 +6026,7 @@ 2014-11-01 Michael R. Mauger <michael@mauger.com> - * sql.el (sql-mode-oracle-font-lock-keywords): Correct regexp + * progmodes/sql.el (sql-mode-oracle-font-lock-keywords): Correct regexp syntax, add new keywords, and parse longer keywords first. (sql-redirect-one): Protect against empty command. (sql-mode, sql-interactive-mode): Set `custom-mode-group' property @@ -6034,7 +6034,7 @@ 2014-11-01 Michael R. Mauger <michael@mauger.com> - * sql.el (sql-interactive-mode, sql-stop): Correct fix for + * progmodes/sql.el (sql-interactive-mode, sql-stop): Correct fix for Bug#16814 with let-bind of comint-input-ring variables around read and save functions. |