Initial revision

[gnu-emacs] / lisp / add-log.el

diff --git a/lisp/add-log.el b/lisp/add-log.el
index 9c1be0e453646215398fdba5339b5f83e984d5d6..1277fd7e7b34478556f05e3fefdc56d8cc6328e5 100644 (file)
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -75,7 +75,7 @@ current buffer to the complete file name."
     ;; Move up in the dir hierarchy till we find a change log file.
     (let ((file1 file-name)
          parent-dir)
-      (while (and (not (file-exists-p file1))
+      (while (and (not (or (get-file-buffer file1) (file-exists-p file1)))
                  (progn (setq parent-dir
                               (file-name-directory
                                (directory-file-name
@@ -86,7 +86,7 @@ current buffer to the complete file name."
        ;; Move up to the parent dir and try again.
        (setq file1 (expand-file-name (change-log-name) parent-dir)))
       ;; If we found a change log in a parent, use that.
-      (if (file-exists-p file1)
+      (if (or (get-file-buffer file1) (file-exists-p file1))
          (setq file-name file1)))
     ;; Make a local variable in this buffer so we needn't search again.
     (set (make-local-variable 'change-log-default-name) file-name)
@@ -213,7 +213,7 @@ Interactively, with a prefix argument, the file name is prompted for."
 
 ;;;###autoload
 (defun change-log-mode ()
-  "Major mode for editting change logs; like Indented Text Mode.
+  "Major mode for editing change logs; like Indented Text Mode.
 Prevents numeric backups and sets `left-margin' to 8 and `fill-column' to 74.
 New log entries are usually made with \\[add-change-log-entry] or \\[add-change-log-entry-other-window].
 Each entry behaves as a paragraph, and the entries for one day as a page.
@@ -243,8 +243,8 @@ Runs `change-log-mode-hook'."
 (defun add-log-current-defun ()
   "Return name of function definition point is in, or nil.
 
-Understands Lisp, LaTeX (\"functions\" are chapters, sections, ...),
-Texinfo (@node titles), and C.
+Understands C, Lisp, LaTeX (\"functions\" are chapters, sections, ...),
+Texinfo (@node titles), and Fortran.
 
 Other modes are handled by a heuristic that looks in the 10K before
 point for uppercase headings starting in the first column or
@@ -267,7 +267,9 @@ Has a preference of looking backwards."
                          (progn (forward-sexp -1)
                                 (>= location (point))))
                     (progn
-                      (forward-word 1)
+                      (if (looking-at "\\s(")
+                          (forward-char 1))
+                      (forward-sexp 1)
                       (skip-chars-forward " ")
                       (buffer-substring (point)
                                         (progn (forward-sexp 1) (point))))))
@@ -381,7 +383,7 @@ Has a preference of looking backwards."
                    (if (re-search-forward
                         "^[ \t]*\\(program\\|subroutine\\|function\
 \\|[ \ta-z0-9*]*[ \t]+function\\)"
-                        string nil t)
+                        nil t)
                        (progn
                          ;; move to EOL or before first left paren
                          (if (re-search-forward "[(\n]" nil t)