summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Moellmann <gerd@gnu.org>2000-01-11 15:40:41 +0000
committerGerd Moellmann <gerd@gnu.org>2000-01-11 15:40:41 +0000
commitaa705642e7a9754b1f6c954fa4e19da5b54928df (patch)
treed330f8b13967490235537947658dd71790dbbafb
parent57df2446ea6467f956d0de99fdae0c32fa872a7d (diff)
downloademacs-aa705642e7a9754b1f6c954fa4e19da5b54928df.tar.gz
(add-log-current-defun): Handle user-defined
add-log-current-function returning nil,
-rw-r--r--lisp/ChangeLog7
-rw-r--r--lisp/add-log.el4
2 files changed, 7 insertions, 4 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 51a7a2145d2..8a54f7959f4 100644
--- 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 bb911904ad6..92ee80a4f70 100644
--- 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