comparison lisp/add-log.el @ 90203:187d6a1f84f7

Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-71 Merge from emacs--cvs-trunk--0 Patches applied: * emacs--cvs-trunk--0 (patch 485-492) - Update from CVS - Merge from gnus--rel--5.10 * gnus--rel--5.10 (patch 92-94) - Merge from emacs--cvs-trunk--0 - Update from CVS
author Miles Bader <miles@gnu.org>
date Fri, 22 Jul 2005 08:27:27 +0000
parents f9a65d7ebd29 b12b140acf8b
children 2d92f5c9d6ae
comparison
equal deleted inserted replaced
90202:7597b4a23c3b 90203:187d6a1f84f7
68 string) 68 string)
69 :group 'change-log) 69 :group 'change-log)
70 70
71 ;;;###autoload 71 ;;;###autoload
72 (defcustom add-log-mailing-address nil 72 (defcustom add-log-mailing-address nil
73 "*Electronic mail addresses of user, for inclusion in ChangeLog headers. 73 "*Email addresses of user, for inclusion in ChangeLog headers.
74 This defaults to the value of `user-mail-address'. In addition to 74 This defaults to the value of `user-mail-address'. In addition to
75 being a simple string, this value can also be a list. All elements 75 being a simple string, this value can also be a list. All elements
76 will be recognized as referring to the same user; when creating a new 76 will be recognized as referring to the same user; when creating a new
77 ChangeLog entry, one element will be chosen at random." 77 ChangeLog entry, one element will be chosen at random."
78 :type '(choice (const :tag "Default" nil) 78 :type '(choice (const :tag "Default" nil)
974 (match-string 1) 974 (match-string 1)
975 end)) 975 end))
976 (goto-char (match-end 0))) 976 (goto-char (match-end 0)))
977 977
978 (defun change-log-get-method-definition () 978 (defun change-log-get-method-definition ()
979 "For objective C, return the method name if we are in a method." 979 "For Objective C, return the method name if we are in a method."
980 (let ((change-log-get-method-definition-md "[")) 980 (let ((change-log-get-method-definition-md "["))
981 (save-excursion 981 (save-excursion
982 (if (re-search-backward "^@implementation\\s-*\\([A-Za-z_]*\\)" nil t) 982 (if (re-search-backward "^@implementation\\s-*\\([A-Za-z_]*\\)" nil t)
983 (change-log-get-method-definition-1 " "))) 983 (change-log-get-method-definition-1 " ")))
984 (save-excursion 984 (save-excursion
1020 (replace-match (match-string 3) t t) 1020 (replace-match (match-string 3) t t)
1021 (change-log-merge other-buf)))))))) 1021 (change-log-merge other-buf))))))))
1022 1022
1023 ;;;###autoload 1023 ;;;###autoload
1024 (defun change-log-merge (other-log) 1024 (defun change-log-merge (other-log)
1025 "Merge the contents of ChangeLog file OTHER-LOG with this buffer. 1025 "Merge the contents of change log file OTHER-LOG with this buffer.
1026 Both must be found in Change Log mode (since the merging depends on 1026 Both must be found in Change Log mode (since the merging depends on
1027 the appropriate motion commands). OTHER-LOG can be either a file name 1027 the appropriate motion commands). OTHER-LOG can be either a file name
1028 or a buffer. 1028 or a buffer.
1029 1029
1030 Entries are inserted in chronological order. Both the current and 1030 Entries are inserted in chronological order. Both the current and