(url-http-mark-connection-as-free, url-http-find-free-connection):

[gnu-emacs] / lisp / add-log.el

diff --git a/lisp/add-log.el b/lisp/add-log.el
index e6ec96baa746a5e5964b4cde5381c98cc113df50..a1208d5fdd64fd26c2ec86877d96c79884da480a 100644 (file)
--- a/lisp/add-log.el
+++ b/lisp/add-log.el
@@ -1,7 +1,7 @@
 ;;; add-log.el --- change log maintenance commands for Emacs
 
 ;;; add-log.el --- change log maintenance commands for Emacs
 

-;; Copyright (C) 1985, 86, 88, 93, 94, 97, 98, 2000, 2003
-;;           Free Software Foundation, Inc.
+;; Copyright (C) 1985, 1986, 1988, 1993, 1994, 1997, 1998, 2000, 2002,
+;;   2003, 2004, 2005, 2006 Free Software Foundation, Inc.

 
 ;; Maintainer: FSF
 ;; Keywords: tools
 
 ;; Maintainer: FSF
 ;; Keywords: tools


@@ -20,8 +20,8 @@
 
 ;; 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
 
 ;; 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:
 
 
 ;;; Commentary:
 


@@ -33,7 +33,7 @@
   (require 'timezone))
 
 (defgroup change-log nil
   (require 'timezone))
 
 (defgroup change-log nil

-  "Change log maintenance"
+  "Change log maintenance."

   :group 'tools
   :link '(custom-manual "(emacs)Change Log")
   :prefix "change-log-"
   :group 'tools
   :link '(custom-manual "(emacs)Change Log")
   :prefix "change-log-"


@@ -45,6 +45,7 @@
   :type '(choice (const :tag "default" nil)
                 string)
   :group 'change-log)
   :type '(choice (const :tag "default" nil)
                 string)
   :group 'change-log)

+(put 'change-log-default-name 'safe-local-variable 'string-or-null-p)

 
 (defcustom change-log-mode-hook nil
   "Normal hook run by `change-log-mode'."
 
 (defcustom change-log-mode-hook nil
   "Normal hook run by `change-log-mode'."


@@ -70,7 +71,7 @@ This defaults to the value returned by the function `user-full-name'."
 
 ;;;###autoload
 (defcustom add-log-mailing-address nil
 
 ;;;###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
 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


@@ -81,7 +82,7 @@ ChangeLog entry, one element will be chosen at random."
   :group 'change-log)
 
 (defcustom add-log-time-format 'add-log-iso8601-time-string
   :group 'change-log)
 
 (defcustom add-log-time-format 'add-log-iso8601-time-string

-  "*Function that defines the time format.
+  "Function that defines the time format.

 For example, `add-log-iso8601-time-string', which gives the
 date in international ISO 8601 format,
 and `current-time-string' are two valid values."
 For example, `add-log-iso8601-time-string', which gives the
 date in international ISO 8601 format,
 and `current-time-string' are two valid values."


@@ -93,7 +94,7 @@ and `current-time-string' are two valid values."
   :group 'change-log)
 
 (defcustom add-log-keep-changes-together nil
   :group 'change-log)
 
 (defcustom add-log-keep-changes-together nil

-  "*If non-nil, normally keep day's log entries for one file together.
+  "If non-nil, normally keep day's log entries for one file together.

 
 Log entries for a given file made with \\[add-change-log-entry] or
 \\[add-change-log-entry-other-window] will only be added to others \
 
 Log entries for a given file made with \\[add-change-log-entry] or
 \\[add-change-log-entry-other-window] will only be added to others \


@@ -125,20 +126,20 @@ this variable."
   :group 'change-log)
 
 (defcustom add-log-always-start-new-record nil
   :group 'change-log)
 
 (defcustom add-log-always-start-new-record nil

-  "*If non-nil, `add-change-log-entry' will always start a new record."
-  :version "21.4"
+  "If non-nil, `add-change-log-entry' will always start a new record."
+  :version "22.1"

   :type 'boolean
   :group 'change-log)
 
 (defcustom add-log-buffer-file-name-function nil
   :type 'boolean
   :group 'change-log)
 
 (defcustom add-log-buffer-file-name-function nil

-  "*If non-nil, function to call to identify the full filename of a buffer.
+  "If non-nil, function to call to identify the full filename of a buffer.

 This function is called with no argument.  If this is nil, the default is to
 use `buffer-file-name'."
   :type '(choice (const nil) function)
   :group 'change-log)
 
 (defcustom add-log-file-name-function nil
 This function is called with no argument.  If this is nil, the default is to
 use `buffer-file-name'."
   :type '(choice (const nil) function)
   :group 'change-log)
 
 (defcustom add-log-file-name-function nil

-  "*If non-nil, function to call to identify the filename for a ChangeLog entry.
+  "If non-nil, function to call to identify the filename for a ChangeLog entry.

 This function is called with one argument, the value of variable
 `buffer-file-name' in that buffer.  If this is nil, the default is to
 use the file's name relative to the directory of the change log file."
 This function is called with one argument, the value of variable
 `buffer-file-name' in that buffer.  If this is nil, the default is to
 use the file's name relative to the directory of the change log file."


@@ -166,87 +167,115 @@ Note: The search is conducted only within 10%, at the beginning of the file."
   :type '(repeat regexp)
   :group 'change-log)
 
   :type '(repeat regexp)
   :group 'change-log)
 

-(defface change-log-date-face
+(defface change-log-date

   '((t (:inherit font-lock-string-face)))
   "Face used to highlight dates in date lines."
   :version "21.1"
   :group 'change-log)
   '((t (:inherit font-lock-string-face)))
   "Face used to highlight dates in date lines."
   :version "21.1"
   :group 'change-log)

+;; backward-compatibility alias
+(put 'change-log-date-face 'face-alias 'change-log-date)

 
 

-(defface change-log-name-face
+(defface change-log-name

   '((t (:inherit font-lock-constant-face)))
   "Face for highlighting author names."
   :version "21.1"
   :group 'change-log)
   '((t (:inherit font-lock-constant-face)))
   "Face for highlighting author names."
   :version "21.1"
   :group 'change-log)

+;; backward-compatibility alias
+(put 'change-log-name-face 'face-alias 'change-log-name)

 
 

-(defface change-log-email-face
+(defface change-log-email

   '((t (:inherit font-lock-variable-name-face)))
   "Face for highlighting author email addresses."
   :version "21.1"
   :group 'change-log)
   '((t (:inherit font-lock-variable-name-face)))
   "Face for highlighting author email addresses."
   :version "21.1"
   :group 'change-log)

+;; backward-compatibility alias
+(put 'change-log-email-face 'face-alias 'change-log-email)

 
 

-(defface change-log-file-face
+(defface change-log-file

   '((t (:inherit font-lock-function-name-face)))
   "Face for highlighting file names."
   :version "21.1"
   :group 'change-log)
   '((t (:inherit font-lock-function-name-face)))
   "Face for highlighting file names."
   :version "21.1"
   :group 'change-log)

+;; backward-compatibility alias
+(put 'change-log-file-face 'face-alias 'change-log-file)

 
 

-(defface change-log-list-face
+(defface change-log-list

   '((t (:inherit font-lock-keyword-face)))
   "Face for highlighting parenthesized lists of functions or variables."
   :version "21.1"
   :group 'change-log)
   '((t (:inherit font-lock-keyword-face)))
   "Face for highlighting parenthesized lists of functions or variables."
   :version "21.1"
   :group 'change-log)

+;; backward-compatibility alias
+(put 'change-log-list-face 'face-alias 'change-log-list)

 
 

-(defface change-log-conditionals-face
+(defface change-log-conditionals

   '((t (:inherit font-lock-variable-name-face)))
   "Face for highlighting conditionals of the form `[...]'."
   :version "21.1"
   :group 'change-log)
   '((t (:inherit font-lock-variable-name-face)))
   "Face for highlighting conditionals of the form `[...]'."
   :version "21.1"
   :group 'change-log)

+;; backward-compatibility alias
+(put 'change-log-conditionals-face 'face-alias 'change-log-conditionals)

 
 

-(defface change-log-function-face
+(defface change-log-function

   '((t (:inherit font-lock-variable-name-face)))
   "Face for highlighting items of the form `<....>'."
   :version "21.1"
   :group 'change-log)
   '((t (:inherit font-lock-variable-name-face)))
   "Face for highlighting items of the form `<....>'."
   :version "21.1"
   :group 'change-log)

+;; backward-compatibility alias
+(put 'change-log-function-face 'face-alias 'change-log-function)

 
 

-(defface change-log-acknowledgement-face
+(defface change-log-acknowledgement

   '((t (:inherit font-lock-comment-face)))
   "Face for highlighting acknowledgments."
   :version "21.1"
   :group 'change-log)
   '((t (:inherit font-lock-comment-face)))
   "Face for highlighting acknowledgments."
   :version "21.1"
   :group 'change-log)

+;; backward-compatibility alias
+(put 'change-log-acknowledgement-face 'face-alias 'change-log-acknowledgement)

 
 (defvar change-log-font-lock-keywords
   '(;;
 
 (defvar change-log-font-lock-keywords
   '(;;

-    ;; Date lines, new and old styles.
-    ("^\\sw.........[0-9:+ ]*"
+    ;; 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.
      (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-face)
-      (2 'change-log-email-face)))
+     ("\\([^<(]+?\\)[ \t]*[(<]\\([A-Za-z0-9_.+-]+@[A-Za-z0-9_.-]+\\)[>)]" nil nil
+      (1 'change-log-name)
+      (2 'change-log-email)))

     ;;
     ;; File names.
     ;;
     ;; File names.

-    ("^\t\\* \\([^ ,:([\n]+\\)"
-     (1 'change-log-file-face)
+    ("^\\( +\\|\t\\)\\* \\([^ ,:([\n]+\\)"
+     (2 'change-log-file)

      ;; Possibly further names in a list:
      ;; Possibly further names in a list:

-     ("\\=, \\([^ ,:([\n]+\\)" nil nil (1 'change-log-file-face))
+     ("\\=, \\([^ ,:([\n]+\\)" nil nil (1 'change-log-file))

      ;; Possibly a parenthesized list of names:
      ;; Possibly a parenthesized list of names:

-     ("\\= (\\([^) ,:\n]+\\)" nil nil (1 'change-log-list-face))
-     ("\\=, *\\([^) ,:\n]+\\)" nil nil (1 'change-log-list-face)))
+     ("\\= (\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)"
+      nil nil (1 'change-log-list))
+     ("\\=, *\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)"
+      nil nil (1 'change-log-list)))

     ;;
     ;; Function or variable names.
     ;;
     ;; Function or variable names.

-    ("^\t(\\([^) ,:\n]+\\)"
-     (1 'change-log-list-face)
-     ("\\=, *\\([^) ,:\n]+\\)" nil nil (1 'change-log-list-face)))
+    ("^\\( +\\|\t\\)(\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)"
+     (2 'change-log-list)
+     ("\\=, *\\([^(),\n]+\\|(\\(setf\\|SETF\\) [^() ,\n]+)\\)" nil nil
+      (1 'change-log-list)))

     ;;
     ;; Conditionals.
     ;;
     ;; Conditionals.

-    ("\\[!?\\([^]\n]+\\)\\]\\(:\\| (\\)" (1 'change-log-conditionals-face))
+    ("\\[!?\\([^]\n]+\\)\\]\\(:\\| (\\)" (1 'change-log-conditionals))

     ;;
     ;; Function of change.
     ;;
     ;; Function of change.

-    ("<\\([^>\n]+\\)>\\(:\\| (\\)" (1 'change-log-function-face))
+    ("<\\([^>\n]+\\)>\\(:\\| (\\)" (1 'change-log-function))

     ;;
     ;; Acknowledgements.
     ;;
     ;; Acknowledgements.

-    ("\\(^\t\\|  \\)\\(From\\|Patch\\(es\\)? by\\|Report\\(ed by\\| from\\)\\|Suggest\\(ed by\\|ion from\\)\\)"
-     2 'change-log-acknowledgement-face))
+    ;; Don't include plain "From" because that is vague;
+    ;; we want to encourage people to say something more specific.
+    ;; Note that the FSF does not use "Patches by"; our convention
+    ;; is to put the name of the author of the changes at the top
+    ;; of the change log entry.
+    ("\\(^\\( +\\|\t\\)\\|  \\)\\(Patch\\(es\\)? by\\|Report\\(ed by\\| from\\)\\|Suggest\\(ed by\\|ion from\\)\\)"
+     3 'change-log-acknowledgement))

   "Additional expressions to highlight in Change Log mode.")
 
 (defvar change-log-mode-map
   "Additional expressions to highlight in Change Log mode.")
 
 (defvar change-log-mode-map


@@ -256,12 +285,18 @@ Note: The search is conducted only within 10%, at the beginning of the file."
     map)
   "Keymap for Change Log major mode.")
 
     map)
   "Keymap for Change Log major mode.")
 

-(defvar change-log-time-zone-rule nil
+;; It used to be called change-log-time-zone-rule but really should be
+;; called add-log-time-zone-rule since it's only used from add-log-* code.
+(defvaralias 'change-log-time-zone-rule 'add-log-time-zone-rule)
+(defvar add-log-time-zone-rule nil

   "Time zone used for calculating change log time stamps.
 It takes the same format as the TZ argument of `set-time-zone-rule'.
   "Time zone used for calculating change log time stamps.
 It takes the same format as the TZ argument of `set-time-zone-rule'.

-If nil, use local time.")
+If nil, use local time.
+If t, use universal time.")
+(put 'add-log-time-zone-rule 'safe-local-variable
+     '(lambda (x) (or (booleanp x) (stringp x))))

 
 

-(defun add-log-iso8601-time-zone (time)
+(defun add-log-iso8601-time-zone (&optional time)

   (let* ((utc-offset (or (car (current-time-zone time)) 0))
         (sign (if (< utc-offset 0) ?- ?+))
         (sec (abs utc-offset))
   (let* ((utc-offset (or (car (current-time-zone time)) 0))
         (sign (if (< utc-offset 0) ?- ?+))
         (sec (abs utc-offset))


@@ -274,18 +309,14 @@ If nil, use local time.")
                  (t "%c%02d"))
            sign hh mm ss)))
 
                  (t "%c%02d"))
            sign hh mm ss)))
 

+(defvar add-log-iso8601-with-time-zone nil)
+

 (defun add-log-iso8601-time-string ()
 (defun add-log-iso8601-time-string ()

-  (if change-log-time-zone-rule
-      (let ((tz (getenv "TZ"))
-           (now (current-time)))
-       (unwind-protect
-           (progn
-             (set-time-zone-rule change-log-time-zone-rule)
-             (concat
-              (format-time-string "%Y-%m-%d " now)
-              (add-log-iso8601-time-zone now)))
-         (set-time-zone-rule tz)))
-    (format-time-string "%Y-%m-%d")))
+  (let ((time (format-time-string "%Y-%m-%d"
+                                  nil (eq t add-log-time-zone-rule))))
+    (if add-log-iso8601-with-time-zone
+        (concat time " " (add-log-iso8601-time-zone))
+      time)))

 
 (defun change-log-name ()
   "Return (system-dependent) default name for a change log file."
 
 (defun change-log-name ()
   "Return (system-dependent) default name for a change log file."


@@ -370,10 +401,10 @@ nil, by matching `change-log-version-number-regexp-list'."
 
 Optional arg FILE-NAME specifies the file to use.
 If FILE-NAME is nil, use the value of `change-log-default-name'.
 
 Optional arg FILE-NAME specifies the file to use.
 If FILE-NAME is nil, use the value of `change-log-default-name'.

-If 'change-log-default-name' is nil, behave as though it were 'ChangeLog'
+If `change-log-default-name' is nil, behave as though it were 'ChangeLog'

 \(or whatever we use on this operating system).
 
 \(or whatever we use on this operating system).
 

-If 'change-log-default-name' contains a leading directory component, then
+If `change-log-default-name' contains a leading directory component, then

 simply find it in the current directory.  Otherwise, search in the current
 directory and its successive parents for a file so named.
 
 simply find it in the current directory.  Otherwise, search in the current
 directory and its successive parents for a file so named.
 


@@ -445,7 +476,7 @@ Optional arg BUFFER-FILE overrides `buffer-file-name'."
 (defun add-change-log-entry (&optional whoami file-name other-window new-entry)
   "Find change log file, and add an entry for today and an item for this file.
 Optional arg WHOAMI (interactive prefix) non-nil means prompt for user
 (defun add-change-log-entry (&optional whoami file-name other-window new-entry)
   "Find change log file, and add an entry for today and an item for this file.
 Optional arg WHOAMI (interactive prefix) non-nil means prompt for user

-name and site.
+name and email (stored in `add-log-full-name' and `add-log-mailing-address').

 
 Second arg FILE-NAME is file name of the change log.
 If nil, use the value of `change-log-default-name'.
 
 Second arg FILE-NAME is file name of the change log.
 If nil, use the value of `change-log-default-name'.


@@ -464,24 +495,10 @@ The change log file can start with a copyright notice and a copying
 permission notice.  The first blank line indicates the end of these
 notices.
 
 permission notice.  The first blank line indicates the end of these
 notices.
 

-Today's date is calculated according to `change-log-time-zone-rule' if
+Today's date is calculated according to `add-log-time-zone-rule' if

 non-nil, otherwise in local time."
   (interactive (list current-prefix-arg
                     (prompt-for-change-log-name)))
 non-nil, otherwise in local time."
   (interactive (list current-prefix-arg
                     (prompt-for-change-log-name)))

-  (or add-log-full-name
-      (setq add-log-full-name (user-full-name)))
-  (or add-log-mailing-address
-      (setq add-log-mailing-address user-mail-address))
-  (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.
-       (setq add-log-mailing-address
-             (read-input "Mailing address: " add-log-mailing-address))))
-

   (let* ((defun (add-log-current-defun))
         (version (and change-log-version-info-enabled
                       (change-log-version-number-search)))
   (let* ((defun (add-log-current-defun))
         (version (and change-log-version-info-enabled
                       (change-log-version-number-search)))


@@ -489,11 +506,22 @@ non-nil, otherwise in local time."
                            (funcall add-log-buffer-file-name-function)
                          buffer-file-name))
         (buffer-file (if buf-file-name (expand-file-name buf-file-name)))
                            (funcall add-log-buffer-file-name-function)
                          buffer-file-name))
         (buffer-file (if buf-file-name (expand-file-name buf-file-name)))

-        (file-name (expand-file-name
-                    (or file-name (find-change-log file-name buffer-file))))
+        (file-name (expand-file-name (find-change-log file-name buffer-file)))

         ;; Set ITEM to the file name to use in the new item.
         (item (add-log-file-name buffer-file file-name))
         ;; Set ITEM to the file name to use in the new item.
         (item (add-log-file-name buffer-file file-name))

-        bound)
+        bound
+        (full-name (or add-log-full-name (user-full-name)))
+        (mailing-address (or add-log-mailing-address user-mail-address)))
+
+    (if whoami
+       (progn
+         (setq full-name (read-string "Full name: " 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.
+         (setq mailing-address
+               (read-string "Mailing address: " mailing-address))))

 
     (unless (equal file-name buffer-file-name)
       (if (or other-window (window-dedicated-p (selected-window)))
 
     (unless (equal file-name buffer-file-name)
       (if (or other-window (window-dedicated-p (selected-window)))


@@ -511,13 +539,22 @@ non-nil, otherwise in local time."
       (skip-chars-forward "\n"))
 
     ;; Advance into first entry if it is usable; else make new one.
       (skip-chars-forward "\n"))
 
     ;; Advance into first entry if it is usable; else make new one.

-    (let ((new-entries (mapcar (lambda (addr)
-                                (concat (funcall add-log-time-format)
-                                        "  " add-log-full-name
-                                        "  <" addr ">"))
-                              (if (consp add-log-mailing-address)
-                                  add-log-mailing-address
-                                (list add-log-mailing-address)))))
+    (let ((new-entries
+           (mapcar (lambda (addr)
+                     (concat
+                      (if (stringp add-log-time-zone-rule)
+                          (let ((tz (getenv "TZ")))
+                            (unwind-protect
+                                (progn
+                                  (set-time-zone-rule add-log-time-zone-rule)
+                                  (funcall add-log-time-format))
+                              (set-time-zone-rule tz)))
+                        (funcall add-log-time-format))
+                      "  " full-name
+                      "  <" addr ">"))
+                   (if (consp mailing-address)
+                       mailing-address
+                     (list mailing-address)))))

       (if (and (not add-log-always-start-new-record)
                (let ((hit nil))
                 (dolist (entry new-entries hit)
       (if (and (not add-log-always-start-new-record)
                (let ((hit nil))
                 (dolist (entry new-entries hit)


@@ -526,7 +563,8 @@ non-nil, otherwise in local time."
          (forward-line 1)
        (insert (nth (random (length new-entries))
                     new-entries)
          (forward-line 1)
        (insert (nth (random (length new-entries))
                     new-entries)

-               "\n\n")
+               (if use-hard-newlines hard-newline "\n")
+               (if use-hard-newlines hard-newline "\n"))

        (forward-line -1)))
 
     ;; Determine where we should stop searching for a usable
        (forward-line -1)))
 
     ;; Determine where we should stop searching for a usable


@@ -559,7 +597,8 @@ non-nil, otherwise in local time."
           ;; Delete excess empty lines; make just 2.
           (while (and (not (eobp)) (looking-at "^\\s *$"))
             (delete-region (point) (line-beginning-position 2)))
           ;; 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 (if use-hard-newlines hard-newline "\n")
+                  (if use-hard-newlines hard-newline "\n"))

           (forward-line -2)
           (indent-relative-maybe))
          (t
           (forward-line -2)
           (indent-relative-maybe))
          (t


@@ -568,7 +607,9 @@ non-nil, otherwise in local time."
             (forward-line 1))
           (while (and (not (eobp)) (looking-at "^\\s *$"))
             (delete-region (point) (line-beginning-position 2)))
             (forward-line 1))
           (while (and (not (eobp)) (looking-at "^\\s *$"))
             (delete-region (point) (line-beginning-position 2)))

-          (insert-char ?\n 3)
+          (insert (if use-hard-newlines hard-newline "\n")
+                  (if use-hard-newlines hard-newline "\n")
+                  (if use-hard-newlines hard-newline "\n"))

           (forward-line -2)
           (indent-to left-margin)
           (insert "* ")
           (forward-line -2)
           (indent-to left-margin)
           (insert "* ")


@@ -582,13 +623,13 @@ non-nil, otherwise in local time."
                  (beginning-of-line 1)
                  (looking-at "\\s *\\(\\*\\s *\\)?$"))
          (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 *$"))
       ;; 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)))
       ;; See if the prev function name has a message yet or not.
       ;; If not, merge the two items.
       (let ((pos (point-marker)))


@@ -608,7 +649,7 @@ non-nil, otherwise in local time."
          (insert "("))
        (set-marker pos nil))
       (insert defun "): ")
          (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)
 
 ;;;###autoload
 (defun add-change-log-entry-other-window (&optional whoami file-name)


@@ -621,21 +662,21 @@ the change log file in another window."
   (add-change-log-entry whoami file-name t))
 ;;;###autoload (define-key ctl-x-4-map "a" 'add-change-log-entry-other-window)
 
   (add-change-log-entry whoami file-name t))
 ;;;###autoload (define-key ctl-x-4-map "a" 'add-change-log-entry-other-window)
 

-(defvar add-log-indent-text 0)
+(defvar change-log-indent-text 0)

 
 

-(defun add-log-indent ()
+(defun change-log-indent ()

   (let* ((indent
          (save-excursion
            (beginning-of-line)
            (skip-chars-forward " \t")
            (cond
   (let* ((indent
          (save-excursion
            (beginning-of-line)
            (skip-chars-forward " \t")
            (cond

-            ((and (looking-at "\\(.*\\)  [^ \n].*[^ \n]  <.*>$")
+            ((and (looking-at "\\(.*\\)  [^ \n].*[^ \n]  <.*>\\(?: +(.*)\\)? *$")

                   ;; Matching the output of add-log-time-format is difficult,
                   ;; but I'll get it has at least two adjacent digits.
                   (string-match "[[:digit:]][[:digit:]]" (match-string 1)))
              0)
             ((looking-at "[^*(]")
                   ;; Matching the output of add-log-time-format is difficult,
                   ;; but I'll get it has at least two adjacent digits.
                   (string-match "[[:digit:]][[:digit:]]" (match-string 1)))
              0)
             ((looking-at "[^*(]")

-             (+ (current-left-margin) add-log-indent-text))
+             (+ (current-left-margin) change-log-indent-text))

             (t (current-left-margin)))))
         (pos (save-excursion (indent-line-to indent) (point))))
     (if (> pos (point)) (goto-char pos))))
             (t (current-left-margin)))))
         (pos (save-excursion (indent-line-to indent) (point))))
     (if (> pos (point)) (goto-char pos))))


@@ -657,7 +698,7 @@ Runs `change-log-mode-hook'.
        tab-width 8)
   (set (make-local-variable 'fill-paragraph-function)
        'change-log-fill-paragraph)
        tab-width 8)
   (set (make-local-variable 'fill-paragraph-function)
        'change-log-fill-paragraph)

-  (set (make-local-variable 'indent-line-function) 'add-log-indent)
+  (set (make-local-variable 'indent-line-function) 'change-log-indent)

   (set (make-local-variable 'tab-always-indent) nil)
   ;; We really do want "^" in paragraph-start below: it is only the
   ;; lines that begin at column 0 (despite the left-margin of 8) that
   (set (make-local-variable 'tab-always-indent) nil)
   ;; We really do want "^" in paragraph-start below: it is only the
   ;; lines that begin at column 0 (despite the left-margin of 8) that


@@ -691,23 +732,23 @@ Prefix arg means justify as well."
 \f
 (defcustom add-log-current-defun-header-regexp
   "^\\([[:upper:]][[:upper:]_ ]*[[:upper:]_]\\|[-_[:alpha:]]+\\)[ \t]*[:=]"
 \f
 (defcustom add-log-current-defun-header-regexp
   "^\\([[:upper:]][[:upper:]_ ]*[[:upper:]_]\\|[-_[:alpha:]]+\\)[ \t]*[:=]"

-  "*Heuristic regexp used by `add-log-current-defun' for unknown major modes."
+  "Heuristic regexp used by `add-log-current-defun' for unknown major modes."

   :type 'regexp
   :group 'change-log)
 
 ;;;###autoload
 (defvar add-log-lisp-like-modes
   :type 'regexp
   :group 'change-log)
 
 ;;;###autoload
 (defvar add-log-lisp-like-modes

-    '(emacs-lisp-mode lisp-mode scheme-mode dsssl-mode lisp-interaction-mode)
+  '(emacs-lisp-mode lisp-mode scheme-mode dsssl-mode lisp-interaction-mode)

   "*Modes that look like Lisp to `add-log-current-defun'.")
 
 ;;;###autoload
 (defvar add-log-c-like-modes
   "*Modes that look like Lisp to `add-log-current-defun'.")
 
 ;;;###autoload
 (defvar add-log-c-like-modes

-    '(c-mode c++-mode c++-c-mode objc-mode)
+  '(c-mode c++-mode c++-c-mode objc-mode)

   "*Modes that look like C to `add-log-current-defun'.")
 
 ;;;###autoload
 (defvar add-log-tex-like-modes
   "*Modes that look like C to `add-log-current-defun'.")
 
 ;;;###autoload
 (defvar add-log-tex-like-modes

-    '(TeX-mode plain-TeX-mode LaTeX-mode plain-tex-mode latex-mode)
+  '(TeX-mode plain-TeX-mode LaTeX-mode plain-tex-mode latex-mode)

   "*Modes that look like TeX to `add-log-current-defun'.")
 
 ;;;###autoload
   "*Modes that look like TeX to `add-log-current-defun'.")
 
 ;;;###autoload


@@ -779,42 +820,63 @@ Has a preference of looking backwards."
                   (forward-line 1))
                 (or (eobp)
                     (forward-char 1))
                   (forward-line 1))
                 (or (eobp)
                     (forward-char 1))

-                (beginning-of-defun)
-                (when (progn (end-of-defun)
-                             (< location (point)))
+                (let (maybe-beg)
+                  ;; Try to find the containing defun.
+                  (beginning-of-defun)
+                  (end-of-defun)
+                  ;; If the defun we found ends before the desired position,
+                  ;; see if there's a DEFUN construct
+                  ;; between that end and the desired position.
+                  (when (save-excursion
+                          (and (> location (point))
+                               (re-search-forward "^DEFUN"
+                                                  (save-excursion
+                                                    (goto-char location)
+                                                    (line-end-position))
+                                                  t)
+                               (re-search-forward "^{" nil t)
+                               (setq maybe-beg (point))))
+                    ;; If so, go to the end of that instead.
+                    (goto-char maybe-beg)
+                    (end-of-defun)))
+                ;; 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)
                   (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)
                     (forward-line -1)

-                    ;; Skip back over typedefs of arglist.

                     (while (and (not (bobp))
                     (while (and (not (bobp))

-                                (looking-at "[ \t\n]"))
+                                (looking-at "[ \t\n]")
+                                (not (looking-back "[*]/)\n" (- (point) 4))))

                       (forward-line -1))
                       (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
                         (progn

-                          (goto-char tem)

                           (down-list 1)
                           (down-list 1)

-                          (if (= (char-after (point)) ?\")
-                              (progn
-                                (forward-sexp 1)
-                                (skip-chars-forward " ,")))
+                          (when (= (char-after (point)) ?\")
+                             (forward-sexp 1)
+                             (search-forward ","))
+                           (skip-syntax-forward " ")

                           (buffer-substring-no-properties
                            (point)
                           (buffer-substring-no-properties
                            (point)

-                           (progn (forward-sexp 1)
+                           (progn (search-forward ",")
+                                   (forward-char -1)
+                                   (skip-syntax-backward " ")

                                   (point))))
                       (if (looking-at "^[+-]")
                                   (point))))
                       (if (looking-at "^[+-]")

+                          ;; Objective-C

                           (change-log-get-method-definition)
                         ;; Ordinary C function syntax.
                         (setq beg (point))
                           (change-log-get-method-definition)
                         ;; Ordinary C function syntax.
                         (setq beg (point))


@@ -854,7 +916,14 @@ Has a preference of looking backwards."
                               ;; Include certain keywords if they
                               ;; precede the name.
                               (setq middle (point))
                               ;; Include certain keywords if they
                               ;; precede the name.
                               (setq middle (point))

-                              (forward-word -1)
+                              (forward-sexp -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 ")
                               ;; Ignore these subparts of a class decl
                               ;; and move back to the class name itself.
                               (while (looking-at "public \\|private ")


@@ -928,7 +997,7 @@ Has a preference of looking backwards."
   (goto-char (match-end 0)))
 
 (defun change-log-get-method-definition ()
   (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)
   (let ((change-log-get-method-definition-md "["))
     (save-excursion
       (if (re-search-backward "^@implementation\\s-*\\([A-Za-z_]*\\)" nil t)


@@ -974,7 +1043,7 @@ Point is assumed to be at the start of the entry."
 
 ;;;###autoload
 (defun change-log-merge (other-log)
 
 ;;;###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.
 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.


@@ -1013,7 +1082,7 @@ old-style time formats for entries are supported."
                        (and (= ?\n (char-before))
                             (or (<= (1- (point)) (point-min))
                                 (= ?\n (char-before (1- (point)))))))
                        (and (= ?\n (char-before))
                             (or (<= (1- (point)) (point-min))
                                 (= ?\n (char-before (1- (point)))))))

-             (insert "\n"))
+             (insert (if use-hard-newlines hard-newline "\n")))

            ;; Move to the end of it to terminate outer loop.
            (with-current-buffer other-buf
              (goto-char (point-max)))
            ;; Move to the end of it to terminate outer loop.
            (with-current-buffer other-buf
              (goto-char (point-max)))


@@ -1044,5 +1113,5 @@ old-style time formats for entries are supported."
 
 (provide 'add-log)
 
 
 (provide 'add-log)
 

-;;; arch-tag: 81eee6fc-088f-4372-a37f-80ad9620e762
+;; arch-tag: 81eee6fc-088f-4372-a37f-80ad9620e762

 ;;; add-log.el ends here
 ;;; add-log.el ends here