# HG changeset patch
# User Glenn Morris <rgm@gnu.org>
# Date 1165296616 0
# Node ID 3272b45bb643c38cf91d3592d89f38ca7863cca8
# Parent  b18d856c25f1f9beac321cb542b4632e734fd267
*** empty log message ***

diff -r b18d856c25f1 -r 3272b45bb643 admin/FOR-RELEASE
--- a/admin/FOR-RELEASE	Tue Dec 05 05:29:21 2006 +0000
+++ b/admin/FOR-RELEASE	Tue Dec 05 05:30:16 2006 +0000
@@ -53,9 +53,6 @@
 
 ** christopher.ian.moore@gmail.com, Nov 30: too much recursion in gnus-sort-threads-1.
 
-** rmg@gnu.org, Nov 29: saved user abbrevs and system abbrevs
-  Tentative solution written.
-
 ** dooglus@gmail.com, Dec 1: Replacement of spaces in wdired
 
 ** Should CC mode set beginning-of-defun-function?
diff -r b18d856c25f1 -r 3272b45bb643 lisp/ChangeLog
--- a/lisp/ChangeLog	Tue Dec 05 05:29:21 2006 +0000
+++ b/lisp/ChangeLog	Tue Dec 05 05:30:16 2006 +0000
@@ -1,3 +1,16 @@
+2006-12-05  Glenn Morris  <rgm@gnu.org>
+
+	* progmodes/cperl-mode.el (cperl-mode)
+	* progmodes/f90.el (f90-mode-abbrev-table)
+	* progmodes/fortran.el (fortran-mode-abbrev-table)
+	* progmodes/octave-mod.el (octave-abbrev-table)
+	* progmodes/sql.el (sql-mode-abbrev-table): Define abbrevs even
+	if abbrev-table is non-nil (saved user abbrevs may have been
+	restored).
+
+	* progmodes/vhdl-mode.el (vhdl-mode-abbrev-table-init): Do not
+	clear abbrev table, else saved abbrevs will not be restored.
+
 2006-12-04  Juanma Barranquero  <lekktu@gmail.com>
 
 	* facemenu.el (facemenu-unlisted-faces): Put obsolescence info in
diff -r b18d856c25f1 -r 3272b45bb643 src/ChangeLog
--- a/src/ChangeLog	Tue Dec 05 05:29:21 2006 +0000
+++ b/src/ChangeLog	Tue Dec 05 05:30:16 2006 +0000
@@ -1,3 +1,10 @@
+2006-12-05  Glenn Morris  <rgm@gnu.org>
+
+	* abbrev.c (Qforce): New Lisp_Object.
+	(Fdefine_abbrev): Do not overwrite non-system abbrevs with system
+	abbrevs, unless 'force is applied.
+	(syms_of_abbrev): Add Qforce.
+
 2006-12-04  Kim F. Storm  <storm@cua.dk>
 
 	* process.c (parse_signal): Rename macro from handle_signal.