diff options
| -rw-r--r-- | lisp/ChangeLog | 7 | ||||
| -rw-r--r-- | lisp/add-log.el | 4 |
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 @@ | |||
| 1 | 2000-01-11 Sun Jari Aalto <jari.aalto@poboxes.com> | 1 | 2000-01-11 Jari Aalto <jari.aalto@poboxes.com> |
| 2 | 2 | ||
| 3 | * add-log.el (add-log-current-defun): Handle user-defined | ||
| 4 | add-log-current-function returning nil, | ||
| 5 | |||
| 3 | * add-log.el (add-change-log-entry): Insert version number | 6 | * add-log.el (add-change-log-entry): Insert version number |
| 4 | if having found a current function. | 7 | if having found a current function |
| 5 | 8 | ||
| 6 | * add-log.el (add-log-current-defun): Call | 9 | * add-log.el (add-log-current-defun): Call |
| 7 | `add-log-current-defun-function'. Try matches at level 0 and | 10 | `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." | |||
| 591 | (condition-case nil | 591 | (condition-case nil |
| 592 | (save-excursion | 592 | (save-excursion |
| 593 | (let ((location (point))) | 593 | (let ((location (point))) |
| 594 | (cond ((functionp add-log-current-defun-function) | 594 | (cond ((and (functionp add-log-current-defun-function) |
| 595 | (funcall add-log-current-defun-function)) | 595 | (funcall add-log-current-defun-function))) |
| 596 | ((memq major-mode add-log-lisp-like-modes) | 596 | ((memq major-mode add-log-lisp-like-modes) |
| 597 | ;; If we are now precisely at the beginning of a defun, | 597 | ;; If we are now precisely at the beginning of a defun, |
| 598 | ;; make sure beginning-of-defun finds that one | 598 | ;; make sure beginning-of-defun finds that one |