(add-log-current-defun): Handle user-defined

add-log-current-function returning nil,

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 51a7a2145d264c9608931e8ef717c30cedf8def6..8a54f7959f419dd655a1a3a5849f9ca8b7662e0b 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,7 +1,10 @@
-2000-01-11 Sun  Jari Aalto  <jari.aalto@poboxes.com>
+2000-01-11  Jari Aalto  <jari.aalto@poboxes.com>
 
+       * add-log.el (add-log-current-defun): Handle user-defined
+       add-log-current-function returning nil,
+       
        * add-log.el (add-change-log-entry): Insert version number
-       if having found a current function.
+       if having found a current function
 
        * add-log.el (add-log-current-defun): Call
        `add-log-current-defun-function'.  Try matches at level 0 and

diff --git a/lisp/add-log.el b/lisp/add-log.el
index bb911904ad6348e62527ad89fcddddd64728faf3..92ee80a4f7090421ddb7290f148357d16d074f7f 100644 (file)
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -591,8 +591,8 @@ Has a preference of looking backwards."
   (condition-case nil
       (save-excursion
        (let ((location (point)))
-         (cond ((functionp add-log-current-defun-function)
-                (funcall add-log-current-defun-function))
+         (cond ((and (functionp add-log-current-defun-function)
+                     (funcall add-log-current-defun-function)))
                ((memq major-mode add-log-lisp-like-modes)
                 ;; If we are now precisely at the beginning of a defun,
                 ;; make sure beginning-of-defun finds that one