From: Stefan Monnier Date: Wed, 29 Nov 2000 14:53:45 +0000 (+0000) Subject: (combine-run-hooks): Only run-hooks if there's a hook to run. X-Git-Tag: emacs-pretest-21.0.93~382 X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=6ad948eb502f79cb5872d8fa115f5ce97808ce8d;p=emacs.git (combine-run-hooks): Only run-hooks if there's a hook to run. --- diff --git a/lisp/ChangeLog b/lisp/ChangeLog index 9b7643188d8..114e16bb6f0 100644 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@ -1,3 +1,9 @@ +2000-11-29 Stefan Monnier + + * 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 * cus-edit.el (face): Fix :format. diff --git a/lisp/subr.el b/lisp/subr.el index 3adad4268aa..6abec8c5b41 100644 --- 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)