X-Git-Url: https://git.hcoop.net/bpt/emacs.git/blobdiff_plain/eb8c3be94e12644f506b8857e49ffef88046bb0b..e70991d4203e889c35806ec8f5890579d9f78f80:/lisp/add-log.el

diff --git a/lisp/add-log.el b/lisp/add-log.el
index d121a76cdf..9c54caa84c 100644
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -26,14 +26,37 @@
 
 ;;; Code:
 
-;;;###autoload
 (defvar change-log-default-name nil
   "*Name of a change log file for \\[add-change-log-entry].")
 
+(defvar add-log-current-defun-function nil
+  "\
+*If non-nil, function to guess name of current function from surrounding text.
+\\[add-change-log-entry] calls this function (if nil, `add-log-current-defun'
+instead) with no arguments.  It returns a string or nil if it cannot guess.")
+
+;; This MUST not be autoloaded, since user-login-name
+;; cannot be known at Emacs dump time.
+(defvar add-log-full-name (user-full-name)
+  "*Full name of user, for inclusion in ChangeLog daily headers.
+This defaults to the value returned by the `user-full-name' function.")
+
+;; This MUST not be autoloaded, since user-login-name
+;; cannot be known at Emacs dump time.
+(defvar add-log-mailing-address (concat (user-login-name) "@" (system-name))
+  "*Electronic mail address of user, for inclusion in ChangeLog daily headers.
+This defaults to the value returned by `user-login-name', followed by
+an `@' character, followed by the value returned by `system-name'.")
+
 (defun change-log-name ()
   (or change-log-default-name
-      (if (eq system-type 'vax-vms) "$CHANGE_LOG$.TXT" "ChangeLog")))
+      (if (eq system-type 'vax-vms) 
+	  "$CHANGE_LOG$.TXT" 
+	(if (eq system-type 'ms-dos)
+	    "changelo"
+	  "ChangeLog"))))
 
+;;;###autoload
 (defun prompt-for-change-log-name ()
   "Prompt for a change log name."
   (let ((default (change-log-name)))
@@ -75,7 +98,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
@@ -84,37 +107,38 @@ current buffer to the complete file name."
 			 (not (string= (file-name-directory file1)
 				       parent-dir))))
 	;; Move up to the parent dir and try again.
-	(setq file1 (expand-file-name (change-log-name) parent-dir)))
+	(setq file1 (expand-file-name 
+		     (file-name-nondirectory (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)
     file-name))
 
 ;;;###autoload
-(defun add-change-log-entry (&optional whoami file-name other-window)
+(defun add-change-log-entry (&optional whoami file-name other-window new-entry)
   "Find change log file and add an entry for today.
 Optional arg (interactive prefix) non-nil means prompt for user name and site.
 Second arg is file name of change log.  If nil, uses `change-log-default-name'.
-Third arg OTHER-WINDOW non-nil means visit in other window."
+Third arg OTHER-WINDOW non-nil means visit in other window.
+Fourth arg NEW-ENTRY non-nil means always create a new entry at the front;
+never append to an existing entry."
   (interactive (list current-prefix-arg
 		     (prompt-for-change-log-name)))
-  (let* ((full-name (if whoami
-			(read-input "Full name: " (user-full-name))
-		      (user-full-name)))
+  (if whoami
+      (progn
+	(setq add-log-full-name (read-input "Full name: " add-log-full-name))
 	 ;; Note that some sites have room and phone number fields in
 	 ;; full name which look silly when inserted.  Rather than do
 	 ;; anything about that here, let user give prefix argument so that
 	 ;; s/he can edit the full name field in prompter if s/he wants.
-	 (login-name (if whoami
-			 (read-input "Login name: " (user-login-name))
-		       (user-login-name)))
-	 (site-name (if whoami
-			(read-input "Site name: " (system-name))
-		      (system-name)))
-	 (defun (add-log-current-defun))
-	 paragraph-end entry)
+	(setq add-log-mailing-address
+	      (read-input "Mailing address: " add-log-mailing-address))))
+  (let ((defun (funcall (or add-log-current-defun-function
+			    'add-log-current-defun)))
+	paragraph-end entry)
 
     (setq file-name (find-change-log file-name))
 
@@ -132,16 +156,18 @@ Third arg OTHER-WINDOW non-nil means visit in other window."
     (if (and other-window (not (equal file-name buffer-file-name)))
 	(find-file-other-window file-name)
       (find-file file-name))
+    (or (eq major-mode 'change-log-mode)
+	(change-log-mode))
     (undo-boundary)
     (goto-char (point-min))
     (if (looking-at (concat (regexp-quote (substring (current-time-string)
 						     0 10))
-			    ".* " (regexp-quote full-name)
-			    "  (" (regexp-quote login-name) "@"))
+			    ".* " (regexp-quote add-log-full-name)
+			    "  (" (regexp-quote add-log-mailing-address)))
 	(forward-line 1)
       (insert (current-time-string)
-	      "  " full-name
-	      "  (" login-name "@" site-name ")\n\n"))
+	      "  " add-log-full-name
+	      "  (" add-log-mailing-address ")\n\n"))
 
     ;; Search only within the first paragraph.
     (if (looking-at "\n*[^\n* \t]")
@@ -155,7 +181,8 @@ Third arg OTHER-WINDOW non-nil means visit in other window."
 	   ;; Put this file name into the existing empty entry.
 	   (if entry
 	       (insert entry)))
-	  ((and (re-search-forward
+	  ((and (not new-entry)
+		(re-search-forward
 		 (concat (regexp-quote (concat "* " entry))
 			 ;; Don't accept `foo.bar' when
 			 ;; looking for `foo':
@@ -202,9 +229,9 @@ Third arg OTHER-WINDOW non-nil means visit in other window."
 ;;;###autoload
 (defun add-change-log-entry-other-window (&optional whoami file-name)
   "Find change log file in other window and add an entry for today.
-First arg (interactive prefix) non-nil means prompt for user name and site.
-Second arg is file name of change log.
-Interactively, with a prefix argument, the file name is prompted for."
+Optional arg (interactive prefix) non-nil means prompt for user name and site.
+Second arg is file name of change log.  \
+If nil, uses `change-log-default-name'."
   (interactive (if current-prefix-arg
 		   (list current-prefix-arg
 			 (prompt-for-change-log-name))))
@@ -225,17 +252,37 @@ Runs `change-log-mode-hook'."
 	mode-name "Change Log"
 	left-margin 8
 	fill-column 74)
+  (use-local-map change-log-mode-map)
   ;; Let each entry behave as one paragraph:
-  (set (make-local-variable 'paragraph-start) "^\\s *$\\|^^L")
-  (set (make-local-variable 'paragraph-separate) "^\\s *$\\|^^L\\|^\\sw")
+  (set (make-local-variable 'paragraph-start) "^\\s *$\\|^\f")
+  (set (make-local-variable 'paragraph-separate) "^\\s *$\\|^\f\\|^\\sw")
   ;; Let all entries for one day behave as one page.
   ;; Match null string on the date-line so that the date-line
   ;; is grouped with what follows.
-  (set (make-local-variable 'page-delimiter) "^\\<\\|^")
+  (set (make-local-variable 'page-delimiter) "^\\<\\|^\f")
   (set (make-local-variable 'version-control) 'never)
   (set (make-local-variable 'adaptive-fill-regexp) "\\s *")
   (run-hooks 'change-log-mode-hook))
 
+(defvar change-log-mode-map nil
+  "Keymap for Change Log major mode.")
+(if change-log-mode-map
+    nil
+  (setq change-log-mode-map (make-sparse-keymap))
+  (define-key change-log-mode-map "\M-q" 'change-log-fill-paragraph))
+
+;; It might be nice to have a general feature to replace this.  The idea I
+;; have is a variable giving a regexp matching text which should not be
+;; moved from bol by filling.  change-log-mode would set this to "^\\s *\\s(".
+;; But I don't feel up to implementing that today.
+(defun change-log-fill-paragraph (&optional justify)
+  "Fill the paragraph, but preserve open parentheses at beginning of lines.
+Prefix arg means justify as well."
+  (interactive "P")
+  (let ((paragraph-separate (concat paragraph-separate "\\|^\\s *\\s("))
+	(paragraph-start (concat paragraph-start "\\|^\\s *\\s(")))
+    (fill-paragraph justify)))
+
 (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.")
@@ -267,11 +314,13 @@ 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))))))
-		((and (memq major-mode '(c-mode 'c++-mode))
+		((and (memq major-mode '(c-mode c++-mode c++-c-mode))
 		      (save-excursion (beginning-of-line)
 				      ;; Use eq instead of = here to avoid
 				      ;; error when at bob and char-after
@@ -287,7 +336,7 @@ Has a preference of looking backwards."
 		 (skip-chars-forward " \t")
 		 (buffer-substring (point)
 				   (progn (forward-sexp 1) (point))))
-		((memq major-mode '(c-mode 'c++-mode))
+		((memq major-mode '(c-mode c++-mode c++-c-mode))
 		 (beginning-of-line)
 		 ;; See if we are in the beginning part of a function,
 		 ;; before the open brace.  If so, advance forward.