[Emacs-diffs] Changes to emacs/lisp/add-log.el

[Juanma Barranquero]

Index: emacs/lisp/add-log.el
diff -c emacs/lisp/add-log.el:1.167 emacs/lisp/add-log.el:1.168
*** emacs/lisp/add-log.el:1.167 Mon Jul  4 23:08:52 2005
--- emacs/lisp/add-log.el       Thu Jul 14 10:05:14 2005
***************
*** 70,76 ****
  
  ;;;###autoload
  (defcustom add-log-mailing-address nil
!   "*Electronic mail 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
--- 70,76 ----
  
  ;;;###autoload
  (defcustom add-log-mailing-address nil
!   "*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
***************
*** 976,982 ****
    (goto-char (match-end 0)))
  
  (defun change-log-get-method-definition ()
! "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 "address@hidden([A-Za-z_]*\\)" nil t)
--- 976,982 ----
    (goto-char (match-end 0)))
  
  (defun change-log-get-method-definition ()
! "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 "address@hidden([A-Za-z_]*\\)" nil t)
***************
*** 1022,1028 ****
  
  ;;;###autoload
  (defun change-log-merge (other-log)
!   "Merge the contents of ChangeLog 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.
--- 1022,1028 ----
  
  ;;;###autoload
  (defun change-log-merge (other-log)
!   "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.