(bookmark-send-edited-annotation): Fix docstring.

(bookmark-edit-annotation-mode): Add mode name.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 187e65f5de43445101d9fe533f234098f47b48e3..7f3ee667638531619c73f3bef6cb940713d9769d 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-16  Juanma Barranquero  <lektu@terra.es>
+
+       * bookmark.el (bookmark-send-edited-annotation): Fix docstring.
+       (bookmark-edit-annotation-mode): Add mode name.
+
 2004-04-15  Nick Roberts  <nick@nick.uklinux.net>
 
        * progmodes/gdb-ui.el (gdb-goto-info): New function.
@@ -294,7 +299,7 @@
 
 2004-04-08  Nick Roberts  <nick@nick.uklinux.net>
 
-       * progmodes/gdb-ui.el (gdb-source-window): Remove variable
+       * progmodes/gdb-ui.el (gdb-source-window): Remove variable.
        (gdb-goto-breakpoint, gdb-display-buffer)
        (gdb-display-source-buffer, gdb-view-source-function)
        (gdb-view-assembler, gdb-setup-windows, gdb-restore-windows)
@@ -381,19 +386,6 @@
        * help-mode.el (help-function-def, help-variable-def): Handle hyperrefs
        to C source files specially.
 
-2004-04-07  Stefan Monnier  <monnier@iro.umontreal.ca>
-
-       * progmodes/compile.el: Require CL.
-       (compilation-mode-font-lock-keywords): Re-install the "line as
-       function" patch.
-
-       * help-fns.el (help-C-source-directory): New var.
-       (help-subr-name, help-C-file-name, help-find-C-source): New funs.
-       (describe-function-1, describe-variable): Use them.
-
-       * help-mode.el (help-function-def, help-variable-def): Handle hyperrefs
-       to C source files specially.
-
 2004-04-07  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * info.el (Info-hide-cookies-node): New function.
@@ -673,7 +665,7 @@
 
        * progmodes/gdb-ui.el (gdb-ann3, gdb-send-item)
        (gud-gdba-marker-filter): Log the process input and output, if
-       required. (from Stefan Monnier)
+       required.  From Stefan Monnier.
        (gdb-debug-log, gdb-enable-debug-log): New variables.
        (gdb-post-prompt): Don't do gdb-var-update on Mac OS X.
 

diff --git a/lisp/bookmark.el b/lisp/bookmark.el
index 67ae2c848659484dbb938b46ce421b9e3b282134..3ed66f229a87e9ae03c621aee15adb4fb8e905b0 100644 (file)
--- a/lisp/bookmark.el
+++ b/lisp/bookmark.el
@@ -893,7 +893,8 @@ When you have finished composing, type \\[bookmark-send-annotation].
   (make-local-variable 'bookmark-annotation-name)
   (setq bookmark-annotation-name bookmark)
   (use-local-map bookmark-edit-annotation-mode-map)
-  (setq major-mode 'bookmark-edit-annotation-mode)
+  (setq major-mode 'bookmark-edit-annotation-mode
+        mode-name "Edit Bookmark Annotation")
   (insert (funcall bookmark-read-annotation-text-func bookmark))
   (let ((annotation (bookmark-get-annotation bookmark)))
     (if (and annotation (not (string-equal annotation "")))
@@ -902,7 +903,8 @@ When you have finished composing, type \\[bookmark-send-annotation].
 
 
 (defun bookmark-send-edited-annotation ()
-  "Use buffer contents (minus beginning with `#' as annotation for a bookmark."
+  "Use buffer contents as annotation for a bookmark.
+Lines beginning with `#' are ignored."
   (interactive)
   (if (not (eq major-mode 'bookmark-edit-annotation-mode))
       (error "Not in bookmark-edit-annotation-mode"))