summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2006-12-05 05:30:16 +0000
committerGlenn Morris <rgm@gnu.org>2006-12-05 05:30:16 +0000
commitda9109f7e3766c09971729fe853b55599f875cbe (patch)
treefd6a7a4f392b9f9cb9764ee8ef2fca0ae222033c
parent0dcd524c1d91bdaa6aec478248b876f722b7ac3c (diff)
downloademacs-da9109f7e3766c09971729fe853b55599f875cbe.tar.gz
*** empty log message ***
-rw-r--r--admin/FOR-RELEASE3
-rw-r--r--lisp/ChangeLog13
-rw-r--r--src/ChangeLog7
3 files changed, 20 insertions, 3 deletions
diff --git a/admin/FOR-RELEASE b/admin/FOR-RELEASE
index d218dd476c7..5794c9c13b5 100644
--- 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 d9a2ff98546..2c1c3a0394a 100644
--- 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 59a462eb16c..d4c1586db8c 100644
--- 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.