aboutsummaryrefslogtreecommitdiffstats
path: root/lisp
diff options
context:
space:
mode:
authorJuanma Barranquero2005-07-14 10:05:14 +0000
committerJuanma Barranquero2005-07-14 10:05:14 +0000
commiteba72fc190a4083d114615d42b427ad09d589636 (patch)
treed992cd9fae0713e836b0553240e3790ef9fbdbff /lisp
parentef029e5a69e9c653f5838674e4fbc382421106b9 (diff)
downloademacs-eba72fc190a4083d114615d42b427ad09d589636.tar.gz
emacs-eba72fc190a4083d114615d42b427ad09d589636.zip
(add-log-mailing-address, change-log-merge): Doc fix.
(change-log-get-method-definition): Fix typo in docstring.
Diffstat (limited to 'lisp')
-rw-r--r--lisp/add-log.el6
1 files changed, 3 insertions, 3 deletions
diff --git a/lisp/add-log.el b/lisp/add-log.el
index ec802ef4ae7..27da19ee602 100644
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -70,7 +70,7 @@ This defaults to the value returned by the function `user-full-name'."
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.
74This defaults to the value of `user-mail-address'. In addition to 74This defaults to the value of `user-mail-address'. In addition to
75being a simple string, this value can also be a list. All elements 75being a simple string, this value can also be a list. All elements
76will be recognized as referring to the same user; when creating a new 76will be recognized as referring to the same user; when creating a new
@@ -976,7 +976,7 @@ Has a preference of looking backwards."
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)
@@ -1022,7 +1022,7 @@ Point is assumed to be at the start of the entry."
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.
1026Both must be found in Change Log mode (since the merging depends on 1026Both must be found in Change Log mode (since the merging depends on
1027the appropriate motion commands). OTHER-LOG can be either a file name 1027the appropriate motion commands). OTHER-LOG can be either a file name
1028or a buffer. 1028or a buffer.