;;; add-log.el --- change log maintenance commands for Emacs
-;; Copyright (C) 1985, 1986, 1988, 1993, 1994, 1997, 1998, 2000, 2003,
-;; 2004, 2005 Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1988, 1993, 1994, 1997, 1998, 2000, 2002,
+;; 2003, 2004, 2005 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: tools
;; You should have received a copy of the GNU General Public License
;; along with GNU Emacs; see the file COPYING. If not, write to the
-;; Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-;; Boston, MA 02111-1307, USA.
+;; Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+;; Boston, MA 02110-1301, USA.
;;; Commentary:
(require 'timezone))
(defgroup change-log nil
- "Change log maintenance"
+ "Change log maintenance."
:group 'tools
:link '(custom-manual "(emacs)Change Log")
:prefix "change-log-"
;;;###autoload
(defcustom add-log-mailing-address nil
- "*Electronic mail addresses of user, for inclusion in ChangeLog headers.
+ "*Email addresses of user, for inclusion in ChangeLog headers.
This defaults to the value of `user-mail-address'. In addition to
being a simple string, this value can also be a list. All elements
will be recognized as referring to the same user; when creating a new
(defvar change-log-font-lock-keywords
'(;;
- ;; Date lines, new and old styles.
- ("^\\sw.........[0-9:+ ]*"
- (0 'change-log-date)
+ ;; Date lines, new (2000-01-01) and old (Sat Jan 1 00:00:00 2000) styles.
+ ;; Fixme: this regepx is just an approximate one and may match
+ ;; wrongly with a non-date line existing as a random note. In
+ ;; addition, using any kind of fixed setting like this doesn't
+ ;; work if a user customizes add-log-time-format.
+ ("^[0-9-]+ +\\|^\\(Sun\\|Mon\\|Tue\\|Wed\\|Thu\\|Fri\\|Sat\\) [A-z][a-z][a-z] [0-9:+ ]+"
+ (0 'change-log-date-face)
;; Name and e-mail; some people put e-mail in parens, not angles.
("\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" nil nil
(1 'change-log-name)
(forward-line 1)
(insert (nth (random (length new-entries))
new-entries)
- "\n\n")
+ hard-newline hard-newline)
(forward-line -1)))
;; Determine where we should stop searching for a usable
;; Delete excess empty lines; make just 2.
(while (and (not (eobp)) (looking-at "^\\s *$"))
(delete-region (point) (line-beginning-position 2)))
- (insert-char ?\n 2)
+ (insert hard-newline hard-newline)
(forward-line -2)
(indent-relative-maybe))
(t
(forward-line 1))
(while (and (not (eobp)) (looking-at "^\\s *$"))
(delete-region (point) (line-beginning-position 2)))
- (insert-char ?\n 3)
+ (insert hard-newline hard-newline hard-newline)
(forward-line -2)
(indent-to left-margin)
(insert "* ")
(beginning-of-line 1)
(looking-at "\\s *\\(\\*\\s *\\)?$"))
(insert ": ")
- (if version (insert version ?\ )))
+ (if version (insert version ?\s)))
;; Make it easy to get rid of the function name.
(undo-boundary)
(unless (save-excursion
(beginning-of-line 1)
(looking-at "\\s *$"))
- (insert ?\ ))
+ (insert ?\s))
;; See if the prev function name has a message yet or not.
;; If not, merge the two items.
(let ((pos (point-marker)))
(insert "("))
(set-marker pos nil))
(insert defun "): ")
- (if version (insert version ?\ )))))
+ (if version (insert version ?\s)))))
;;;###autoload
(defun add-change-log-entry-other-window (&optional whoami file-name)
;; If the desired position is within the defun we found,
;; find the function name.
(when (< location (point))
+ ;; Move back over function body.
(backward-sexp 1)
- (let (beg tem)
-
+ (let (beg)
+ ;; Skip back over typedefs and arglist.
+ ;; Stop at the function definition itself
+ ;; or at the line that follows end of function doc string.
(forward-line -1)
- ;; Skip back over typedefs of arglist.
(while (and (not (bobp))
- (looking-at "[ \t\n]"))
+ (looking-at "[ \t\n]")
+ (not (looking-back "[*]/)\n" (- (point) 4))))
(forward-line -1))
- ;; See if this is using the DEFUN macro used in Emacs,
- ;; or the DEFUN macro used by the C library:
- (if (condition-case nil
- (and (save-excursion
- (end-of-line)
- (while (= (preceding-char) ?\\)
- (end-of-line 2))
- (backward-sexp 1)
- (beginning-of-line)
- (setq tem (point))
- (looking-at "DEFUN\\b"))
- (>= location tem))
- (error nil))
+ ;; If we found a doc string, this must be the DEFUN macro
+ ;; used in Emacs. Move back to the DEFUN line.
+ (when (looking-back "[*]/)\n" (- (point) 4))
+ (backward-sexp 1)
+ (beginning-of-line))
+ ;; Is this a DEFUN construct? And is LOCATION in it?
+ (if (and (looking-at "DEFUN\\b")
+ (>= location (point)))
;; DEFUN ("file-name-directory", Ffile_name_directory, Sfile_name_directory, ...) ==> Ffile_name_directory
;; DEFUN(POSIX::STREAM-LOCK, stream lockp &key BLOCK SHARED START LENGTH) ==> POSIX::STREAM-LOCK
(progn
- (goto-char tem)
(down-list 1)
(when (= (char-after (point)) ?\")
(forward-sexp 1)
(skip-syntax-backward " ")
(point))))
(if (looking-at "^[+-]")
+ ;; Objective-C
(change-log-get-method-definition)
;; Ordinary C function syntax.
(setq beg (point))
;; precede the name.
(setq middle (point))
(forward-word -1)
+ ;; Is this C++ method?
+ (when (and (< 2 middle)
+ (string= (buffer-substring (- middle 2)
+ middle)
+ "::"))
+ ;; Include "classname::".
+ (setq middle (point)))
;; Ignore these subparts of a class decl
;; and move back to the class name itself.
(while (looking-at "public \\|private ")
(goto-char (match-end 0)))
(defun change-log-get-method-definition ()
-"For objective C, return the method name if we are in a method."
+"For Objective C, return the method name if we are in a method."
(let ((change-log-get-method-definition-md "["))
(save-excursion
(if (re-search-backward "^@implementation\\s-*\\([A-Za-z_]*\\)" nil t)
;;;###autoload
(defun change-log-merge (other-log)
- "Merge the contents of ChangeLog file OTHER-LOG with this buffer.
+ "Merge the contents of change log file OTHER-LOG with this buffer.
Both must be found in Change Log mode (since the merging depends on
the appropriate motion commands). OTHER-LOG can be either a file name
or a buffer.
(and (= ?\n (char-before))
(or (<= (1- (point)) (point-min))
(= ?\n (char-before (1- (point)))))))
- (insert "\n"))
+ (insert hard-newline))
;; Move to the end of it to terminate outer loop.
(with-current-buffer other-buf
(goto-char (point-max)))