(combine-run-hooks): Only run-hooks if there's a hook to run.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 9b7643188d89572cb296a4fb1d211ae0c88d83be..114e16bb6f06db807ecbae6dce064be0702b2b07 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,9 @@
+2000-11-29  Stefan Monnier  <monnier@cs.yale.edu>
+
+       * subr.el (combine-run-hooks): Only run-hooks if there's a hook to run.
+
+       * sort.el (sort-columns): Don't concat strings with numbers.
+
 2000-11-29  Dave Love  <fx@gnu.org>
 
        * cus-edit.el (face): Fix :format.

diff --git a/lisp/subr.el b/lisp/subr.el
index 3adad4268aa35afe2ef25c9a488ad452253b7d27..6abec8c5b416eb9e8199a6723ca34051fd9415ea 100644 (file)
--- a/lisp/subr.el
+++ b/lisp/subr.el
@@ -1140,7 +1140,8 @@ in BODY."
           (setq ,saved-combine-run-hooks combine-run-hooks)
           (fset 'run-hooks ,saved-run-hooks)
           (setq combine-run-hooks t)
-          (apply 'run-hooks ,saved-combine-run-hooks))))))
+          (if ,saved-combine-run-hooks
+              (apply 'run-hooks ,saved-combine-run-hooks)))))))
 
 
 (defmacro with-syntax-table (table &rest body)