*** empty log message ***

diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index d218dd476c77aee78bb4c88a90423fe573041dc6..5794c9c13b58b69b5c1d0d39e4776a1a381b3dae 100644 (file)
--- a/admin/FOR-RELEASE
+++ b/admin/FOR-RELEASE
@@ -53,9 +53,6 @@ to the hack introduced on 2005-07-01 to fix some other Cleartype problem.
 
 ** 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 --git a/lisp/ChangeLog b/lisp/ChangeLog
index d9a2ff9854663caab11098ea0b2753710723549a..2c1c3a0394a90076fd4c1995ed9ab1d4eca3a7a5 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -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 --git a/src/ChangeLog b/src/ChangeLog
index 59a462eb16c6838b299b5106fb6c624a6c9b0dbe..d4c1586db8ca0bc46d777bc12a219be510e2b5d9 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -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.