Place empty abbrev tables after nonempty ones when editing

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index a88381611362c74a2de05e9d86850a250c403fce..9eeac0d2155f3d6f4808875fa3cc42793c682b6d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2011-03-28  Leo Liu  <sdl.web@gmail.com>
+
+       * abbrev.el (abbrev-table-empty-p): New function.
+       (prepare-abbrev-list-buffer): Place empty abbrev tables after
+       nonempty ones.  (Bug#5937)
+
 2011-03-27  Jan Djärv  <jan.h.d@swipnet.se>
 
        * cus-start.el (all): Add boolean ns-auto-hide-menu-bar.

diff --git a/lisp/abbrev.el b/lisp/abbrev.el
index 3b383a5f5b883ce7918a7e4f03f9319d02c53006..504d9fcbbced35d405971ab62dd782e080663f92 100644 (file)
--- a/lisp/abbrev.el
+++ b/lisp/abbrev.el
@@ -123,8 +123,13 @@ Otherwise display all abbrevs."
       (if local
           (insert-abbrev-table-description
            (abbrev-table-name local-table) t)
-        (dolist (table abbrev-table-name-list)
-          (insert-abbrev-table-description table t)))
+        (let (empty-tables)
+         (dolist (table abbrev-table-name-list)
+           (if (abbrev-table-empty-p (symbol-value table))
+               (push table empty-tables)
+             (insert-abbrev-table-description table t)))
+         (dolist (table (nreverse empty-tables))
+           (insert-abbrev-table-description table t))))
       (goto-char (point-min))
       (set-buffer-modified-p nil)
       (edit-abbrevs-mode)
@@ -420,6 +425,19 @@ PROPS is a list of properties."
   (and (vectorp object)
        (numberp (abbrev-table-get object :abbrev-table-modiff))))
 
+(defun abbrev-table-empty-p (object &optional ignore-system)
+  "Return nil if there are no abbrev symbols in OBJECT.
+If IGNORE-SYSTEM is non-nil, system definitions are ignored."
+  (unless (abbrev-table-p object)
+    (error "Non abbrev table object"))
+  (not (catch 'some
+        (mapatoms (lambda (abbrev)
+                    (unless (or (zerop (length (symbol-name abbrev)))
+                                (and ignore-system
+                                     (abbrev-get abbrev :system)))
+                      (throw 'some t)))
+                  object))))
+
 (defvar global-abbrev-table (make-abbrev-table)
   "The abbrev table whose abbrevs affect all buffers.
 Each buffer may also have a local abbrev table.