comparison lisp/add-log.el @ 1369:e5cb5060bb51

(add-log-current-defun): In normal C case, start with beginning-of-line. In last (fallback) case, start with end-of-line. (add-log-current-defun-header-regexp): In first alternative within the parens, don't allow space as last character.

1368:35a17cd4ae62

  (set (make-local-variable 'version-control) 'never)
  (set (make-local-variable 'adaptive-fill-regexp) "\\s *")
  (run-hooks 'change-log-mode-hook))

(defvar add-log-current-defun-header-regexp
  "^\\([A-Z][A-Z_ ]+\\|[a-z_---A-Z]+\\)[ \t]*[:=]"
  "*Heuristic regexp used by `add-log-current-defun' for unknown major modes.")

(defun add-log-current-defun ()
  "Return name of function definition point is in, or nil.

	     (search-forward "define")
	     (skip-chars-forward " \t")
	     (buffer-substring (point)
			       (progn (forward-sexp 1) (point))))
	    ((memq major-mode '(c-mode 'c++-mode))
	     ;; See if we are in the beginning part of a function,
	     ;; before the open brace.  If so, advance forward.
	     (while (not (looking-at "{\\|\\(\\s *$\\)"))
	       (forward-line 1))
	     (or (eobp)

		 (buffer-substring (match-beginning 1)
				   (match-end 1))))
	    (t
	     ;; If all else fails, try heuristics
	     (let (case-fold-search)
	       (if (re-search-backward add-log-current-defun-header-regexp
				       (- (point) 10000)
				       t)
		   (buffer-substring (match-beginning 1)
				     (match-end 1)))))))))

1369:e5cb5060bb51

  (set (make-local-variable 'version-control) 'never)
  (set (make-local-variable 'adaptive-fill-regexp) "\\s *")
  (run-hooks 'change-log-mode-hook))

(defvar add-log-current-defun-header-regexp
  "^\\([A-Z][A-Z_ ]*[A-Z_]\\|[a-z_---A-Z]+\\)[ \t]*[:=]"
  "*Heuristic regexp used by `add-log-current-defun' for unknown major modes.")

(defun add-log-current-defun ()
  "Return name of function definition point is in, or nil.

	     (search-forward "define")
	     (skip-chars-forward " \t")
	     (buffer-substring (point)
			       (progn (forward-sexp 1) (point))))
	    ((memq major-mode '(c-mode 'c++-mode))
	     (beginning-of-line)
	     ;; See if we are in the beginning part of a function,
	     ;; before the open brace.  If so, advance forward.
	     (while (not (looking-at "{\\|\\(\\s *$\\)"))
	       (forward-line 1))
	     (or (eobp)

		 (buffer-substring (match-beginning 1)
				   (match-end 1))))
	    (t
	     ;; If all else fails, try heuristics
	     (let (case-fold-search)
	       (end-of-line)
	       (if (re-search-backward add-log-current-defun-header-regexp
				       (- (point) 10000)
				       t)
		   (buffer-substring (match-beginning 1)
				     (match-end 1)))))))))