diff options
| author | Chong Yidong <cyd@stupidchicken.com> | 2010-10-31 10:40:01 -0400 |
|---|---|---|
| committer | Chong Yidong <cyd@stupidchicken.com> | 2010-10-31 10:40:01 -0400 |
| commit | 2699a55464f7b43171c7b0e64d095640904e9e21 (patch) | |
| tree | d99ebc74b0a108dac964f0fbcd9f9d3592ac5c6f /lisp/vc/add-log.el | |
| parent | e6ef5dd9ce13d346c7bbdcd6794b29045b4e0e63 (diff) | |
| parent | 46eadc7aeedf0fe3944291e2631d8604b38fe25f (diff) | |
| download | emacs-2699a55464f7b43171c7b0e64d095640904e9e21.tar.gz | |
Merge changes from emacs-23 branch
Diffstat (limited to 'lisp/vc/add-log.el')
| -rw-r--r-- | lisp/vc/add-log.el | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lisp/vc/add-log.el b/lisp/vc/add-log.el index b63e482ff05..c356dde8226 100644 --- a/lisp/vc/add-log.el +++ b/lisp/vc/add-log.el @@ -698,7 +698,7 @@ current buffer to the complete file name. Optional arg BUFFER-FILE overrides `buffer-file-name'." ;; If we are called from a diff, first switch to the source buffer; ;; in order to respect buffer-local settings of change-log-default-name, etc. - (with-current-buffer (let ((buff (if (eq major-mode 'diff-mode) + (with-current-buffer (let ((buff (if (derived-mode-p 'diff-mode) (car (ignore-errors (diff-find-source-location)))))) (if (buffer-live-p buff) buff @@ -1180,7 +1180,7 @@ Has a preference of looking backwards." ((apply 'derived-mode-p add-log-c-like-modes) (or (c-cpp-define-name) (c-defun-name))) - ((memq major-mode add-log-tex-like-modes) + ((apply #'derived-mode-p add-log-tex-like-modes) (if (re-search-backward "\\\\\\(sub\\)*\\(section\\|paragraph\\|chapter\\)" nil t) |